@dative-gpi/foundation-core-services 0.0.7 → 0.0.9

package/composables/index.ts

@@ -1,5 +1,4 @@
 export * from "./hubs";
 export * from "./services";
-export * from "./useLanguageCode";
-export * from "./useOrganisationId";
-export * from "./useTimeZone";
+export * from "./useCore";
+export * from "./useOrganisationId";

package/composables/services/index.ts

@@ -1,3 +1,4 @@
+export * from "./useActions";
 export * from "./useAlerts";
 export * from "./useArticles";
 export * from "./useAuthTokens";
@@ -9,7 +10,6 @@ export * from "./useDataDefinitions";
 export * from "./useDeviceConnectivities";
 export * from "./useDeviceOrganisations";
 export * from "./useDeviceStatuses";
-export * from "./useFamilies";
 export * from "./useGroups";
 export * from "./useLanguages";
 export * from "./useLocations";
@@ -21,7 +21,6 @@ export * from "./usePermissionCategories";
 export * from "./usePermissions";
 export * from "./useRoleOrganisations";
 export * from "./useRoleOrganisationTypes";
-export * from "./useTimeZones";
-export * from "./useTranslations";
+export * from "./useUserOrganisationDispositions";
 export * from "./useUserOrganisations";
 export * from "./useUsers";

package/composables/services/useActions.ts

@@ -0,0 +1,11 @@
+import { ActionDetails, ActionDetailsDTO, ActionInfos, ActionInfosDTO } from "@dative-gpi/foundation-core-domain";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { ACTIONS_URL } from "../../config/urls";
+
+const ActionServiceFactory = new ServiceFactory<ActionDetailsDTO, ActionDetails>("action", ActionDetails).create(factory => factory.build(
+    factory.addGetMany<ActionInfosDTO, ActionInfos, string>(ACTIONS_URL, ActionInfos),
+    factory.addNotify()
+));
+
+export const useActions = ComposableFactory.getMany(ActionServiceFactory);

package/composables/services/useAuthTokens.ts

@@ -1,15 +1,13 @@
-import { AuthTokenDetails, AuthTokenDetailsDTO, AuthTokenFilters, AuthTokenInfos, AuthTokenInfosDTO, CreateAuthTokenDTO } from "@dative-gpi/foundation-core-domain";
+import { AuthTokenDetails, AuthTokenDetailsDTO, AuthTokenFilters, AuthTokenInfos, AuthTokenInfosDTO } from "@dative-gpi/foundation-core-domain";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { AUTH_TOKENS_URL, AUTH_TOKEN_URL } from "../../config/urls";
 
 const AuthTokenServiceFactory = new ServiceFactory<AuthTokenDetailsDTO, AuthTokenDetails>("authToken", AuthTokenDetails).create(factory => factory.build(
     factory.addGetMany<AuthTokenInfosDTO, AuthTokenInfos, AuthTokenFilters>(AUTH_TOKENS_URL, AuthTokenInfos),
-    factory.addCreate<CreateAuthTokenDTO>(AUTH_TOKENS_URL),
     factory.addRemove(AUTH_TOKEN_URL),
     factory.addNotify()
 ));
 
 export const useAuthTokens = ComposableFactory.getMany(AuthTokenServiceFactory);
-export const useCreateAuthToken = ComposableFactory.create(AuthTokenServiceFactory);
 export const useRemoveAuthToken = ComposableFactory.remove(AuthTokenServiceFactory);

package/composables/services/useComments.ts

@@ -0,0 +1,13 @@
+import { CreateCommentDTO, CommentDetails, CommentDetailsDTO, CommentFilters, CommentInfos, CommentInfosDTO, UpdateCommentDTO } from "@dative-gpi/foundation-core-domain";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { COMMENTS_URL, COMMENT_URL } from "../../config/urls";
+
+const CommentServiceFactory = new ServiceFactory<CommentDetailsDTO, CommentDetails>("comment", CommentDetails)
+    .createComplete<CommentInfos, CommentInfosDTO, CreateCommentDTO, UpdateCommentDTO, CommentFilters>(COMMENTS_URL, COMMENT_URL, CommentInfos);
+
+export const useComment = ComposableFactory.get(CommentServiceFactory);
+export const useComments = ComposableFactory.getMany(CommentServiceFactory);
+export const useCreateComment = ComposableFactory.create(CommentServiceFactory);
+export const useUpdateComment = ComposableFactory.update(CommentServiceFactory);
+export const useRemoveComment = ComposableFactory.remove(CommentServiceFactory);

package/composables/services/useLanguages.ts

@@ -1,4 +1,4 @@
-import { LanguageDetails, LanguageDetailsDTO, LanguageFilters, LanguageInfos, LanguageInfosDTO } from "@dative-gpi/foundation-core-domain";
+import { LanguageDetails, LanguageDetailsDTO, LanguageFilters, LanguageInfos, LanguageInfosDTO } from "@dative-gpi/foundation-shared-domain";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { LANGUAGES_URL, LANGUAGE_URL } from "../../config/urls";

package/composables/services/useOrganisations.ts

@@ -1,17 +1,15 @@
 import { Ref, onUnmounted, readonly, ref } from "vue";
 
