@dative-gpi/foundation-core-services 0.0.53 → 0.0.54

package/composables/hubs/useAlertsHub.ts

@@ -2,7 +2,6 @@ import { onMounted, ref, watch } from "vue";
 
 import * as signalR from "@microsoft/signalr";
 
-import { useNotifyAlert, useNotifyRemoveAlert } from "../services/useAlerts";
 import { ALERTS_HUB_URL } from "../../config/urls";
 import { HUBS } from "../../config/literals";
 
@@ -24,9 +23,9 @@ export const useAlertsHub = () => {
                 await connection.value.start();
             }
             connection.value.invoke(HUBS.SUBSCRIBE);
-            connection.value.on(HUBS.CREATE_ALERT, (alertId: string) => useNotifyAlert().fetch(alertId));
-            connection.value.on(HUBS.UPDATE_ALERT, (alertId: string) => useNotifyAlert().fetch(alertId));
-            connection.value.on(HUBS.REMOVE_ALERT, (alertId: string) => useNotifyRemoveAlert().remove(alertId));
+            // connection.value.on(HUBS.CREATE_ALERT, (alertId: string) => useNotifyAlert().fetch(alertId));
+            // connection.value.on(HUBS.UPDATE_ALERT, (alertId: string) => useNotifyAlert().fetch(alertId));
+            // connection.value.on(HUBS.REMOVE_ALERT, (alertId: string) => useNotifyRemoveAlert().remove(alertId));
         });
 
         initialized = true;

package/composables/hubs/useConnectivityAlertsHub.ts

@@ -2,7 +2,6 @@ import { onMounted, ref, watch } from "vue";
 
 import * as signalR from "@microsoft/signalr";
 
-import { useNotifyConnectivityAlert, useNotifyRemoveConnectivityAlert } from "../services/useConnectivityAlerts";
 import { CONNECTIVITY_ALERTS_HUB_URL } from "../../config/urls";
 import { HUBS } from "../../config/literals";
 
@@ -24,9 +23,9 @@ export const useConnectivityAlertsHub = () => {
                 await connection.value.start();
             }
             connection.value.invoke(HUBS.SUBSCRIBE);
-            connection.value.on(HUBS.CREATE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyConnectivityAlert().fetch(connectivityAlertId));
-            connection.value.on(HUBS.UPDATE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyConnectivityAlert().fetch(connectivityAlertId));
-            connection.value.on(HUBS.REMOVE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyRemoveConnectivityAlert().remove(connectivityAlertId));
+            // connection.value.on(HUBS.CREATE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyConnectivityAlert().fetch(connectivityAlertId));
+            // connection.value.on(HUBS.UPDATE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyConnectivityAlert().fetch(connectivityAlertId));
+            // connection.value.on(HUBS.REMOVE_CONNECTIVITY_ALERT, (connectivityAlertId: string) => useNotifyRemoveConnectivityAlert().remove(connectivityAlertId));
         });
 
         initialized = true;

package/composables/hubs/useDeviceConnectivitiesHub.ts

@@ -2,7 +2,6 @@ import { onMounted, ref, watch } from "vue";
 
 import * as signalR from "@microsoft/signalr";
 
-import { useNotifyDeviceConnectivity } from "../services/useDeviceConnectivities";
 import { DEVICE_CONNECTIVITIES_HUB_URL } from "../../config/urls";
 import { HUBS } from "../../config/literals";
 
@@ -24,7 +23,7 @@ export const useDeviceConnectivitiesHub = () => {
                 await connection.value.start();
             }
             connection.value.invoke(HUBS.SUBSCRIBE);
-            connection.value.on(HUBS.UPDATE_DEVICE_CONNECTIVITY, (deviceOrganisationId: string) => useNotifyDeviceConnectivity().fetch(deviceOrganisationId));
+            // connection.value.on(HUBS.UPDATE_DEVICE_CONNECTIVITY, (deviceOrganisationId: string) => useNotifyDeviceConnectivity().fetch(deviceOrganisationId));
         });
 
         initialized = true;

package/composables/hubs/useDeviceStatusesHub.ts

@@ -2,7 +2,6 @@ import { onMounted, ref, watch } from "vue";
 
 import * as signalR from "@microsoft/signalr";
 
-import { useNotifyDeviceStatus } from "../services/useDeviceStatuses";
 import { DEVICE_STATUSES_HUB_URL } from "../../config/urls";
 import { HUBS } from "../../config/literals";
 
@@ -24,7 +23,7 @@ export const useDeviceStatusesHub = () => {
                 await connection.value.start();
             }
             connection.value.invoke(HUBS.SUBSCRIBE);
