@dative-gpi/foundation-shared-services 0.0.49 → 0.0.51

package/composables/app/index.ts

@@ -0,0 +1,2 @@
+export * from "./useAppLanguageCode";
+export * from "./useAppTimeZone";

package/composables/app/useAppLanguageCode.ts

@@ -0,0 +1,17 @@
+import { computed, ref } from "vue";
+
+const languageCode = ref<string | undefined>(undefined);
+
+export const useAppLanguageCode = () => {
+    const setLanguageCode = (payload: string) => {
+        languageCode.value = payload;
+    };
+
+    const ready = computed(() => languageCode.value !== null);
+
+    return {
+        ready,
+        languageCode,
+        setLanguageCode
+    };
+}

package/composables/{useTimeZone.ts → app/useAppTimeZone.ts}

@@ -1,4 +1,4 @@
-import { ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 
 import { enUS, enGB, fr, it, es, de, Locale } from "date-fns/locale";
 import { format, subDays } from "date-fns";
@@ -6,14 +6,11 @@ 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 { useLanguageCode } from "./useLanguageCode";
+import { useAppLanguageCode } from "./useAppLanguageCode";
 
-const timeZone = ref<TimeZoneInfos | null>({
-    id: "Europe/Paris",
-    offset: "UTC +02:00:00"
-});
+const timeZone = ref<TimeZoneInfos | null>(null);
 
-export const useTimeZone = () => {
+export const useAppTimeZone = () => {
     const setTimeZone = (payload: TimeZoneInfos) => {
         timeZone.value = payload;
     };
@@ -25,7 +22,7 @@ export const useTimeZone = () => {
     const getUserOffsetMillis = (): number => {
         const offset = timeZone?.value?.offset.slice(3) ?? "";
         const matchData = offset.match(/([+-])(\d+)(?::(\d+))?/);
-        if (matchData)  {
+        if (matchData) {
             const [_, sign, hour, minute] = matchData;
             return parseInt(sign + "1") * ((hour ? parseInt(hour) : 0) * 60 + (minute ? parseInt(minute) : 0)) * 60 * 1000;
         }
@@ -37,13 +34,13 @@ export const useTimeZone = () => {
             timeZoneName: "short",
             timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
         }).formatToParts().find((i) => i.type === "timeZoneName")?.value ?? "";
-    
+
         const offset = timeZoneName.slice(3);
         if (!offset) {
             return "UTC +00:00:00";
         }
         const matchData = offset.match(/([+-])(\d+)(?::(\d+))?/);
-        if (matchData)  {
+        if (matchData) {
             const [_, sign, hour, minute] = matchData;
             return `UTC ${sign}${hour.padStart(2, "0")}:${(minute ?? "").padStart(2, "0")}:00`;
         }
@@ -55,13 +52,13 @@ export const useTimeZone = () => {
             timeZoneName: "short",
             timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
         }).formatToParts().find((i) => i.type === "timeZoneName")?.value ?? "";
-    
+
         const offset = timeZoneName.slice(3);
         if (!offset) {
             return 0;
         }
         const matchData = offset.match(/([+-])(\d+)(?::(\d+))?/);
-        if (matchData)  {
+        if (matchData) {
             const [_, sign, hour, minute] = matchData;
             return parseInt(sign + "1") * ((hour ? parseInt(hour) : 0) * 60 + (minute ? parseInt(minute) : 0)) * 60 * 1000;
         }
@@ -76,25 +73,32 @@ export const useTimeZone = () => {
         return today.getTime() + getMachineOffsetMillis() - getUserOffsetMillis();
     }
 
-    const pickerToEpoch = (value: Date): number => {
-        // FSCalendar is always in machine time zone, so we need to convert it to user time zone
-        return value.getTime() + getMachineOffsetMillis() - getUserOffsetMillis();
+    const pickerToEpoch = (value: Date | null | undefined): number => {
+        if (value != null) {
+            // FSCalendar is always in machine time zone, so we need to convert it to user time zone
+            return value.getTime() + getMachineOffsetMillis() - getUserOffsetMillis();
+        }
+        return 0;
     };
 
-    const epochToPicker = (value: number): Date => {
-        // Epoch is always without time zone, so we need to convert it to user time zone
+    const epochToPicker = (value: number | null | undefined): Date => {
         const date = new Date(0);
-        date.setUTCMilliseconds(value - getMachineOffsetMillis() + getUserOffsetMillis());
+        if (value != null) {
+            // Epoch is always without time zone, so we need to convert it to user time zone
+            date.setUTCMilliseconds(value - getMachineOffsetMillis() + getUserOffsetMillis());
+        }
         return date;
     };
 
     const epochToPickerHeader = (value: number): { d: number, m: number, y: number } => {
         const date = new Date(0);
-        date.setUTCMilliseconds(value - getMachineOffsetMillis() + getUserOffsetMillis());
+        if (value != null) {
+            date.setUTCMilliseconds(value - getMachineOffsetMillis() + getUserOffsetMillis());
+        }
         return { d: date.getDate(), m: date.getMonth(), y: date.getFullYear() };
     };
 
-    const epochToLongDateFormat = (value: number): string => {
+    const epochToLongDateFormat = (value: number | null | undefined): string => {
         if (value == null || !isFinite(value)) {
             return "";
         }
@@ -103,7 +107,7 @@ export const useTimeZone = () => {
         return format(date, "EEEE dd LLLL yyyy", { locale: getLocale() });
     };
 
-    const epochToLongTimeFormat = (value: number): string => {
+    const epochToLongTimeFormat = (value: number | null | undefined): string => {
         if (value == null || !isFinite(value)) {
             return "";
         }
@@ -112,7 +116,7 @@ export const useTimeZone = () => {
         return format(date, overrideFormat(date, "EEEE dd LLLL yyyy HH:mm"), { locale: getLocale() })
     };
 
-    const epochToShortDateFormat = (value: number): string => {
+    const epochToShortDateFormat = (value: number | null | undefined): string => {
         if (value == null || !isFinite(value)) {
             return "";
         }
@@ -128,7 +132,7 @@ export const useTimeZone = () => {
         }
     };
 
-    const epochToShortTimeFormat = (value: number): string => {
+    const epochToShortTimeFormat = (value: number | null | undefined): string => {
         if (value == null || !isFinite(value)) {
             return "";
         }
@@ -147,11 +151,11 @@ export const useTimeZone = () => {
     const todayTimeFormat = (): string => {
         return `'${useTranslationsProvider().$tr("ui.time-zone.today-at", "Today at").replaceAll("'", "''")}' HH:mm:ss`;
     }
-    
+
     const yesterdayTimeFormat = (): string => {
         return `'${useTranslationsProvider().$tr("ui.time-zone.yesterday-at", "Yesterday at").replaceAll("'", "''")}' HH:mm:ss`;
     }
-      
+
     const overrideFormat = (date: Date, askedFormat: string): string => {
         let now = new Date();
         if (date.toDateString() === now.toDateString()) {
@@ -164,7 +168,7 @@ export const useTimeZone = () => {
     }
 
     const getLocale = (): Locale => {
-        switch (useLanguageCode().languageCode.value) {
+        switch (useAppLanguageCode().languageCode.value) {
             case "fr-FR": return fr;
             case "es-ES": return es;
             case "it-IT": return it;
@@ -174,18 +178,7 @@ export const useTimeZone = () => {
         }
     }
 
-    const ready = new Promise((resolve) => {
-        if (timeZone.value) {
-            resolve(timeZone.value);
-        }
-        else {
-            watch(timeZone, () => {
-                if (timeZone.value) {
-                    resolve(timeZone.value);
-                }
-            });
-        }
-    });
+    const ready = computed(() => timeZone.value !== null);
 
     return {
         ready,

package/composables/index.ts

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

package/composables/services/index.ts

@@ -1,6 +1,7 @@
 export * from "./useApplications";
 export * from "./useAuthTokens";
 export * from "./useImages";
+export * from "./useLanguages";
 export * from "./useOrganisations";
 export * from "./useTimeZones";
 export * from "./useTranslations";

package/composables/services/useLanguages.ts

@@ -0,0 +1,11 @@
+import { LanguageDetails, LanguageDetailsDTO, LanguageFilters, LanguageInfos, LanguageInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { LANGUAGES_URL } from "../../config/urls";
+
+const LanguageServiceFactory = new ServiceFactory<LanguageDetailsDTO, LanguageDetails>("language", LanguageDetails).create(factory => factory.build(
+    factory.addGetMany<LanguageInfosDTO, LanguageInfos, LanguageFilters>(LANGUAGES_URL, LanguageInfos),
+    factory.addNotify()
+));
+
+export const useLanguages = ComposableFactory.getMany(LanguageServiceFactory);

package/composables/useFoundationShared.ts

@@ -0,0 +1,14 @@
+import { computed } from "vue";
+
+import { useAppLanguageCode, useAppTimeZone } from "./app";
+
+export function useFoundationShared() {
+  const { ready: languageCodeReady } = useAppLanguageCode();
+  const { ready: timeZoneReady } = useAppTimeZone();
+
+  const ready = computed(() => timeZoneReady.value && languageCodeReady.value);
+
+  return {
+    ready,
+  };
+}

package/config/urls/index.ts

@@ -2,6 +2,7 @@ export * from "./applications";
 export * from "./authTokens";
 export * from "./files";
 export * from "./images";
+export * from "./languages";
 export * from "./organisations";
 export * from "./timeZones";
 export * from "./translations";

package/config/urls/languages.ts

@@ -0,0 +1,3 @@
+import { GATEWAY_URL } from "./base";
+
+export const LANGUAGES_URL = () => `${GATEWAY_URL()}/languages`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-services",
   "sideEffects": false,
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -11,10 +11,10 @@
   "license": "ISC",
   "dependencies": {
     "@dative-gpi/bones-ui": "^0.0.61",
-    "@dative-gpi/foundation-shared-domain": "0.0.49",
+    "@dative-gpi/foundation-shared-domain": "0.0.51",
     "@microsoft/signalr": "^8.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "cf285c38be7fcc0f02f813f2cb3693867d277003"
+  "gitHead": "13a8e0d4bd10a05a35c570412fa2024d33b0c115"
 }

package/composables/useLanguageCode.ts

@@ -1,28 +0,0 @@
-import { ref, watch } from "vue";
-
-const languageCode = ref<string | null>("fr-FR");
-
-export const useLanguageCode = () => {
-    const setLanguageCode = (payload: string) => {
-        languageCode.value = payload;
-    };
-
-    const ready = new Promise((resolve) => {
-        if (languageCode.value) {
-            resolve(languageCode.value);
-        }
-        else {
-            watch(languageCode, () => {
-                if (languageCode.value) {
-                    resolve(languageCode.value);
-                }
-            });
-        }
-    });
-
-    return {
-        ready,
-        languageCode,
-        setLanguageCode
-    };
-}

package/composables/useShared.ts

@@ -1,39 +0,0 @@
-import { ref } from "vue";
-
-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;
-
-const ready = ref(false);
-
-export async function useShared() {
-  if (called) {
-    return {
-      ready
-    };
-  }
-
-  called = true;
-
-  const { ready: languageCodeReady, languageCode } = useLanguageCode();
-  const { ready: timeZoneReady } = useTimeZone();
-  const { getMany, entities } = useTranslations();
-  const { set } = useTranslationsProvider();
-
-  await languageCodeReady;
-  await timeZoneReady;
-
-  if (languageCode.value) {
-    await getMany(languageCode.value);    
-    set(entities.value.map(t => ({ code: t.code, value: t.value })));
-  }
-  ready.value = true;
-
-  return {
-    ready
-  };
-}