@dative-gpi/foundation-core-services 1.0.55 → 1.0.56

package/composables/services/index.ts

@@ -25,7 +25,6 @@ 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,9 +1,9 @@
 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";
+import { HUBS } from "@dative-gpi/foundation-shared-services/config";
 
 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),

package/composables/services/useConnectivityAlerts.ts

@@ -1,9 +1,9 @@
 import { ConnectivityAlertDetails, type ConnectivityAlertDetailsDTO, type ConnectivityAlertFilters, ConnectivityAlertInfos, type ConnectivityAlertInfosDTO } 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 { HUBS } from "@dative-gpi/foundation-shared-services/config";
 
 import { CONNECTIVITY_ALERTS_HUB_URL, CONNECTIVITY_ALERTS_URL, CONNECTIVITY_ALERT_URL } from "../../config/urls";
-import { HUBS } from "../../config/literals";
 
 const ConnectivityAlertServiceFactory = new ServiceFactory<ConnectivityAlertDetailsDTO, ConnectivityAlertDetails>("connectivityAlert", ConnectivityAlertDetails).create(factory => factory.build(
   factory.addGet(CONNECTIVITY_ALERT_URL),

package/composables/services/useCustomPropertyValues.ts

@@ -1,4 +1,5 @@
-import { CustomPropertyValueInfos, type CustomPropertyValueInfosDTO, type PropertyEntity } from "@dative-gpi/foundation-core-domain/models";
+import { CustomPropertyValueInfos, type CustomPropertyValueInfosDTO } from "@dative-gpi/foundation-core-domain/models";
+import { type PropertyEntity } from "@dative-gpi/foundation-shared-domain/enums";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { CUSTOM_PROPERTY_VALUES_URL } from "../../config/urls";

package/composables/services/useDeviceConnectivities.ts

@@ -1,9 +1,9 @@
 import { DeviceConnectivityDetails, type DeviceConnectivityDetailsDTO } 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 { HUBS } from "@dative-gpi/foundation-shared-services/config";
 
 import { DEVICE_CONNECTIVITIES_HUB_URL, DEVICE_CONNECTIVITY_URL } from "../../config/urls";
-import { HUBS } from "../../config/literals";
 
 const DeviceConnectivityServiceFactory = new ServiceFactory<DeviceConnectivityDetailsDTO, DeviceConnectivityDetails>("deviceConnectivity", DeviceConnectivityDetails).create(factory => factory.build(
   factory.addGet(DEVICE_CONNECTIVITY_URL),

package/composables/services/useDeviceStatuses.ts

@@ -1,9 +1,9 @@
 import { DeviceStatusDetails, type DeviceStatusDetailsDTO } 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 { HUBS } from "@dative-gpi/foundation-shared-services/config";
 
 import { DEVICE_STATUSES_HUB_URL, DEVICE_STATUS_URL } from "../../config/urls";
-import { HUBS } from "../../config/literals";
 
 const DeviceStatusServiceFactory = new ServiceFactory<DeviceStatusDetailsDTO, DeviceStatusDetails>("deviceStatus", DeviceStatusDetails).create(factory => factory.build(
   factory.addGet(DEVICE_STATUS_URL),

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";

package/package.json

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

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`;