-import { ChangeOrganisationDashboardDTO, OrganisationDetails, OrganisationDetailsDTO, OrganisationFilters, OrganisationInfos, OrganisationInfosDTO, UpdateOrganisationDTO } from "@dative-gpi/foundation-core-domain";
-import { ComposableFactory, onEntityChanged , ServiceFactory } from "@dative-gpi/bones-ui";
+import { OrganisationDetails, OrganisationDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { ChangeOrganisationDashboardDTO } from "@dative-gpi/foundation-core-domain";
+import { onEntityChanged , ServiceFactory } from "@dative-gpi/bones-ui";
 
-import { ORGANISATION_DASHBOARD_URL, ORGANISATIONS_URL, ORGANISATION_URL } from "../../config/urls";
+import { ORGANISATION_DASHBOARD_URL } from "../../config/urls";
 
 const OrganisationServiceFactory = new ServiceFactory<OrganisationDetailsDTO, OrganisationDetails>("organisation", OrganisationDetails).create(factory => factory.build(
-    factory.addGet(ORGANISATION_URL),
-    factory.addGetMany<OrganisationInfosDTO, OrganisationInfos, OrganisationFilters>(ORGANISATIONS_URL, OrganisationInfos),
-    factory.addUpdate<UpdateOrganisationDTO>(ORGANISATION_URL),
     factory.addNotify((notifyService) => ({
         changeDashboard: async (payload: ChangeOrganisationDashboardDTO): Promise<OrganisationDetails> => {
-            const response = await ServiceFactory.http.put(ORGANISATION_DASHBOARD_URL, payload);
+            const response = await ServiceFactory.http.put(ORGANISATION_DASHBOARD_URL(), payload);
             const result = new OrganisationDetails(response.data);
 
             notifyService.notify("update", result);
@@ -21,9 +19,6 @@ const OrganisationServiceFactory = new ServiceFactory<OrganisationDetailsDTO, Or
     }))
 ));
 
-export const useOrganisation = ComposableFactory.get(OrganisationServiceFactory);
-export const useOrganisations = ComposableFactory.getMany(OrganisationServiceFactory);
-export const useUpdateOrganisation = ComposableFactory.update(OrganisationServiceFactory);
 export const useChangeDashboardOrganisation = () => {
     const service = OrganisationServiceFactory();
 

package/composables/services/usePermissions.ts

@@ -1,6 +1,6 @@
 import { Ref, readonly, ref } from "vue";
 
-import { PermissionDetails, PermissionDetailsDTO, PermissionInfos, PermissionInfosDTO } from "@dative-gpi/foundation-core-domain";
+import { PermissionDetails, PermissionDetailsDTO, PermissionInfos } from "@dative-gpi/foundation-shared-domain";
 import { ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { PERMISSIONS_CURRENT_URL } from "../../config/urls";
@@ -8,7 +8,7 @@ import { PERMISSIONS_CURRENT_URL } from "../../config/urls";
 const PermissionServiceFactory = new ServiceFactory<PermissionDetailsDTO, PermissionDetails>("permission", PermissionDetails).create(factory => factory.build(
     factory.addNotify(() => ({
         getCurrent: async (): Promise<PermissionInfos[]> => {
-            const response = await ServiceFactory.http.get(PERMISSIONS_CURRENT_URL);
+            const response = await ServiceFactory.http.get(PERMISSIONS_CURRENT_URL());
             const result = response.data.map((dto: PermissionInfos) => new PermissionInfos(dto));
 
             return result;

package/composables/services/useUserOrganisationDispositions.ts

@@ -0,0 +1,76 @@
+import { Ref, onUnmounted, readonly, ref } from "vue";
+
+import { UpdateUserOrganisationDispositionDTO, UserOrganisationDispositionDetails, UserOrganisationDispositionDetailsDTO, UserOrganisationDispositionInfos, UserOrganisationDispositionInfosDTO } from "@dative-gpi/foundation-core-domain";
+import { ComposableFactory, onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { USER_ORGANISATION_DISPOSITION_URL } from "../../config/urls";
+
+const UserOrganisationDispositionServiceFactory = new ServiceFactory<UserOrganisationDispositionDetailsDTO, UserOrganisationDispositionDetails>("userOrganisationDisposition", UserOrganisationDispositionDetails).create(factory => factory.build(
+    factory.addNotify((notifyService) => ({
+        getTable: async (tableCode: string): Promise<UserOrganisationDispositionInfosDTO[]> => {
+            const response = await ServiceFactory.http.get(USER_ORGANISATION_DISPOSITION_URL(tableCode));
+            const result = response.data.map((dto: UserOrganisationDispositionInfosDTO) => new UserOrganisationDispositionInfos(dto));
+
+            notifyService.notify("update", result);
+
+            return result;
+        },
+        updateTable: async(tableCode: string, payload: UpdateUserOrganisationDispositionDTO[]): Promise<UserOrganisationDispositionInfosDTO[]> => {
+            const response = await ServiceFactory.http.post(USER_ORGANISATION_DISPOSITION_URL(tableCode), payload);
+            const result = response.data.map((dto: UserOrganisationDispositionInfosDTO) => new UserOrganisationDispositionInfos(dto));
+
+            notifyService.notify("update", result);
+
+            return result;
+        }
+    }))
+));
+
+export const useGetTable = () => {
+    const service = UserOrganisationDispositionServiceFactory();
+
+    const fetching = ref(false);
+    const fetched = ref<UserOrganisationDispositionInfos[]>([]) as Ref<UserOrganisationDispositionInfos[]>;
+
+    const fetch = async (tableCode: string) => {
+        fetching.value = true;
+        try {
+            fetched.value = await service.getTable(tableCode);
+        }
+        finally {
+            fetching.value = false;
+        }
+
+        return readonly(fetched as Ref<UserOrganisationDispositionInfos[]>);
+    }
+
+    return {
+        fetching: readonly(fetching),
+        fetch,
+        fetched: readonly(fetched)
+    }
+}
+export const useUpdateTable = () => {
+    const service = UserOrganisationDispositionServiceFactory();
+
+    const updating = ref(false);
+    const updated = ref<UserOrganisationDispositionInfos[]>([]) as Ref<UserOrganisationDispositionInfos[]>;
+
+    const update = async (tableCode: string, payload: UpdateUserOrganisationDispositionDTO[]) => {
+        updating.value = true;
+        try {
+            updated.value = await service.updateTable(tableCode, payload);
+        }
+        finally {
+            updating.value = false;
+        }
+
+        return readonly(updated as Ref<UserOrganisationDispositionInfos[]>);
+    }
+
+    return {
+        updating: readonly(updating),
+        update,
+        updated: readonly(updated)
+    }
+}

package/composables/services/useUserOrganisations.ts

@@ -13,7 +13,7 @@ const UserOrganisationServiceFactory = new ServiceFactory<UserOrganisationDetail
     factory.addRemove(USER_ORGANISATION_URL),
     factory.addNotify((notifyService) => ({
         getCurrent: async (): Promise<UserOrganisationDetails> => {
-            const response = await ServiceFactory.http.get(USER_ORGANISATION_CURRENT_URL);
+            const response = await ServiceFactory.http.get(USER_ORGANISATION_CURRENT_URL());
             const result = new UserOrganisationDetails(response.data);
 
             notifyService.notify("update", result);
@@ -21,7 +21,7 @@ const UserOrganisationServiceFactory = new ServiceFactory<UserOrganisationDetail
             return result;
         },
         updateCurrent: async(payload: UpdateUserOrganisationDTO): Promise<UserOrganisationDetails> => {
-            const response = await ServiceFactory.http.post(USER_ORGANISATION_CURRENT_URL, payload);
+            const response = await ServiceFactory.http.post(USER_ORGANISATION_CURRENT_URL(), payload);
             const result = new UserOrganisationDetails(response.data);
 
             notifyService.notify("update", result);

package/composables/services/useUsers.ts

@@ -1,90 +1,15 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
+import { UpdateUserDTO, UserDetails, UserDetailsDTO } from "@dative-gpi/foundation-shared-domain";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
-import { UpdateUserDTO, UserDetails, UserDetailsDTO, UserFilters, UserInfos, UserInfosDTO } from "@dative-gpi/foundation-core-domain";
-import { ComposableFactory, onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { USERS_URL, USER_CURRENT_URL, USER_URL } from "../../config/urls";
+import { USER_URL } from "../../config/urls";
 
 const UserServiceFactory = new ServiceFactory<UserDetailsDTO, UserDetails>("user", UserDetails).create(factory => factory.build(
     factory.addGet(USER_URL),
-    factory.addGetMany<UserInfosDTO, UserInfos, UserFilters>(USERS_URL, UserInfos),
     factory.addUpdate<UpdateUserDTO>(USER_URL),
     factory.addRemove(USER_URL),
-    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);
-
-            return result;
-        }
-    }))
+    factory.addNotify()
 ));
 
 export const useUser = ComposableFactory.get(UserServiceFactory);
-export const useUsers = ComposableFactory.getMany(UserServiceFactory);
 export const useUpdateUser = ComposableFactory.update(UserServiceFactory);
-export const useRemoveUser = ComposableFactory.remove(UserServiceFactory);
-export const useCurrentUser = () => {
-    const service = UserServiceFactory();
-
-    const fetching = ref(false);
-    const fetched = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
-
-    const fetch = async () => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getCurrent();
-        }
-        finally {
-            fetching.value = false;
-        }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
-        return readonly(fetched as Ref<UserDetails>);
-    }
-
-    return {
-        fetching: readonly(fetching),
-        fetch,
-        fetched: readonly(fetched)
-    }
-}
-export const useUpdateCurrentUser = () => {
-    const service = UserServiceFactory();
-
-    const updating = ref(false);
-    const updated = ref<UserDetails | null>(null) as Ref<UserDetails | null>;
-
-    const update = async (payload: UpdateUserDTO) => {
-        updating.value = true;
-        try {
-            updated.value = await service.updateCurrent(payload);
-        }
-        finally {
-            updating.value = false;
-        }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(updated))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
-        return readonly(updated as Ref<UserDetails>);
-    }
-
-    return {
-        updating: readonly(updating),
-        update,
-        updated: readonly(updated)
-    }
-}
+export const useRemoveUser = ComposableFactory.remove(UserServiceFactory);

package/composables/useCore.ts

@@ -0,0 +1,28 @@
+import { onMounted, ref } from "vue";
+
+import { useOrganisationId } from "@dative-gpi/foundation-core-services/composables";
+
+let called = false;
+
+const ready = ref(false);
+
+export function useCore() {
+    if (called) {
+        return {
+            ready
+        };
+    }
+
+    called = true;
+
+    const { ready: organisationIdReady } = useOrganisationId();
+
+    onMounted(async () => {
+        await organisationIdReady
+        ready.value = true;
+    });
+
+    return {
+        ready
+    };
+}

package/composables/useOrganisationId.ts

@@ -1,31 +1,18 @@
-import { onMounted, provide, ref, watch } from "vue";
-import { useRouter } from "vue-router";
+import { provide, ref, watch } from "vue";
 
-import { setOrganisationId } from "../config/urls/urlFactory";
-import { ORGANISATION_ID } from "../config/literals";
+import { ORGANISATION_ID } from "@dative-gpi/foundation-core-services/config/literals";
 
 let initialized = false;
 
 const organisationId = ref<string | null>(null);
 
 export const useOrganisationId = () => {
+    const setOrganisationId = (payload: string) => {
+        organisationId.value = payload;
+    };
+
     if (!initialized) {
         provide(ORGANISATION_ID, organisationId);
-
-        const router = useRouter();
-
-        watch(router.currentRoute, () => {
-            organisationId.value = router.currentRoute.value.params[ORGANISATION_ID] as string | null;
-            setOrganisationId(organisationId);
-        });
-
-        onMounted(() => {
-            if (organisationId.value) {
-                return;
-            }
-            organisationId.value = router.currentRoute.value.params[ORGANISATION_ID] as string | null;
-            setOrganisationId(organisationId);
-        });
     }
 
     initialized = true;
@@ -46,5 +33,6 @@ export const useOrganisationId = () => {
     return {
         ready,
         organisationId,
+        setOrganisationId
     };
 }

package/config/literals/index.ts

@@ -1,5 +1,3 @@
 export const ORGANISATION_ID = "organisationId";
-export const TIME_ZONE = "timeZone";
-export const LANGUAGE_CODE = "languageCode";
 
 export * as HUBS from "./hubs";

package/config/urls/actions.ts

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

package/config/urls/alerts.ts

@@ -1,6 +1,6 @@
 import { CORE_URL, HUBS_URL } from "./base";
 
-export const ALERTS_URL = `${CORE_URL}/alerts`;
-export const ALERT_URL = (alertId: string) => `${ALERTS_URL}/${encodeURIComponent(alertId)}`;
+export const ALERTS_URL = () => `${CORE_URL()}/alerts`;
+export const ALERT_URL = (alertId: string) => `${ALERTS_URL()}/${encodeURIComponent(alertId)}`;
 
-export const ALERTS_HUB_URL = `${HUBS_URL}/alerts`;
+export const ALERTS_HUB_URL = () => `${HUBS_URL()}/alerts`;

package/config/urls/articles.ts

@@ -1,4 +1,4 @@
-import { ORGANISATION_URL } from "./organisations";
+import { CORE_URL } from "./base";
 
-export const ARTICLES_URL = `${ORGANISATION_URL}/articles`;
-export const ARTICLE_URL = (articleId: string) => `${ARTICLES_URL}/${encodeURIComponent(articleId)}`;
+export const ARTICLES_URL = () => `${CORE_URL()}/articles`;
+export const ARTICLE_URL = (articleId: string) => `${ARTICLES_URL()}/${encodeURIComponent(articleId)}`;

package/config/urls/authTokens.ts

@@ -1,4 +1,4 @@
-import { ORGANISATION_URL } from "./organisations";
+import { CORE_URL } from "./base";
 
-export const AUTH_TOKENS_URL = `${ORGANISATION_URL}/pats`;
-export const AUTH_TOKEN_URL = (authTokenId: string) => `${AUTH_TOKENS_URL}/${encodeURIComponent(authTokenId)}`;
+export const AUTH_TOKENS_URL = () => `${CORE_URL()}/pats`;
+export const AUTH_TOKEN_URL = (authTokenId: string) => `${AUTH_TOKENS_URL()}/${encodeURIComponent(authTokenId)}`;

package/config/urls/base.ts

@@ -1,5 +1,4 @@
 import { urlFactory } from "./urlFactory";
 
-export const GATEWAY_URL = "/api/foundation/shared/v1";
-export const CORE_URL = urlFactory(organisationId => `/api/foundation/core/v1/organisations/${encodeURIComponent(organisationId)}`);
-export const HUBS_URL = urlFactory(organisationId => `/api/foundation/hubs/v1/organisations/${encodeURIComponent(organisationId)}`);
+export const CORE_URL = urlFactory(organisationId => `/api/core/v1/organisations/${encodeURIComponent(organisationId)}`);
+export const HUBS_URL = urlFactory(organisationId => `/api/hubs/v1/organisations/${encodeURIComponent(organisationId)}`);

package/config/urls/comments.ts

@@ -0,0 +1,4 @@
+import { CORE_URL } from "./base";
+
+export const COMMENTS_URL = () => `${CORE_URL()}/comments`;
+export const COMMENT_URL = (commentId: string) => `${COMMENTS_URL()}/${encodeURIComponent(commentId)}`;

package/config/urls/connectivityAlerts.ts

@@ -1,6 +1,6 @@
 import { CORE_URL, HUBS_URL } from "./base";
 
-export const CONNECTIVITY_ALERTS_URL = `${CORE_URL}/connectivity-alerts`;
-export const CONNECTIVITY_ALERT_URL = (connectivityAlertId: string) => `${CONNECTIVITY_ALERTS_URL}/${encodeURIComponent(connectivityAlertId)}`;
+export const CONNECTIVITY_ALERTS_URL = () => `${CORE_URL()}/connectivity-alerts`;
+export const CONNECTIVITY_ALERT_URL = (connectivityAlertId: string) => `${CONNECTIVITY_ALERTS_URL()}/${encodeURIComponent(connectivityAlertId)}`;
 
-export const CONNECTIVITY_ALERTS_HUB_URL = `${HUBS_URL}/connectivity-alerts`;
+export const CONNECTIVITY_ALERTS_HUB_URL = () => `${HUBS_URL()}/connectivity-alerts`;

package/config/urls/customProperties.ts

@@ -1,3 +1,3 @@
 import { CORE_URL } from "./base";
 
-export const CUSTOM_PROPERTIES_URL = `${CORE_URL}/custom-properties`;
+export const CUSTOM_PROPERTIES_URL = () => `${CORE_URL()}/custom-properties`;

package/config/urls/customPropertyValues.ts

@@ -2,4 +2,4 @@ import { PropertyEntity } from "@dative-gpi/foundation-core-domain";
 
 import { CORE_URL } from "./base";
 
-export const CUSTOM_PROPERTY_VALUES_URL = (entity: PropertyEntity, entityId: string, code: string) => `${CORE_URL}/custom-property-values/${encodeURIComponent(entity)}/${encodeURIComponent(entityId)}/${encodeURIComponent(code)}`;
+export const CUSTOM_PROPERTY_VALUES_URL = (entity: PropertyEntity, entityId: string, code: string) => `${CORE_URL()}/custom-property-values/${encodeURIComponent(entity)}/${encodeURIComponent(entityId)}/${encodeURIComponent(code)}`;

package/config/urls/dataCategories.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const DATA_CATEGORIES_URL = `${CORE_URL}/data-categories`;
-export const DATA_CATEGORY_URL = (dataCategoryId: string) => `${DATA_CATEGORIES_URL}/${encodeURIComponent(dataCategoryId)}`;
+export const DATA_CATEGORIES_URL = () => `${CORE_URL()}/data-categories`;
+export const DATA_CATEGORY_URL = (dataCategoryId: string) => `${DATA_CATEGORIES_URL()}/${encodeURIComponent(dataCategoryId)}`;

package/config/urls/dataDefinitions.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const DATA_DEFINITIONS_URL = `${CORE_URL}/data-definitions`;
-export const DATA_DEFINITION_URL = (dataDefinitionId: string) => `${DATA_DEFINITIONS_URL}/${encodeURIComponent(dataDefinitionId)}`;
+export const DATA_DEFINITIONS_URL = () => `${CORE_URL()}/data-definitions`;
+export const DATA_DEFINITION_URL = (dataDefinitionId: string) => `${DATA_DEFINITIONS_URL()}/${encodeURIComponent(dataDefinitionId)}`;

package/config/urls/deviceConnectivities.ts

@@ -3,4 +3,4 @@ import { HUBS_URL } from "./base";
 
 export const DEVICE_CONNECTIVITY_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATION_URL(deviceOrganisationId)}/connectivity`;
 
-export const DEVICE_CONNECTIVITIES_HUB_URL = `${HUBS_URL}/connectivities`;
+export const DEVICE_CONNECTIVITIES_HUB_URL = () => `${HUBS_URL()}/connectivities`;

package/config/urls/deviceOrganisations.ts

@@ -1,6 +1,6 @@
 import { CORE_URL } from "./base";
 
-export const DEVICE_ORGANISATIONS_URL = `${CORE_URL}/device-organisations`;
-export const DEVICE_ORGANISATION_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATIONS_URL}/${encodeURIComponent(deviceOrganisationId)}`;
+export const DEVICE_ORGANISATIONS_URL = () => `${CORE_URL()}/device-organisations`;
+export const DEVICE_ORGANISATION_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATIONS_URL()}/${encodeURIComponent(deviceOrganisationId)}`;
 export const DEVICE_ORGANISATION_GROUP_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATION_URL(deviceOrganisationId)}/group`;
 export const DEVICE_ORGANISATION_LOCATION_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATION_URL(deviceOrganisationId)}/location`;

package/config/urls/deviceStatuses.ts

@@ -3,4 +3,4 @@ import { HUBS_URL } from "./base";
 
 export const DEVICE_STATUS_URL = (deviceOrganisationId: string) => `${DEVICE_ORGANISATION_URL(deviceOrganisationId)}/status`;
 
-export const DEVICE_STATUSES_HUB_URL = `${HUBS_URL}/statuses`;
+export const DEVICE_STATUSES_HUB_URL = () => `${HUBS_URL()}/statuses`;

package/config/urls/groups.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const GROUPS_URL = `${CORE_URL}/groups`;
-export const GROUP_URL = (groupId: string) => `${GROUPS_URL}/${encodeURIComponent(groupId)}`;
+export const GROUPS_URL = () => `${CORE_URL()}/groups`;
+export const GROUP_URL = (groupId: string) => `${GROUPS_URL()}/${encodeURIComponent(groupId)}`;

package/config/urls/images.ts

@@ -1,5 +1,5 @@
 import { CORE_URL } from "./base";
 
-export const IMAGES_URL = `${CORE_URL}/images`;
-export const IMAGE_RAW_URL = (imageId: string) => `${IMAGES_URL}/raw/${encodeURIComponent(imageId)}`; 
-export const IMAGE_THUMBNAIL_URL = (imageId: string) => `${IMAGES_URL}/thumbnail/${encodeURIComponent(imageId)}`
+export const IMAGES_URL = () => `${CORE_URL()}/images`;
+export const IMAGE_RAW_URL = (imageId: string) => `${IMAGES_URL()}/raw/${encodeURIComponent(imageId)}`; 
+export const IMAGE_THUMBNAIL_URL = (imageId: string) => `${IMAGES_URL()}/thumbnail/${encodeURIComponent(imageId)}`

package/config/urls/index.ts

@@ -1,7 +1,8 @@
+export * from "./actions";
 export * from "./alerts";
-export * from "./applications";
 export * from "./articles";
 export * from "./authTokens";
+export * from "./comments";
 export * from "./connectivityAlerts";
 export * from "./customProperties";
 export * from "./customPropertyValues";
@@ -10,7 +11,6 @@ export * from "./dataDefinitions";
 export * from "./deviceConnectivities";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
-export * from "./families";
 export * from "./groups";
 export * from "./images";
 export * from "./languages";
@@ -23,7 +23,6 @@ export * from "./permissionCategories";
 export * from "./permissions";
 export * from "./roleOrganisations";
 export * from "./roleOrganisationTypes";
-export * from "./timeZones";
-export * from "./translations";
+export * from "./userOrganisationDispositions";
 export * from "./userOrganisations";
 export * from "./users";

package/config/urls/languages.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const LANGUAGES_URL = `${CORE_URL}/languages`;
-export const LANGUAGE_URL = (languageId: string) => `${LANGUAGES_URL}/${encodeURIComponent(languageId)}`;
+export const LANGUAGES_URL = () => `${CORE_URL()}/languages`;
+export const LANGUAGE_URL = (languageId: string) => `${LANGUAGES_URL()}/${encodeURIComponent(languageId)}`;

package/config/urls/locations.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const LOCATIONS_URL = `${CORE_URL}/locations`;
-export const LOCATION_URL = (locationId: string) => `${LOCATIONS_URL}/${encodeURIComponent(locationId)}`;
+export const LOCATIONS_URL = () => `${CORE_URL()}/locations`;
+export const LOCATION_URL = (locationId: string) => `${LOCATIONS_URL()}/${encodeURIComponent(locationId)}`;

package/config/urls/manufacturers.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const MANUFACTURERS_URL = `${CORE_URL}/manufacturers`;
-export const MANUFACTURER_URL = (manufacturerId: string) => `${MANUFACTURERS_URL}/${encodeURIComponent(manufacturerId)}`;
+export const MANUFACTURERS_URL = () => `${CORE_URL()}/manufacturers`;
+export const MANUFACTURER_URL = (manufacturerId: string) => `${MANUFACTURERS_URL()}/${encodeURIComponent(manufacturerId)}`;

package/config/urls/models.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const MODELS_URL = `${CORE_URL}/models`;
-export const MODEL_URL = (modelId: string) => `${MODELS_URL}/${encodeURIComponent(modelId)}`;
+export const MODELS_URL = () => `${CORE_URL()}/models`;
+export const MODEL_URL = (modelId: string) => `${MODELS_URL()}/${encodeURIComponent(modelId)}`;

package/config/urls/organisationTypes.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const ORGANISATION_TYPES_URL = `${CORE_URL}/organisation-types`;
-export const ORGANISATION_TYPE_URL = (organisationTypeId: string) => `${ORGANISATION_TYPES_URL}/${encodeURIComponent(organisationTypeId)}`;
+export const ORGANISATION_TYPES_URL = () => `${CORE_URL()}/organisation-types`;
+export const ORGANISATION_TYPE_URL = (organisationTypeId: string) => `${ORGANISATION_TYPES_URL()}/${encodeURIComponent(organisationTypeId)}`;

package/config/urls/organisations.ts

@@ -1,7 +1,3 @@
-import { urlFactory } from "./urlFactory";
-import { GATEWAY_URL } from "./base";
+import { CORE_URL } from "./base";
 
-export const ORGANISATIONS_URL = `${GATEWAY_URL}/organisations`;
-export const ORGANISATION_URL = urlFactory(organisationId => `${ORGANISATIONS_URL}/${encodeURIComponent(organisationId)}`); 
-
-export const ORGANISATION_DASHBOARD_URL = `${ORGANISATION_URL()}/dashboard`;
+export const ORGANISATION_DASHBOARD_URL = () => `${CORE_URL()}/dashboard`;

package/config/urls/permissionCategories.ts

@@ -1,3 +1,3 @@
 import { CORE_URL } from "./base";
 
-export const PERMISSION_CATEGORIES_URL = `${CORE_URL}/permission-categories`;
+export const PERMISSION_CATEGORIES_URL = () => `${CORE_URL()}/permission-categories`;

package/config/urls/permissions.ts

@@ -1,3 +1,3 @@
 import { CORE_URL } from "./base";
 
-export const PERMISSIONS_CURRENT_URL = `${CORE_URL}/permissions/current`;
+export const PERMISSIONS_CURRENT_URL = () => `${CORE_URL()}/permissions/current`;

package/config/urls/roleOrganisationTypes.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const ROLE_ORGANISATION_TYPES_URL = `${CORE_URL}/role-organisation-types`;
-export const ROLE_ORGANISATION_TYPE_URL = (roleOrganisationTypeId: string) => `${ROLE_ORGANISATION_TYPES_URL}/${encodeURIComponent(roleOrganisationTypeId)}`;
+export const ROLE_ORGANISATION_TYPES_URL = () => `${CORE_URL()}/role-organisation-types`;
+export const ROLE_ORGANISATION_TYPE_URL = (roleOrganisationTypeId: string) => `${ROLE_ORGANISATION_TYPES_URL()}/${encodeURIComponent(roleOrganisationTypeId)}`;

package/config/urls/roleOrganisations.ts

@@ -1,4 +1,4 @@
 import { CORE_URL } from "./base";
 
-export const ROLE_ORGANISATIONS_URL = `${CORE_URL}/role-organisations`;
-export const ROLE_ORGANISATION_URL = (roleOrganisationId: string) => `${ROLE_ORGANISATIONS_URL}/${encodeURIComponent(roleOrganisationId)}`;
+export const ROLE_ORGANISATIONS_URL = () => `${CORE_URL()}/role-organisations`;
+export const ROLE_ORGANISATION_URL = (roleOrganisationId: string) => `${ROLE_ORGANISATIONS_URL()}/${encodeURIComponent(roleOrganisationId)}`;

package/config/urls/urlFactory.ts

@@ -1,17 +1,12 @@
-import { Ref, ref } from "vue";
+import { useOrganisationId } from "../../composables/useOrganisationId";
 
-const organisationId = ref<string | null>(null);
-
-export function setOrganisationId(orgId: Ref<string | null>) {
-    organisationId.value = orgId.value;
-}
+const { organisationId } = useOrganisationId();
 
 export function urlFactory(url: (orgId: string) => string) {
     return () => {
         if (!organisationId.value) {
             throw new Error("OrganisationId is not set");
         }
-
         return url(organisationId.value);
     }
 }

package/config/urls/userOrganisationDispositions.ts

@@ -0,0 +1,4 @@
+import { CORE_URL } from "./base";
+
+export const USER_ORGANISATION_DISPOSITIONS_URL = () => `${CORE_URL()}/user-organisation-dispositions`;
+export const USER_ORGANISATION_DISPOSITION_URL = (tableCode: string) => `${USER_ORGANISATION_DISPOSITIONS_URL()}/${encodeURIComponent(tableCode)}`;

package/config/urls/userOrganisations.ts

@@ -1,5 +1,5 @@
 import { CORE_URL } from "./base";
 
-export const USER_ORGANISATIONS_URL = `${CORE_URL}/user-organisations`;
-export const USER_ORGANISATION_URL = (userOrganisationId: string) => `${USER_ORGANISATIONS_URL}/${encodeURIComponent(userOrganisationId)}`;
-export const USER_ORGANISATION_CURRENT_URL = `${USER_ORGANISATIONS_URL}/current`;
+export const USER_ORGANISATIONS_URL = () => `${CORE_URL()}/user-organisations`;
+export const USER_ORGANISATION_URL = (userOrganisationId: string) => `${USER_ORGANISATIONS_URL()}/${encodeURIComponent(userOrganisationId)}`;
+export const USER_ORGANISATION_CURRENT_URL = () => `${USER_ORGANISATIONS_URL()}/current`;

package/config/urls/users.ts

@@ -1,5 +1,5 @@
 import { CORE_URL } from "./base";
 
-export const USERS_URL = `${CORE_URL}/users`;
-export const USER_URL = (userId: string) => `${USERS_URL}/${encodeURIComponent(userId)}`;
-export const USER_CURRENT_URL = `${USERS_URL}/current`;
+export const USERS_URL = () => `${CORE_URL()}/users`;
+export const USER_URL = (userId: string) => `${USERS_URL()}/${encodeURIComponent(userId)}`;
+export const USER_CURRENT_URL = () => `${USERS_URL()}/current`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dative-gpi/foundation-core-services",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/bones-ui": "^0.0.50",
-    "@dative-gpi/foundation-core-domain": "0.0.7",
+    "@dative-gpi/bones-ui": "^0.0.58",
+    "@dative-gpi/foundation-core-domain": "0.0.9",
     "@microsoft/signalr": "^8.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "970e56be5ba41712db154bd27ad98962dbeb802e"
+  "gitHead": "d079d93c7d8677f8269b97bc71820bc35dc46921"
 }

package/composables/services/useApplications.ts

@@ -1,47 +0,0 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
-
-import { ApplicationDetails, ApplicationDetailsDTO } from "@dative-gpi/foundation-core-domain";
-import { onEntityChanged, 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 fetching = ref(false);
-    const fetched = ref<ApplicationDetails | null>(null) as Ref<ApplicationDetails | null>;
-
-    const fetch = async () => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getCurrent();
-        }
-        finally {
-            fetching.value = false;
-        }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
-        return readonly(fetched as Ref<ApplicationDetails>);
-    }
-
-    return {
-        fetching: readonly(fetching),
-        fetch,
-        fetched: readonly(fetched)
-    }
-}

package/composables/services/useFamilies.ts

@@ -1,13 +0,0 @@
-import { FamilyDetails, FamilyDetailsDTO, FamilyFilters, FamilyInfos, FamilyInfosDTO } from "@dative-gpi/foundation-core-domain";
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { FAMILIES_URL, FAMILY_URL } from "../../config/urls";
-
-const FamilieserviceFactory = new ServiceFactory<FamilyDetailsDTO, FamilyDetails>("family", FamilyDetails).create(factory => factory.build(
-    factory.addGet(FAMILY_URL),
-    factory.addGetMany<FamilyInfosDTO, FamilyInfos, FamilyFilters>(FAMILIES_URL, FamilyInfos),
-    factory.addNotify()
-));
-
-export const useFamily = ComposableFactory.get(FamilieserviceFactory);
-export const useFamilies = ComposableFactory.getMany(FamilieserviceFactory);

package/composables/services/useTimeZones.ts

@@ -1,11 +0,0 @@
-import { TimeZoneFilters, TimeZoneInfos, TimeZoneInfosDTO } from "@dative-gpi/foundation-core-domain";
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { TIME_ZONES_URL } from "../../config/urls";
-
-const TimeZoneServiceFactory = new ServiceFactory<TimeZoneInfosDTO, TimeZoneInfos>("timeZone", TimeZoneInfos).create(factory => factory.build(
-    factory.addGetMany<TimeZoneInfosDTO, TimeZoneInfos, TimeZoneFilters>(TIME_ZONES_URL, TimeZoneInfos),
-    factory.addNotify()
-));
-
-export const useTimeZones = ComposableFactory.getMany(TimeZoneServiceFactory);

package/composables/services/useTranslations.ts

@@ -1,42 +0,0 @@
-import { Ref, readonly, ref } from "vue";
-
-import { TranslationInfos, TranslationInfosDTO, TranslationDetails, TranslationDetailsDTO } from "@dative-gpi/foundation-core-domain";
-import { 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 fetched = ref<TranslationInfos[] | null>(null) as Ref<TranslationInfos[] | null>;
-
-    const fetch = async (languageCode: string) => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getMany(languageCode);
-        }
-        finally {
-            fetching.value = false;
-        }
-
-        return readonly(fetched as Ref<TranslationInfos[]>);
-    }
-
-    return {
-        fetching: readonly(fetching),
-        fetch,
-        fetched: readonly(fetched)
-    }
-}

package/composables/useLanguageCode.ts

@@ -1,48 +0,0 @@
-import { onMounted, provide, ref, watch } from "vue";
-
-import { LANGUAGE_CODE } from "../config/literals";
-
-let initialized = false;
-
-const languageCode = ref<string | null>(null);
-
-export const useLanguageCode = () => {
-    const setLanguageCode = (payload: string) => {
-        localStorage.setItem(LANGUAGE_CODE, payload);
-        languageCode.value = payload;
-    };
-
-    if (!initialized) {
-        provide(LANGUAGE_CODE, languageCode);
-
-        onMounted(() => {
-            if (languageCode.value) {
-                return;
-            }
-            if (localStorage.getItem(LANGUAGE_CODE) != null) {
-                languageCode.value = localStorage.getItem(LANGUAGE_CODE);
-            }
-        });
-    }
-
-    initialized = true;
-
-    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/useTimeZone.ts

@@ -1,75 +0,0 @@
-import { onMounted, provide, ref, watch } from "vue";
-
-import { TimeZoneInfos } from "@dative-gpi/foundation-core-domain/models";
-
-import { TIME_ZONE } from "../config/literals";
-
-let initialized = false;
-
-const timeZone = ref<TimeZoneInfos | null>(null);
-
-const getLocalOffset = (): string => {
-    const timeZoneName = Intl.DateTimeFormat("ia", {
-        timeZoneName: "short",
-        timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
-    }).formatToParts().find((i) => i.type === "timeZoneName")?.value ?? "";
-
-    const offset = timeZoneName.slice(3);
-    if (!offset) {
-        return "UTC ";
-    }
-  
-    const matchData = offset.match(/([+-])(\d+)(?::(\d+))?/);
-    if (matchData)  {
-        const [_, sign, hour, minute] = matchData;
-        return `UTC ${sign}${hour.padStart(2, "0")}:${(minute ?? "").padStart(2, "0")}:00`;
-    }
-    return "UTC ";
-};
-
-export const useTimeZone = () => {
-    const setTimeZone = (payload: TimeZoneInfos) => {
-        localStorage.setItem(TIME_ZONE, JSON.stringify(payload));
-        timeZone.value = payload;
-    };
-
-    if (!initialized) {
-        provide(TIME_ZONE, timeZone);
-
-        onMounted(() => {
-            if (timeZone.value) {
-                return;
-            }
-            if (localStorage.getItem(TIME_ZONE) != null) {
-                timeZone.value = JSON.parse(localStorage.getItem(TIME_ZONE)!) as TimeZoneInfos;
-            }
-            else {
-                setTimeZone(new TimeZoneInfos({
-                    id: Intl.DateTimeFormat().resolvedOptions().timeZone,
-                    offset: getLocalOffset()
-                }));
-            }
-        });
-    }
-
-    initialized = true;
-
-    const ready = new Promise((resolve) => {
-        if (timeZone.value) {
-            resolve(timeZone.value);
-        }
-        else {
-            watch(timeZone, () => {
-                if (timeZone.value) {
-                    resolve(timeZone.value);
-                }
-            });
-        }
-    });
-
-    return {
-        ready,
-        timeZone,
-        setTimeZone
-    };
-}

package/config/urls/applications.ts

@@ -1,4 +0,0 @@
-import { GATEWAY_URL } from "./base";
-
-export const APPLICATIONS_URL = `${GATEWAY_URL}/applications`;
-export const APPLICATION_CURRENT_URL = `${APPLICATIONS_URL}/curent`;

package/config/urls/families.ts

@@ -1,4 +0,0 @@
-import { CORE_URL } from "./base";
-
-export const FAMILIES_URL = `${CORE_URL}/families`;
-export const FAMILY_URL = (familyId: string) => `${FAMILIES_URL}/${encodeURIComponent(familyId)}`;

package/config/urls/files.ts

@@ -1,4 +0,0 @@
-import { GATEWAY_URL } from "./base";
-
-export const FILES_URL = `${GATEWAY_URL}/files`;
-export const FILE_URL = (fileId: string) => `${FILES_URL}/${fileId}`;

package/config/urls/timeZones.ts

@@ -1,3 +0,0 @@
-import { GATEWAY_URL } from "./base";
-
-export const TIME_ZONES_URL = `${GATEWAY_URL}/time-zones`;

package/config/urls/translations.ts

@@ -1,4 +0,0 @@
-import { GATEWAY_URL } from "./base";
-
-export const TRANSLATIONS_URL = `${GATEWAY_URL}/translations`;
-export const TRANSLATIONS_LANGUAGE_URL = (languageCode: string) => `${TRANSLATIONS_URL}/${encodeURIComponent(languageCode)}`;