@dative-gpi/foundation-core-services 0.0.215 → 0.0.217

package/composables/services/index.ts

@@ -25,6 +25,7 @@ export * from "./useGroups";
 export * from "./useLocations";
 export * from "./useManufacturers";
 export * from "./useModels";
+export * from "./useNotifications";
 export * from "./useOrganisations";
 export * from "./useOrganisationTypes";
 export * from "./usePermissionCategories";

package/composables/services/useAlerts.ts

@@ -1,5 +1,4 @@
-import type { AlertDetailsDTO, AlertFilters, AlertInfosDTO } from "@dative-gpi/foundation-core-domain/models";
-import { AlertDetails, AlertInfos } from "@dative-gpi/foundation-core-domain/models";
+import { AlertDetails, type AlertDetailsDTO, type AlertFilters, AlertInfos, type AlertInfosDTO } 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";
 
@@ -7,52 +6,52 @@ import { ALERTS_HUB_URL, ALERTS_URL, ALERT_URL } from "../../config/urls";
 import { HUBS } from "../../config/literals";
 
 const AlertServiceFactory = new ServiceFactory<AlertDetailsDTO, AlertDetails>("alert", AlertDetails).create(factory => factory.build(
-    factory.addGet(ALERT_URL),
-    factory.addGetMany<AlertInfosDTO, AlertInfos, AlertFilters>(ALERTS_URL, AlertInfos),
-    factory.addRemove(ALERT_URL),
-    factory.addNotify(notifyService => ({
-        notifyCreate: (alert: AlertDetails) => notifyService.notify("add", alert),
-        notifyUpdate: (alert: AlertDetails) => notifyService.notify("update", alert),
-        notifyRemove: (alertId: string) => notifyService.notify("delete", alertId),
-        ...ServiceFactory.addCustom("acknowledge", (axios, alertId: string) => axios.patch(ALERT_URL(alertId)), (dto: AlertDetailsDTO) => {
-            const result = new AlertDetails(dto);
-            notifyService.notify("update", result);
-            return result;
-        })
-    }))
+  factory.addGet(ALERT_URL),
+  factory.addGetMany<AlertInfosDTO, AlertInfos, AlertFilters>(ALERTS_URL, AlertInfos),
+  factory.addRemove(ALERT_URL),
+  factory.addNotify(notifyService => ({
+    notifyCreate: (alert: AlertDetails) => notifyService.notify("add", alert),
+    notifyUpdate: (alert: AlertDetails) => notifyService.notify("update", alert),
+    notifyRemove: (alertId: string) => notifyService.notify("delete", alertId),
+    ...ServiceFactory.addCustom("acknowledge", (axios, alertId: string) => axios.patch(ALERT_URL(alertId)), (dto: AlertDetailsDTO) => {
+      const result = new AlertDetails(dto);
+      notifyService.notify("update", result);
+      return result;
+    })
+  }))
 ));
 
 const useAlertsHub = HubFactory.create(ALERTS_HUB_URL,
-    (connection, { isWatched, hasWatchers }) => {
-        connection.on(HUBS.CREATE_ALERT, (alertId: string) => hasWatchers()
-            ? AlertServiceFactory.get(alertId).then(AlertServiceFactory.notifyCreate)
-            : null);
-        connection.on(HUBS.UPDATE_ALERT, (alertId: string) => isWatched(alertId) || hasWatchers()
-            ? AlertServiceFactory.get(alertId).then(AlertServiceFactory.notifyUpdate)
-            : null);
-        connection.on(HUBS.REMOVE_ALERT, (alertId: string) => hasWatchers()
-            ? AlertServiceFactory.notifyRemove(alertId)
-            : null);
-    },
-    async (connection) => {
-        await connection.invoke(HUBS.SUBSCRIBE);
-    }
+  (connection, { isWatched, hasWatchers }) => {
+    connection.on(HUBS.CREATE_ALERT, (alertId: string) => hasWatchers()
+      ? AlertServiceFactory.get(alertId).then(AlertServiceFactory.notifyCreate)
+      : null);
+    connection.on(HUBS.UPDATE_ALERT, (alertId: string) => isWatched(alertId) || hasWatchers()
+      ? AlertServiceFactory.get(alertId).then(AlertServiceFactory.notifyUpdate)
+      : null);
+    connection.on(HUBS.REMOVE_ALERT, (alertId: string) => hasWatchers()
+      ? AlertServiceFactory.notifyRemove(alertId)
+      : null);
+  },
+  async (connection) => {
+    await connection.invoke(HUBS.SUBSCRIBE);
+  }
 );
 
 const useWatchAlerts = HubFactory.createWatcher(useAlertsHub);
 
 export const useAlert = ComposableFactory.get(AlertServiceFactory, () => {
-    const { watchOne } = useWatchAlerts();
-    return (alert) => {
-        watchOne(alert.value.id);
-    }
+  const { watchOne } = useWatchAlerts();
+  return (alert) => {
+    watchOne(alert.value.id);
+  }
 });
 
 export const useAlerts = ComposableFactory.getMany(AlertServiceFactory, () => {
-    const { watchMany } = useWatchAlerts();
-    return () => {
-        watchMany();
-    }
+  const { watchMany } = useWatchAlerts();
+  return () => {
+    watchMany();
+  }
 });
 
 export const useRemoveAlert = ComposableFactory.remove(AlertServiceFactory);

package/composables/services/useModels.ts

@@ -1,5 +1,4 @@
-import type { ModelDetailsDTO, ModelFilters, ModelInfosDTO } from "@dative-gpi/foundation-core-domain/models";
-import { ModelDetails, ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import { ModelDetails, type ModelDetailsDTO, type ModelFilters, ModelInfos, type ModelInfosDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { MODELS_URL, MODEL_URL } from "../../config/urls";

package/composables/services/useNotifications.ts

@@ -0,0 +1,48 @@
+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

@@ -11,4 +11,6 @@ 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 REMOVE_CONNECTIVITY_ALERT = "RemoveConnectivityAlert";
+
+export const CREATE_NOTIFICATION = "CreateNotification";

package/config/urls/index.ts

@@ -23,6 +23,7 @@ export * from "./groups";
 export * from "./locations";
 export * from "./manufacturers";
 export * from "./models";
+export * from "./notifications";
 export * from "./organisations";
 export * from "./organisationTypes";
 export * from "./permissionCategories";

package/config/urls/notifications.ts

@@ -0,0 +1,6 @@
+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`;

package/package.json

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