-            connection.value.on(HUBS.UPDATE_DEVICE_STATUS, (deviceOrganisationId: string) => useNotifyDeviceStatus().fetch(deviceOrganisationId));
+            // connection.value.on(HUBS.UPDATE_DEVICE_STATUS, (deviceOrganisationId: string) => useNotifyDeviceStatus().fetch(deviceOrganisationId));
         });
 
         initialized = true;

package/composables/services/useAlerts.ts

@@ -1,5 +1,3 @@
-import { onUnmounted, ref } from "vue";
-
 import { AlertDetails, AlertDetailsDTO, AlertFilters, AlertInfos, AlertInfosDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
@@ -9,11 +7,16 @@ const AlertServiceFactory = new ServiceFactory<AlertDetailsDTO, AlertDetails>("a
     factory.addGet(ALERT_URL),
     factory.addGetMany<AlertInfosDTO, AlertInfos, AlertFilters>(ALERTS_URL, AlertInfos),
     factory.addRemove(ALERT_URL),
-    factory.addCustom("acknowledge", (axios, alertId: string) => axios.patch(ALERT_URL(alertId))),
-    factory.addNotify()
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("acknowledge", (axios, alertId: string) => axios.patch(ALERT_URL(alertId)), (dto: AlertDetailsDTO) => {
+            const result = new AlertDetails(dto);
+            notify.notify("update", result);
+            return result;
+        })
+    }))
 ));
 
 export const useAlert = ComposableFactory.get(AlertServiceFactory);
 export const useAlerts = ComposableFactory.getMany(AlertServiceFactory);
 export const useRemoveAlert = ComposableFactory.remove(AlertServiceFactory);
-export const useAcknowledgeAlert = ComposableFactory.custom(AlertServiceFactory, AlertServiceFactory.acknowledge);
+export const useAcknowledgeAlert = ComposableFactory.custom(AlertServiceFactory.acknowledge);

package/composables/services/useCustomPropertyValues.ts

@@ -1,41 +1,10 @@
-import { ref } from "vue";
-
-import { CustomPropertyValueDetails, CustomPropertyValueDetailsDTO, CustomPropertyValueInfos, CustomPropertyValueInfosDTO, PropertyEntity } from "@dative-gpi/foundation-core-domain/models";
-import { ServiceFactory } from "@dative-gpi/bones-ui";
+import { CustomPropertyValueInfos, CustomPropertyValueInfosDTO, PropertyEntity } from "@dative-gpi/foundation-core-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { CUSTOM_PROPERTY_VALUES_URL } from "../../config/urls";
 
-const CustomPropertyValueServiceFactory = new ServiceFactory<CustomPropertyValueDetailsDTO, CustomPropertyValueDetails>("customPropertyValue", CustomPropertyValueDetails).create(factory => factory.build(
-    factory.addNotify(() => ({
-        getMany: async (entity: PropertyEntity, entityId: string, code: string): Promise<CustomPropertyValueInfos[]> => {
-            const response = await ServiceFactory.http.get(CUSTOM_PROPERTY_VALUES_URL(entity, entityId, code));
-            const result = response.data.map((dto: CustomPropertyValueInfosDTO) => new CustomPropertyValueInfos(dto));
-
-            return result;
-        }
-    }))
-));
-
-export const useCustomPropertyValues = () => {
-    const service = CustomPropertyValueServiceFactory();
-
-    const fetching = ref(false);
-    const fetched = ref<CustomPropertyValueInfos[] | null>(null);
-
-    const fetch = async (entity: PropertyEntity, entityId: string, code: string) => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getMany(entity, entityId, code);
-        }
-        finally {
-            fetching.value = false;
-        }
-        return fetched;
-    }
+const CustomPropertyValueServiceFactory = {
+    ...ServiceFactory.addCustom("getMany", (axios, entity: PropertyEntity, entityId: string, code: string) => axios.get(CUSTOM_PROPERTY_VALUES_URL(entity, entityId, code)), (dtos: CustomPropertyValueInfosDTO[]) => dtos.map((dto: CustomPropertyValueInfosDTO) => new CustomPropertyValueInfos(dto))),
+};
 
-    return {
-        fetching,
-        fetch,
-        fetched
-    }
-}
+export const useCustomPropertyValues = ComposableFactory.custom(CustomPropertyValueServiceFactory.getMany);

package/composables/services/useDeviceOrganisations.ts

