@dative-gpi/foundation-shared-services 0.0.52 → 0.0.54

package/composables/app/useAppLanguageCode.ts

@@ -3,7 +3,7 @@ import { computed, ref } from "vue";
 const languageCode = ref<string | undefined>(undefined);
 
 export const useAppLanguageCode = () => {
-    const setLanguageCode = (payload: string) => {
+    const setAppLanguageCode = (payload: string) => {
         languageCode.value = payload;
     };
 
@@ -12,6 +12,6 @@ export const useAppLanguageCode = () => {
     return {
         ready,
         languageCode,
-        setLanguageCode
+        setAppLanguageCode
     };
 }

package/composables/app/useAppTimeZone.ts

@@ -1,4 +1,4 @@
-import { computed, ref, watch } from "vue";
+import { computed, ref } from "vue";
 
 import { enUS, enGB, fr, it, es, de, Locale } from "date-fns/locale";
 import { format, subDays } from "date-fns";
@@ -11,7 +11,7 @@ import { useAppLanguageCode } from "./useAppLanguageCode";
 const timeZone = ref<TimeZoneInfos | null>(null);
 
 export const useAppTimeZone = () => {
-    const setTimeZone = (payload: TimeZoneInfos) => {
+    const setAppTimeZone = (payload: TimeZoneInfos) => {
         timeZone.value = payload;
     };
 
@@ -183,7 +183,7 @@ export const useAppTimeZone = () => {
     return {
         ready,
         timeZone,
-        setTimeZone,
+        setAppTimeZone,
         getUserOffset,
         getMachineOffset,
         getUserOffsetMillis,

package/composables/services/useApplications.ts

@@ -1,50 +1,10 @@
-import { onUnmounted, ref } from "vue";
-
 import { ApplicationDetails, ApplicationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
-import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { APPLICATION_CURRENT_URL } from "../../config/urls";
 
-const ApplicationServiceFactory = new ServiceFactory<ApplicationDetailsDTO, ApplicationDetails>("application", ApplicationDetails).create(factory => factory.build(
-    factory.addNotify((notifyService) => ({
-        getCurrent: async (): Promise<ApplicationDetails> => {
-            const response = await ServiceFactory.http.get(APPLICATION_CURRENT_URL());
-            const result = new ApplicationDetails(response.data);
-
-            notifyService.notify("update", result);
-
-            return result;
-        }
-    }))
-));
-
-export const useCurrentApplication = () => {
-    const service = ApplicationServiceFactory();
-    const subscribersIds: number[] = [];
-
-    const getting = ref(false);
-    const entity = ref<ApplicationDetails | null>(null);
-
-    onUnmounted(() => {
-        subscribersIds.forEach(id => service.unsubscribe(id));
-        subscribersIds.length = 0;
-    });
-
-    const get = async () => {
-        getting.value = true;
-        try {
-            entity.value = await service.getCurrent();
-        }
-        finally {
-            getting.value = false;
-        }
-        subscribersIds.push(service.subscribe("all", onEntityChanged(entity)));
-        return entity;
-    }
+const ApplicationServiceFactory = {
+    ...ServiceFactory.addCustom("getCurrent", (axios) => axios.get(APPLICATION_CURRENT_URL()), (dto: ApplicationDetailsDTO) => new ApplicationDetails(dto))
+};
 
-    return {
-        getting,
-        get,
-        entity
-    }
-}
+export const useCurrentApplication = ComposableFactory.custom(ApplicationServiceFactory.getCurrent);

package/composables/services/useImages.ts

@@ -1,41 +1,10 @@
-import { ref } from "vue";
-
-import { BlurHash } from "@dative-gpi/foundation-shared-domain/models";
-import { ServiceFactory } from "@dative-gpi/bones-ui";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+import { BlurHash, BlurHashDTO } from "@dative-gpi/foundation-shared-domain/models";
 
 import { IMAGE_BLURHASH_URL } from "../../config/urls";
 
-const ImageServiceFactory = new ServiceFactory("image", BlurHash).create(factory => factory.build(
-    factory.addNotify(() => ({
-        getBlurHash: async (imageId: string): Promise<BlurHash> => {
-            const response = await ServiceFactory.http.get(IMAGE_BLURHASH_URL(imageId));
-            const result = new BlurHash(response.data);
-
-            return result;
-        }
-    }))
-));
-
-export const useImageBlurHash = () => {
-    const service = ImageServiceFactory();
-
-    const getting = ref(false);
-    const entity = ref<BlurHash | null>(null);
-
-    const get = async (imageId: string) => {
-        getting.value = true;
-        try {
-            entity.value = await service.getBlurHash(imageId);
-        }
-        finally {
-            getting.value = false;
-        }
-        return entity;
-    }
+const ImageServiceFactory = {
+    ...ServiceFactory.addCustom("getBlurHash", (axios, imageId: string) => axios.get(IMAGE_BLURHASH_URL(imageId)), (dto: BlurHashDTO) => new BlurHash(dto))
+};
 
-    return {
-        getting,
-        get,
-        entity
-    }
-}
+export const useImageBlurHash = ComposableFactory.custom(ImageServiceFactory.getBlurHash);

package/composables/services/useTranslations.ts

@@ -1,41 +1,10 @@
-import { ref } from "vue";
-
-import { TranslationInfos, TranslationInfosDTO, TranslationDetails, TranslationDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
-import { ServiceFactory } from "@dative-gpi/bones-ui";
+import { TranslationInfos, TranslationInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { TRANSLATIONS_LANGUAGE_URL } from "../../config/urls";
 
-const TranslationServiceFactory = new ServiceFactory<TranslationDetailsDTO, TranslationDetails>("translation", TranslationDetails).create(factory => factory.build(
-    factory.addNotify(() => ({
-        getMany: async (languageCode: string): Promise<TranslationInfos[]> => {
-            const response = await ServiceFactory.http.get(TRANSLATIONS_LANGUAGE_URL(languageCode));
-            const result = response.data.map((dto: TranslationInfosDTO) => new TranslationInfos(dto));
-
-            return result;
-        }
-    }))
-));
-
-export const useTranslations = () => {
-    const service = TranslationServiceFactory();
-
-    const fetching = ref(false);
-    const entities = ref<TranslationInfos[]>([]);
-
-    const getMany = async (languageCode: string) => {
-        fetching.value = true;
-        try {
-            entities.value = await service.getMany(languageCode);
-        }
-        finally {
-            fetching.value = false;
-        }
-        return entities;
-    }
+const TranslationServiceFactory = {
+    ...ServiceFactory.addCustom("getMany", (axios, languageCode: string) => axios.get(TRANSLATIONS_LANGUAGE_URL(languageCode)), (dtos: TranslationInfosDTO[]) => dtos.map(dto => new TranslationInfos(dto)))
+};
 
-    return {
-        fetching,
-        getMany,
-        entities
-    }
-}
+export const useTranslations = ComposableFactory.custom(TranslationServiceFactory.getMany);

package/composables/services/useUsers.ts

@@ -1,88 +1,26 @@
-import { onUnmounted, ref } from "vue";
-
 import { UpdateUserDTO, UserDetails, UserDetailsDTO } from "@dative-gpi/foundation-shared-domain/models";
-import { onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { USER_CURRENT_URL } from "../../config/urls";
 
 const UserServiceFactory = new ServiceFactory<UserDetailsDTO, UserDetails>("user", UserDetails).create(factory => factory.build(
-    factory.addNotify((notifyService) => ({
-        getCurrent: async (): Promise<UserDetails> => {
-            const response = await ServiceFactory.http.get(USER_CURRENT_URL());
-            const result = new UserDetails(response.data);
-
-            notifyService.notify("update", result);
-
-            return result;
-        },
-        updateCurrent: async (payload: UpdateUserDTO): Promise<UserDetails> => {
-            const response = await ServiceFactory.http.post(USER_CURRENT_URL(), payload);
-            const result = new UserDetails(response.data);
-
-            notifyService.notify("update", result);
-
+    ServiceFactory.addCustom("getCurrent", (axios) => axios.get(USER_CURRENT_URL()), (dto: UserDetailsDTO) => new UserDetails(dto)),
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("updateCurrent", (axios, payload: UpdateUserDTO) => axios.post(USER_CURRENT_URL(), payload), (dto: UserDetailsDTO) => {
+            const result = new UserDetails(dto);
+            notify.notify("update", result);
             return result;
-        }
+        })
     }))
 ));
 
-export const useCurrentUser = () => {
-    const service = UserServiceFactory();
-    const subscribersIds: number[] = [];
-
-    const getting = ref(false);
-    const entity = ref<UserDetails | null>(null);
-
-    onUnmounted(() => {
-        subscribersIds.forEach(id => service.unsubscribe(id));
-        subscribersIds.length = 0;
-    });
-
-    const get = async () => {
-        getting.value = true;
-        try {
-            entity.value = await service.getCurrent();
-        }
-        finally {
-            getting.value = false;
-        }
-        subscribersIds.push(service.subscribe("all", onEntityChanged(entity)));
-        return entity;
-    }
-
-    return {
-        getting,
-        get,
-        entity
-    }
-}
-export const useUpdateCurrentUser = () => {
-    const service = UserServiceFactory();
-    const subscribersIds: number[] = [];
-
-    const updating = ref(false);
-    const updated = ref<UserDetails | null>(null);
-
-    onUnmounted(() => {
-        subscribersIds.forEach(id => service.unsubscribe(id));
-        subscribersIds.length = 0;
-    });
-
-    const update = async (payload: UpdateUserDTO) => {
-        updating.value = true;
-        try {
-            updated.value = await service.updateCurrent(payload);
-        }
-        finally {
-            updating.value = false;
-        }
-        subscribersIds.push(service.subscribe("all", onEntityChanged(updated)));
-        return updated;
-    }
+export const useTrackUser = ComposableFactory.track(UserServiceFactory);
 
-    return {
-        updating,
-        update,
-        updated
+export const useCurrentUser = ComposableFactory.custom(UserServiceFactory.getCurrent, () => {
+    const { track } = useTrackUser();
+ 
+    return (user) => {
+        track(user);
     }
-}
+});
+export const useUpdateCurrentUser = ComposableFactory.custom(UserServiceFactory.updateCurrent);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-services",
   "sideEffects": false,
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/bones-ui": "^0.0.61",
-    "@dative-gpi/foundation-shared-domain": "0.0.52",
+    "@dative-gpi/bones-ui": "^0.0.70",
+    "@dative-gpi/foundation-shared-domain": "0.0.54",
     "@microsoft/signalr": "^8.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "1cea46f60262aceae3135923684ed4a5af60d0bb"
+  "gitHead": "391503e595cd9d731fca14b5bb2d3a10b6efee95"
 }