@dative-gpi/foundation-core-services 0.0.230 → 0.1.68

package/composables/services/useUserOrganisations.ts

@@ -1,40 +1,40 @@
-import type { Ref } from "vue";
+import { type Ref } from "vue";
+
+import { type ChangeCurrentUserOrganisationDashboardDTO, type CreateUserOrganisationDTO, type UpdateUserOrganisationDTO, UserOrganisationDetails, type UserOrganisationDetailsDTO, type UserOrganisationFilters, UserOrganisationInfos, type UserOrganisationInfosDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
-import type { ChangeCurrentUserOrganisationDashboardDTO, CreateUserOrganisationDTO, UpdateUserOrganisationDTO, UserOrganisationDetailsDTO, UserOrganisationFilters, UserOrganisationInfosDTO } from "@dative-gpi/foundation-core-domain/models";
-import { UserOrganisationDetails, UserOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
 
 import { USER_ORGANISATIONS_URL, USER_ORGANISATION_CURRENT_DASHBOARD_URL, USER_ORGANISATION_CURRENT_URL, USER_ORGANISATION_URL } from "../../config/urls";
 
 const UserOrganisationServiceFactory = new ServiceFactory<UserOrganisationDetailsDTO, UserOrganisationDetails>("userOrganisation", UserOrganisationDetails).create(factory => factory.build(
-    factory.addGet(USER_ORGANISATION_URL),
-    factory.addGetMany<UserOrganisationInfosDTO, UserOrganisationInfos, UserOrganisationFilters>(USER_ORGANISATIONS_URL, UserOrganisationInfos),
-    factory.addCreate<CreateUserOrganisationDTO>(USER_ORGANISATIONS_URL),
-    factory.addUpdate<UpdateUserOrganisationDTO>(USER_ORGANISATION_URL),
-    factory.addRemove(USER_ORGANISATION_URL),
-    ServiceFactory.addCustom("getCurrent", (axios) => axios.get(USER_ORGANISATION_CURRENT_URL()), (dto: UserOrganisationDetailsDTO) => new UserOrganisationDetails(dto)),
-    factory.addNotify(notifyService => ({
-        ...ServiceFactory.addCustom("updateCurrent", (axios, payload: UpdateUserOrganisationDTO) => axios.post(USER_ORGANISATION_CURRENT_URL(), payload), (dto: UserOrganisationDetailsDTO) => {
-            const result = new UserOrganisationDetails(dto)
-            notifyService.notify("update", result);
-            return result;
-        }),
-        ...ServiceFactory.addCustom("changeCurrentDashboard", (axios, payload: ChangeCurrentUserOrganisationDashboardDTO) => axios.put(USER_ORGANISATION_CURRENT_DASHBOARD_URL(), payload), (dto: UserOrganisationDetailsDTO) => {
-            const result = new UserOrganisationDetails(dto)
-            notifyService.notify("update", result);
-            return result;
-        })
-    }))
+  factory.addGet(USER_ORGANISATION_URL),
+  factory.addGetMany<UserOrganisationInfosDTO, UserOrganisationInfos, UserOrganisationFilters>(USER_ORGANISATIONS_URL, UserOrganisationInfos),
+  factory.addCreate<CreateUserOrganisationDTO>(USER_ORGANISATIONS_URL),
+  factory.addUpdate<UpdateUserOrganisationDTO>(USER_ORGANISATION_URL),
+  factory.addRemove(USER_ORGANISATION_URL),
+  ServiceFactory.addCustom("getCurrent", (axios) => axios.get(USER_ORGANISATION_CURRENT_URL()), (dto: UserOrganisationDetailsDTO) => new UserOrganisationDetails(dto)),
+  factory.addNotify(notifyService => ({
+    ...ServiceFactory.addCustom("updateCurrent", (axios, payload: UpdateUserOrganisationDTO) => axios.post(USER_ORGANISATION_CURRENT_URL(), payload), (dto: UserOrganisationDetailsDTO) => {
+      const result = new UserOrganisationDetails(dto)
+      notifyService.notify("update", result);
+      return result;
+    }),
+    ...ServiceFactory.addCustom("changeCurrentDashboard", (axios, payload: ChangeCurrentUserOrganisationDashboardDTO) => axios.put(USER_ORGANISATION_CURRENT_DASHBOARD_URL(), payload), (dto: UserOrganisationDetailsDTO) => {
+      const result = new UserOrganisationDetails(dto)
+      notifyService.notify("update", result);
+      return result;
+    })
+  }))
 ));
 
 export const useTrackUserOrganisation = ComposableFactory.track(UserOrganisationServiceFactory);
 export const useTrackUserOrganisationRef = ComposableFactory.trackRef(UserOrganisationServiceFactory);
 
 const trackUserOrganisation = () => {
-    const { track } = useTrackUserOrganisationRef();
+  const { track } = useTrackUserOrganisationRef();
 
-    return (userOrganisation: Ref<UserOrganisationDetails>) => {
-        track(userOrganisation);
-    }
+  return (userOrganisation: Ref<UserOrganisationDetails>) => {
+    track(userOrganisation);
+  }
 }
 
 export const useUserOrganisation = ComposableFactory.get(UserOrganisationServiceFactory);

package/composables/services/useWidgetTemplates.ts

@@ -1,13 +1,12 @@
-import type { WidgetTemplateFilters, WidgetTemplateInfosDTO, WidgetTemplateDetailsDTO } from "@dative-gpi/foundation-core-domain/models";
-import { WidgetTemplateInfos, WidgetTemplateDetails } from "@dative-gpi/foundation-core-domain/models";
+import { WidgetTemplateInfos, type WidgetTemplateInfosDTO, type WidgetTemplateFilters, WidgetTemplateDetails, type WidgetTemplateDetailsDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { WIDGET_TEMPLATES_URL, WIDGET_TEMPLATE_URL } from "../../config/urls";
 
 const WidgetTemplateServiceFactory = new ServiceFactory<WidgetTemplateDetailsDTO, WidgetTemplateDetails>("widgetTemplate", WidgetTemplateDetails).create(factory => factory.build(
-    factory.addGet(WIDGET_TEMPLATE_URL),
-    factory.addGetMany<WidgetTemplateInfosDTO, WidgetTemplateInfos, WidgetTemplateFilters>(WIDGET_TEMPLATES_URL, WidgetTemplateInfos),
-    factory.addNotify()
+  factory.addGet(WIDGET_TEMPLATE_URL),
+  factory.addGetMany<WidgetTemplateInfosDTO, WidgetTemplateInfos, WidgetTemplateFilters>(WIDGET_TEMPLATES_URL, WidgetTemplateInfos),
+  factory.addNotify()
 ));
 
 export const useWidgetTemplate = ComposableFactory.get(WidgetTemplateServiceFactory);

package/composables/useRouteOrganisation.ts

@@ -0,0 +1,24 @@
+import type { RouteLocation } from "vue-router";
+
+import { useAppOrganisationId } from "../composables"
+
+export const useRouteOrganisation = () => {
+    const { organisationId } = useAppOrganisationId();
+
+    const $r = (route: Partial<RouteLocation>) => {
+        if (route.params) {
+            route.params.organisationId = organisationId.value!;
+        }
+        else {
+            route.params = {
+                organisationId: organisationId.value!
+            }
+        }
+
+        return route;
+    }
+
+    return {
+        $r
+    }
+}

package/config/literals/index.ts

@@ -1,4 +1,2 @@
 export const ENTITY_ID = "entityId";
-export const ORGANISATION_ID = "organisationId";
-
-export * as HUBS from "./hubs";
+export const ORGANISATION_ID = "organisationId";

package/config/urls/index.ts

@@ -23,7 +23,6 @@ export * from "./groups";
 export * from "./locations";
 export * from "./manufacturers";
 export * from "./models";
-export * from "./notifications";
 export * from "./organisations";
 export * from "./organisationTypes";
 export * from "./permissionCategories";
@@ -35,6 +34,7 @@ export * from "./scenarioOrganisations";
 export * from "./scenarioOrganisationTypes";
 export * from "./serviceAccountOrganisationAuthTokens";
 export * from "./serviceAccountOrganisations";
+export * from "./serviceAccountRoleOrganisations";
 export * from "./userOrganisations";
 export * from "./userOrganisationTables";
 export * from "./widgetTemplates";

package/config/urls/serviceAccountOrganisationAuthTokens.ts

@@ -1,5 +1,4 @@
-import { SERVICE_ACCOUNT_ORGANISATION_URL } from "./serviceAccountOrganisations";
+import { CORE_URL } from "./base";
 
-
-export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL = (serviceAccountOrganisationId: string) => `${SERVICE_ACCOUNT_ORGANISATION_URL(serviceAccountOrganisationId)}/pats`;
-export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKEN_URL = (serviceAccountOrganisationId: string, authTokenId: string) => `${SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL(serviceAccountOrganisationId)}/${encodeURIComponent(authTokenId)}`;
+export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL = () => `${CORE_URL()}/pats`;
+export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKEN_URL = (authTokenId: string) => `${SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL()}/${encodeURIComponent(authTokenId)}`;

package/config/urls/serviceAccountRoleOrganisations.ts

@@ -0,0 +1,4 @@
+import { CORE_URL } from "./base";
+
+export const SERVICE_ACCOUNT_ROLE_ORGANISATIONS_URL = () => `${CORE_URL()}/service-account-role-organisations`;
+export const SERVICE_ACCOUNT_ROLE_ORGANISATION_URL = (serviceAccountRoleOrganisationId: string) => `${SERVICE_ACCOUNT_ROLE_ORGANISATIONS_URL()}/${encodeURIComponent(serviceAccountRoleOrganisationId)}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-services",
   "sideEffects": false,
-  "version": "0.0.230",
+  "version": "0.1.68",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "0.0.230"
+    "@dative-gpi/foundation-core-domain": "0.1.68"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -18,5 +18,5 @@
     "vue": "^3.4.29",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "93365f65d39d6c9cc3821ffb48cba187200deaf9"
+  "gitHead": "fa2ed7031088f422751fc1d939f2fbe168ae0596"
 }

package/composables/services/useNotifications.ts

@@ -1,48 +0,0 @@
-import { NotificationDetails, type NotificationDetailsDTO, NotificationInfos, type NotificationInfosDTO, type NotificationFilters } from "@dative-gpi/foundation-core-domain/models";
-import { HubFactory } from "@dative-gpi/foundation-shared-services/tools/hubFactory";
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
-
-import { NOTIFICATIONS_HUB_URL, NOTIFICATIONS_URL, NOTIFICATION_URL } from "../../config";
-import { HUBS } from "../../config/literals";
-
-const NotificationServiceFactory = new ServiceFactory<NotificationDetailsDTO, NotificationDetails>("notifications", NotificationDetails).create(factory => factory.build( 
-  factory.addGet(NOTIFICATION_URL),
-  factory.addGetMany<NotificationInfosDTO, NotificationInfos, NotificationFilters>(NOTIFICATIONS_URL, NotificationInfos),
-  factory.addNotify(notifyService => ({
-    notifyCreate: (notification: NotificationDetails) => notifyService.notify("add", notification),
-    ...ServiceFactory.addCustom("acknowledge", (axios, notificationId: string) => axios.patch(NOTIFICATION_URL(notificationId)), (dto: NotificationDetailsDTO) => {
-      const result = new NotificationDetails(dto);
-      notifyService.notify("update", result);
-      return result;
-    })
-  }))
-));
-
-const useNotificationsHub = HubFactory.create(NOTIFICATIONS_HUB_URL,
-    (connection, { hasWatchers }) => {
-        connection.on(HUBS.CREATE_NOTIFICATION, (notificationId: string) => hasWatchers()
-            ? NotificationServiceFactory.get(notificationId).then(NotificationServiceFactory.notifyCreate)
-            : null);
-    },
-    async (connection) => {
-        await connection.invoke(HUBS.SUBSCRIBE);
-    }
-);
-
-const useWatchNotifications = HubFactory.createWatcher(useNotificationsHub);
-
-export const useNotification = ComposableFactory.get(NotificationServiceFactory, () => {
-  const { watchOne } = useWatchNotifications();
-  return (notification) => {
-    watchOne(notification.value.id);
-  }
-});
-
-export const useNotifications = ComposableFactory.getMany(NotificationServiceFactory, () => {
-  const { watchMany } = useWatchNotifications();
-  return () => {
-    watchMany();
-  }
-});
-
-export const useAcknowledgeNotification = ComposableFactory.custom(NotificationServiceFactory.acknowledge);

package/config/literals/hubs.ts

@@ -1,16 +0,0 @@
-export const SUBSCRIBE = "Subscribe";
-export const UNSUBSCRIBE = "Unsubscribe";
-
-export const UPDATE_DEVICE_STATUS = "UpdateDeviceStatus";
-
-export const UPDATE_DEVICE_CONNECTIVITY = "UpdateDeviceConnectivity";
-
-export const CREATE_ALERT = "CreateAlert";
-export const UPDATE_ALERT = "UpdateAlert";
-export const REMOVE_ALERT = "RemoveAlert";
-
-export const CREATE_CONNECTIVITY_ALERT = "CreateConnectivityAlert";
-export const UPDATE_CONNECTIVITY_ALERT = "UpdateConnectivityAlert";
-export const REMOVE_CONNECTIVITY_ALERT = "RemoveConnectivityAlert";
-
-export const CREATE_NOTIFICATION = "CreateNotification";

package/config/urls/notifications.ts

@@ -1,6 +0,0 @@
-import { CORE_URL, HUBS_URL } from "./base";
-
-export const NOTIFICATIONS_URL = () => `${CORE_URL()}/notifications`;
-export const NOTIFICATION_URL = (notificationId: string) => `${CORE_URL()}/notifications/${notificationId}`;
-
-export const NOTIFICATIONS_HUB_URL = () => `${HUBS_URL()}/notifications`;