@@ -1,7 +1,5 @@
-import { onUnmounted, ref } from "vue";
-
 import { ChangeDeviceOrganisationGroupDTO, ChangeDeviceOrganisationLocationDTO, CreateDeviceOrganisationDTO, DeviceOrganisationDetails, DeviceOrganisationDetailsDTO, DeviceOrganisationFilters, DeviceOrganisationInfos, DeviceOrganisationInfosDTO, UpdateDeviceOrganisationDTO } from "@dative-gpi/foundation-core-domain/models";
-import { ComposableFactory, onEntityChanged , ServiceFactory } from "@dative-gpi/bones-ui";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 
 import { DEVICE_ORGANISATIONS_URL, DEVICE_ORGANISATION_URL, DEVICE_ORGANISATION_GROUP_URL, DEVICE_ORGANISATION_LOCATION_URL } from "../../config/urls";
 
@@ -11,9 +9,18 @@ const DeviceOrganisationServiceFactory = new ServiceFactory<DeviceOrganisationDe
     factory.addCreate<CreateDeviceOrganisationDTO>(DEVICE_ORGANISATIONS_URL),
     factory.addUpdate<UpdateDeviceOrganisationDTO>(DEVICE_ORGANISATION_URL),
     factory.addRemove(DEVICE_ORGANISATION_URL),
-    factory.addCustom("changeGroup", (axios, deviceOrganisationId: string, payload: ChangeDeviceOrganisationGroupDTO) => axios.put(DEVICE_ORGANISATION_GROUP_URL(deviceOrganisationId), payload)),
-    factory.addCustom("changeLocation", (axios, deviceOrganisationId: string, payload: ChangeDeviceOrganisationLocationDTO) => axios.put(DEVICE_ORGANISATION_LOCATION_URL(deviceOrganisationId), payload)),
-    factory.addNotify()
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("changeGroup", (axios, deviceOrganisationId: string, payload: ChangeDeviceOrganisationGroupDTO) => axios.put(DEVICE_ORGANISATION_GROUP_URL(deviceOrganisationId), payload), (dto: DeviceOrganisationDetailsDTO) => {
+            const result = new DeviceOrganisationDetails(dto);
+            notify.notify("update", result);
+            return result;
+        }),
+        ...ServiceFactory.addCustom("changeLocation", (axios, deviceOrganisationId: string, payload: ChangeDeviceOrganisationLocationDTO) => axios.put(DEVICE_ORGANISATION_LOCATION_URL(deviceOrganisationId), payload), (dto: DeviceOrganisationDetailsDTO) => {
+            const result = new DeviceOrganisationDetails(dto);
+            notify.notify("update", result);
+            return result;
+        })
+    }))
 ));
 
 export const useDeviceOrganisation = ComposableFactory.get(DeviceOrganisationServiceFactory);
@@ -21,5 +28,5 @@ export const useDeviceOrganisations = ComposableFactory.getMany(DeviceOrganisati
 export const useCreateDeviceOrganisation = ComposableFactory.create(DeviceOrganisationServiceFactory);
 export const useUpdateDeviceOrganisation = ComposableFactory.update(DeviceOrganisationServiceFactory);
 export const useRemoveDeviceOrganisation = ComposableFactory.remove(DeviceOrganisationServiceFactory);
-export const useChangeDeviceOrganisationGroup = ComposableFactory.custom(DeviceOrganisationServiceFactory, DeviceOrganisationServiceFactory.changeGroup);
-export const useChangeDeviceOrganisationLocation = ComposableFactory.custom(DeviceOrganisationServiceFactory, DeviceOrganisationServiceFactory.changeLocation);
+export const useChangeDeviceOrganisationGroup = ComposableFactory.custom(DeviceOrganisationServiceFactory.changeGroup);
+export const useChangeDeviceOrganisationLocation = ComposableFactory.custom(DeviceOrganisationServiceFactory.changeLocation);

package/composables/services/useGroups.ts

@@ -9,8 +9,13 @@ const GroupServiceFactory = new ServiceFactory<GroupDetailsDTO, GroupDetails>("g
     factory.addCreate<CreateGroupDTO>(GROUPS_URL),
     factory.addUpdate<UpdateGroupDTO>(GROUP_URL),
     factory.addRemove(GROUP_URL),
-    factory.addCustom("changeParent", (axios, groupdId: string, payload: ChangeGroupParentDTO) => axios.put(GROUP_URL(groupdId), payload)),
-    factory.addNotify()
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("changeParent", (axios, groupdId: string, payload: ChangeGroupParentDTO) => axios.put(GROUP_URL(groupdId), payload), (dto: GroupDetailsDTO) => {
+            const result = new GroupDetails(dto);
+            notify.notify("update", result);
+            return result;
+        })
+    }))
 ));
 
 export const useGroup = ComposableFactory.get(GroupServiceFactory);
