@dative-gpi/foundation-core-services 1.0.128 → 1.0.130-maps2

package/composables/services/index.ts

@@ -18,6 +18,7 @@ export * from "./useDataCategories";
 export * from "./useDataDefinitions";
 export * from "./useDataTables";
 export * from "./useDeviceConnectivities";
+export * from "./useDeviceDataDefinitions";
 export * from "./useDeviceExplorerElements";
 export * from "./useDeviceOrganisations";
 export * from "./useDeviceStatuses";

package/composables/services/useDeviceDataDefinitions.ts

@@ -0,0 +1,11 @@
+import { DeviceDataDefinitionInfos, type DeviceDataDefinitionInfosDTO, type DeviceDataDefinitionFilters } from "@dative-gpi/foundation-core-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { DEVICE_DATA_DEFINITIONS_URL } from "../../config";
+
+const DeviceDataDefinitionServiceFactory = new ServiceFactory<DeviceDataDefinitionInfosDTO, DeviceDataDefinitionInfos>("deviceDataDefinition", DeviceDataDefinitionInfos).create(factory => factory.build(
+  factory.addGetMany<DeviceDataDefinitionInfosDTO, DeviceDataDefinitionInfos, DeviceDataDefinitionFilters>(DEVICE_DATA_DEFINITIONS_URL, DeviceDataDefinitionInfos),
+  factory.addNotify()
+));
+
+export const useDeviceDataDefinitions = ComposableFactory.getMany(DeviceDataDefinitionServiceFactory);

package/composables/services/useDeviceExplorerElements.ts

@@ -2,7 +2,6 @@ import { ref } from "vue";
 
 import { DeviceExplorerElementDetails, type DeviceExplorerElementDetailsDTO, type DeviceExplorerElementFilters, DeviceExplorerElementInfos, type DeviceExplorerElementInfosDTO, type DeviceOrganisationDetails, type GroupDetails } from "@dative-gpi/foundation-core-domain/models";
 import { type AddOrUpdateCallback, type DeleteCallback, type NotifyEvent, onCollectionChanged } from "@dative-gpi/bones-ui";
-import { fromDeviceOrganisation, fromGroup } from "@dative-gpi/foundation-shared-domain/tools";
 import { ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { DEVICE_EXPLORER_ELEMENTS_URL } from "../../config/urls";
@@ -57,7 +56,7 @@ export const useDeviceExplorerElements = () => {
         switch(ev) {
           case "add":
           case "update":
-            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, fromDeviceOrganisation(el));
+            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, DeviceExplorerElementInfos.fromDeviceOrganisation(el));
             break;
           case "delete":
             (onCollectionChangedCustom as DeleteCallback)(ev, el);
@@ -69,7 +68,7 @@ export const useDeviceExplorerElements = () => {
         switch(ev) {
           case "add":
           case "update":
-            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, fromGroup(el));
+            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, DeviceExplorerElementInfos.fromGroup(el));
             break;
           case "delete":
             (onCollectionChangedCustom as DeleteCallback)(ev, el);

package/composables/services/useDeviceOrganisations.ts

@@ -24,7 +24,8 @@ const DeviceOrganisationServiceFactory = new ServiceFactory<DeviceOrganisationDe
       const result = new DeviceOrganisationDetails(dto);
       notifyService.notify("update", result);
       return result;
-    })
+    }),
+    notifyReset: () => notifyService.notify("reset")
   }))
 ));
 
@@ -64,6 +65,8 @@ const trackDeviceOrganisations = () => {
 
 export const useSubscribeToDeviceOrganisations = ComposableFactory.subscribe(DeviceOrganisationServiceFactory);
 
+export const resetDeviceOrganisations = DeviceOrganisationServiceFactory.notifyReset;
+
 export const useDeviceOrganisation = ComposableFactory.get(DeviceOrganisationServiceFactory, trackDeviceOrganisation);
 export const useDeviceOrganisations = ComposableFactory.getMany(DeviceOrganisationServiceFactory, trackDeviceOrganisations);
 export const useCreateDeviceOrganisation = ComposableFactory.create(DeviceOrganisationServiceFactory, trackDeviceOrganisation);

package/composables/services/useLocations.ts

@@ -3,11 +3,30 @@ import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { LOCATIONS_URL, LOCATION_URL } from "../../config/urls";
 
+import { resetDeviceOrganisations } from "./useDeviceOrganisations";
+
 const LocationServiceFactory = new ServiceFactory<LocationDetailsDTO, LocationDetails>("location", LocationDetails)
   .createComplete<LocationInfos, LocationInfosDTO, CreateLocationDTO, UpdateLocationDTO, LocationFilters>(LOCATIONS_URL, LOCATION_URL, LocationInfos);
 
+const updateLocation = ComposableFactory.update(LocationServiceFactory);
+
 export const useLocation = ComposableFactory.get(LocationServiceFactory);
 export const useLocations = ComposableFactory.getMany(LocationServiceFactory);
 export const useCreateLocation = ComposableFactory.create(LocationServiceFactory);
-export const useUpdateLocation = ComposableFactory.update(LocationServiceFactory);
-export const useRemoveLocation = ComposableFactory.remove(LocationServiceFactory);
+export const useRemoveLocation = ComposableFactory.remove(LocationServiceFactory);
+
+export const useUpdateLocation = () => {
+  const { update, updated, updating } = updateLocation();
+
+  const actualUpdate = async (...params: Parameters<typeof update>) => {
+    const result = await update(...params);
+    resetDeviceOrganisations();
+    return result;
+  }
+
+  return {
+    update: actualUpdate,
+    updated,
+    updating
+  }
+}

package/config/urls/deviceDataDefinitions.ts

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

package/config/urls/index.ts

@@ -16,6 +16,7 @@ export * from "./dashboards";
 export * from "./dataCategories";
 export * from "./dataDefinitions";
 export * from "./deviceConnectivities";
+export * from "./deviceDataDefinitions";
 export * from "./deviceOrganisations";
 export * from "./deviceExplorerElements";
 export * from "./deviceStatuses";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-services",
   "sideEffects": false,
-  "version": "1.0.128",
+  "version": "1.0.130-maps2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.128"
+    "@dative-gpi/foundation-core-domain": "1.0.130-maps2"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -18,5 +18,5 @@
     "vue": "^3.4.38",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "ca2de0b5abd0fb4f1fdfaafbc4267182ab609336"
+  "gitHead": "a0739b48282166f721cf6c2376a430e4690d92ef"
 }