@@ -18,4 +23,4 @@ export const useGroups = ComposableFactory.getMany(GroupServiceFactory);
 export const useCreateGroup = ComposableFactory.create(GroupServiceFactory);
 export const useUpdateGroup = ComposableFactory.update(GroupServiceFactory);
 export const useRemoveGroup = ComposableFactory.remove(GroupServiceFactory);
-export const useChangeGroupParent = ComposableFactory.custom(GroupServiceFactory, GroupServiceFactory.changeParent);
+export const useChangeGroupParent = ComposableFactory.custom(GroupServiceFactory.changeParent);

package/composables/services/useOrganisations.ts

@@ -5,8 +5,13 @@ import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
 import { ORGANISATION_DASHBOARD_URL } from "../../config/urls";
 
 const OrganisationServiceFactory = new ServiceFactory<OrganisationDetailsDTO, OrganisationDetails>("organisation", OrganisationDetails).create(factory => factory.build(
-    factory.addCustom("changeDashboard", (axios, payload: ChangeOrganisationDashboardDTO) => axios.put(ORGANISATION_DASHBOARD_URL(), payload)),
-    factory.addNotify()
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("changeDashboard", (axios, payload: ChangeOrganisationDashboardDTO) => axios.put(ORGANISATION_DASHBOARD_URL(), payload), (dto: OrganisationDetailsDTO) => {
+            const result = new OrganisationDetails(dto);
+            notify.notify("update", result);
+            return result;
+        })
+    }))
 ));
 
-export const useChangeDashboardOrganisation = ComposableFactory.custom(OrganisationServiceFactory, OrganisationServiceFactory.changeDashboard);
+export const useChangeDashboardOrganisation = ComposableFactory.custom(OrganisationServiceFactory.changeDashboard);

package/composables/services/useUserOrganisations.ts

@@ -9,15 +9,28 @@ const UserOrganisationServiceFactory = new ServiceFactory<UserOrganisationDetail
     factory.addCreate<CreateUserOrganisationDTO>(USER_ORGANISATIONS_URL),
     factory.addUpdate<UpdateUserOrganisationDTO>(USER_ORGANISATION_URL),
     factory.addRemove(USER_ORGANISATION_URL),
-    factory.addCustom("getCurrent", (axios) => axios.get(USER_ORGANISATION_CURRENT_URL())),
-    factory.addCustom("updateCurrent", (axios, payload: UpdateUserOrganisationDTO) => axios.post(USER_ORGANISATION_CURRENT_URL(), payload)),
-    factory.addNotify()
+    ServiceFactory.addCustom("getCurrent", (axios) => axios.get(USER_ORGANISATION_CURRENT_URL()), (dto: UserOrganisationDetailsDTO) => new UserOrganisationDetails(dto)),
+    factory.addNotify(notify => ({
+        ...ServiceFactory.addCustom("updateCurrent", (axios, payload: UpdateUserOrganisationDTO) => axios.post(USER_ORGANISATION_CURRENT_URL(), payload), (dto: UserOrganisationDetailsDTO) => {
+            const result = new UserOrganisationDetails(dto)
+            notify.notify("update", result);
+            return result;
+        }),
+    }))
 ));
 
+export const useTrackUserOrganisation = ComposableFactory.track(UserOrganisationServiceFactory);
+
 export const useUserOrganisation = ComposableFactory.get(UserOrganisationServiceFactory);
 export const useUserOrganisations = ComposableFactory.getMany(UserOrganisationServiceFactory);
 export const useCreateUserOrganisation = ComposableFactory.create(UserOrganisationServiceFactory);
 export const useUpdateUserOrganisation = ComposableFactory.update(UserOrganisationServiceFactory);
 export const useRemoveUserOrganisation = ComposableFactory.remove(UserOrganisationServiceFactory);
-export const useCurrentUserOrganisation = ComposableFactory.custom(UserOrganisationServiceFactory, UserOrganisationServiceFactory.getCurrent);
-export const useUpdateCurrentUserOrganisation = ComposableFactory.custom(UserOrganisationServiceFactory, UserOrganisationServiceFactory.updateCurrent);
+export const useCurrentUserOrganisation = ComposableFactory.custom(UserOrganisationServiceFactory.getCurrent, () => {
+    const { track } = useTrackUserOrganisation();
+ 
+    return (userOrganisation) => {
+        track(userOrganisation);
+    }
+});
+export const useUpdateCurrentUserOrganisation = ComposableFactory.custom(UserOrganisationServiceFactory.updateCurrent);

package/package.json

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