@dative-gpi/foundation-core-services 1.0.26 → 1.0.28-remove-deprecated2

package/composables/services/index.ts

@@ -18,6 +18,7 @@ export * from "./useDataCategories";
 export * from "./useDataDefinitions";
 export * from "./useDataTables";
 export * from "./useDeviceConnectivities";
+export * from "./useDeviceExplorerElements";
 export * from "./useDeviceOrganisations";
 export * from "./useDeviceStatuses";
 export * from "./useFolders";
@@ -25,7 +26,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";
@@ -36,6 +36,7 @@ export * from "./useScenarioOrganisations";
 export * from "./useScenarioOrganisationTypes";
 export * from "./useServiceAccountOrganisationAuthTokens";
 export * from "./useServiceAccountOrganisations";
+export * from "./useServiceAccountRoleOrganisations";
 export * from "./useUserOrganisations";
 export * from "./useUserOrganisationTables";
 export * from "./useWidgetTemplates";

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),
@@ -16,6 +16,7 @@ const AlertServiceFactory = new ServiceFactory<AlertDetailsDTO, AlertDetails>("a
     ...ServiceFactory.addCustom("acknowledge", (axios, alertId: string) => axios.patch(ALERT_URL(alertId)), (dto: AlertDetailsDTO) => {
       const result = new AlertDetails(dto);
       notifyService.notify("update", result);
+      notifyService.notify("reset");
       return result;
     })
   }))

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/useConnectivityScenarios.ts

@@ -1,14 +1,25 @@
-import { ConnectivityScenarioDetails, type ConnectivityScenarioDetailsDTO, type ConnectivityScenarioFilters, ConnectivityScenarioInfos, type ConnectivityScenarioInfosDTO, type CreateConnectivityScenarioDTO, type UpdateConnectivityScenarioDTO } from "@dative-gpi/foundation-core-domain/models";
+import { ConnectivityScenarioDetails, type ConnectivityScenarioDetailsDTO, type ConnectivityScenarioFilters, ConnectivityScenarioInfos, type ConnectivityScenarioInfosDTO, type UpsertConnectivityScenarioDTO, type UpdateConnectivityScenarioDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { CONNECTIVITY_SCENARIOS_URL, CONNECTIVITY_SCENARIO_URL } from "../../config";
 
-const ConnectivityScenarioServiceFactory = new ServiceFactory<ConnectivityScenarioDetailsDTO, ConnectivityScenarioDetails>("ConnectivityScenario", ConnectivityScenarioDetails)
-  .createComplete<ConnectivityScenarioInfos, ConnectivityScenarioInfosDTO, CreateConnectivityScenarioDTO, UpdateConnectivityScenarioDTO, ConnectivityScenarioFilters>(CONNECTIVITY_SCENARIOS_URL, CONNECTIVITY_SCENARIO_URL, ConnectivityScenarioInfos);
+
+const ConnectivityScenarioServiceFactory = new ServiceFactory<ConnectivityScenarioDetailsDTO, ConnectivityScenarioDetails>("ConnectivityScenario", ConnectivityScenarioDetails).create(factory => factory.build(
+  factory.addGet(CONNECTIVITY_SCENARIO_URL),
+  factory.addGetMany<ConnectivityScenarioInfosDTO, ConnectivityScenarioInfos, ConnectivityScenarioFilters>(CONNECTIVITY_SCENARIOS_URL, ConnectivityScenarioInfos),
+  factory.addUpdate<UpdateConnectivityScenarioDTO>(CONNECTIVITY_SCENARIO_URL),
+  factory.addRemove(CONNECTIVITY_SCENARIO_URL),
+  factory.addNotify(notifyService => ({
+    ...ServiceFactory.addCustom("upsert", (axios, payload: UpsertConnectivityScenarioDTO) => axios.post(CONNECTIVITY_SCENARIOS_URL(), payload), () => {
+      notifyService.notify("reset");
+    })
+  }))
+));
+
 
 export const useConnectivityScenario = ComposableFactory.get(ConnectivityScenarioServiceFactory);
 export const useConnectivityScenarios = ComposableFactory.getMany(ConnectivityScenarioServiceFactory);
-export const useCreateConnectivityScenario = ComposableFactory.create(ConnectivityScenarioServiceFactory);
 export const useUpdateConnectivityScenario = ComposableFactory.update(ConnectivityScenarioServiceFactory);
 export const useRemoveConnectivityScenario = ComposableFactory.remove(ConnectivityScenarioServiceFactory);
+export const useUpsertConnectivityScenario = ComposableFactory.custom(ConnectivityScenarioServiceFactory.upsert);
 

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/useDataTables.ts

@@ -1,35 +1,40 @@
 import { ref, type Ref } from "vue";
+import _ from "lodash";
 
 import { type UpdateUserOrganisationTableDTO, type UserOrganisationTableDetails } from "@dative-gpi/foundation-core-domain/models";
-import { type FSDataTable } from "@dative-gpi/foundation-shared-components/models";
+import { type FSDataTable, type FSDataTableColumn } from "@dative-gpi/foundation-shared-components/models";
 
 export const useDataTables = () => {
   const initialized = ref(false);
 
-  const table = ref<FSDataTable>({
-    headers: [],
-    mode: "table",
-    sortBy: null,
-    rowsPerPage: 10,
-    filters: {},
-    page: 1
-  });
+  const table = ref<FSDataTable | null>(null);
 
-  const computeTable = ((customSorts: { [key: string]: any }, customSortRaws: { [key: string]: any }) => ({
+  const computeTable = (
+    headersOptions: { [key: string]: Partial<FSDataTableColumn> },
+    defaultMode: "table" | "iterator" = "table",
+    extraHeaders: FSDataTableColumn[] = []
+  ) => ({
     ...table.value,
-    headers: table.value.headers.map(header => ({
+    mode: table.value?.mode ?? defaultMode,
+    headers: _.sortBy(table.value?.headers.concat(extraHeaders.filter(e => !table.value?.headers.map(h => h.value).includes(e.value))), "index").map((header, i) => ({
       ...header,
-      sort: header.value && customSorts[header.value] || null,
-      sortRaw: header.value && customSortRaws[header.value] || null 
+      index: i,
+      fixedFilters: (header.value && headersOptions[header.value] && headersOptions[header.value].fixedFilters) || null,
+      methodFilter: (header.value && headersOptions[header.value] && headersOptions[header.value].methodFilter) || null,
+      methodFilterRaw: (header.value && headersOptions[header.value] && headersOptions[header.value].methodFilterRaw) || null,
+      sort: (header.value && headersOptions[header.value] && headersOptions[header.value].sort) || null,
+      sortRaw: (header.value && headersOptions[header.value] && headersOptions[header.value].sortRaw) || null,
+      innerValue: (header.value && headersOptions[header.value] && headersOptions[header.value].innerValue) || null
     }))
-  }));
+  });
 
   const updateTable = (
     updateUserOrganisationTable: (id: string, payload: UpdateUserOrganisationTableDTO) => Promise<Ref<UserOrganisationTableDetails>>,
     setTable: (tableCode: string, value: FSDataTable) => void,
-    tableCode: string
+    tableCode: string,
+    defaultMode: "table" | "iterator" = "table"
   ): void => {
-    if (table.value) {
+    if (tableCode && table.value) {
       setTable(tableCode, table.value);
       updateUserOrganisationTable(tableCode, {
         columns: table.value.headers.map(column => ({
@@ -40,7 +45,7 @@ export const useDataTables = () => {
         rowsPerPage: table.value.rowsPerPage,
         sortByKey: table.value.sortBy?.key ?? null,
         sortByOrder: table.value.sortBy?.order ?? null,
-        mode: table.value.mode
+        mode: table.value.mode ?? defaultMode
       });
     }
   };
@@ -48,12 +53,16 @@ export const useDataTables = () => {
   const onTableCodeChange = async (
     getUserOrganisationTable: (id: string) => Promise<Ref<UserOrganisationTableDetails | null>>,
     getTable: (tableCode: string) => FSDataTable | null,
-    tableCode: string
+    tableCode: string | null,
+    defaultMode: "table" | "iterator" = "table"
   ): Promise<void> => {
+    let done = false;
     if (tableCode) {
       const composableTable = getTable(tableCode);
+
       if (composableTable) {
         table.value = composableTable;
+        done = true;
       }
       else {
         try {
@@ -65,11 +74,13 @@ export const useDataTables = () => {
                 key: userOrganisationTable.value.sortByKey,
                 order: userOrganisationTable.value.sortByOrder
               },
-              mode: userOrganisationTable.value.mode,
+              mode: userOrganisationTable.value.mode ?? defaultMode,
               rowsPerPage: userOrganisationTable.value.rowsPerPage,
+              showFilters: false,
               filters: {},
               page: 1
             }
+            done = true;
           }
         }
         catch {
@@ -77,6 +88,17 @@ export const useDataTables = () => {
         }
       }
     }
+    if (!done) {
+      table.value = {
+        headers: [],
+        mode: null,
+        sortBy: null,
+        rowsPerPage: 10,
+        showFilters: false,
+        filters: {},
+        page: 1
+      };
+    }
     initialized.value = true;
   };
 

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/useDeviceExplorerElements.ts

@@ -0,0 +1,98 @@
+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";
+
+import { useTrackDeviceConnectivity, useWatchDeviceConnectivity } from "./useDeviceConnectivities";
+import { useTrackDeviceStatuses, useWatchDeviceStatuses } from "./useDeviceStatuses";
+import { useSubscribeToDeviceOrganisations } from "./useDeviceOrganisations";
+import { useSubscribeToGroups } from "./useGroups";
+
+const DeviceExplorerElementServiceFactory = new ServiceFactory<DeviceExplorerElementDetailsDTO, DeviceExplorerElementDetails>("deviceExplorerElement", DeviceExplorerElementDetails).create(factory => factory.build(
+  factory.addGetMany<DeviceExplorerElementInfosDTO, DeviceExplorerElementInfos, DeviceExplorerElementFilters>(DEVICE_EXPLORER_ELEMENTS_URL, DeviceExplorerElementInfos),
+  factory.addNotify()
+));
+
+export const useDeviceExplorerElements = () => {
+  const { watchMany: watchDevicesConnectivity } = useWatchDeviceConnectivity();
+  const { watchMany: watchDevicesStatuses } = useWatchDeviceStatuses();
+
+  const { track: trackDeviceConnectivity } = useTrackDeviceConnectivity();
+  const { track: trackDeviceStatuses } = useTrackDeviceStatuses();
+
+  const { subscribe: subscribeToDeviceOrganisations } = useSubscribeToDeviceOrganisations();
+  const { subscribe: subscribeToGroups } = useSubscribeToGroups();
+
+  const fetching = ref(false);
+  const entities = ref<DeviceExplorerElementInfos[]>([]);
+  const filters = ref<DeviceExplorerElementFilters>();
+
+  const getMany = async (filter?: DeviceExplorerElementFilters) => {
+    fetching.value = true;
+    filters.value = filter;
+
+    const filterMethod = (el: DeviceExplorerElementInfos): boolean => {
+      if (!filters.value) {
+        return true;
+      }
+      if (!filters.value.search) {
+        return (filters.value.root && !el.parentId) || (!!filters.value.parentId && filters.value.parentId == el.parentId);
+      }
+    
+      const fullText = `${el.label} ${el.code} ${el.tags.join(" ")}`;
+      return (!filters.value.parentId || el.path.some(p => p.id === filters.value!.parentId)) &&
+        (fullText.toLowerCase().includes(filters.value.search.toLowerCase()));
+    };
+
+    const onCollectionChangedCustom = onCollectionChanged(entities, filterMethod);
+
+    try {
+      entities.value = await DeviceExplorerElementServiceFactory.getMany(filters.value);
+
+      subscribeToDeviceOrganisations("all", (ev: NotifyEvent, el: DeviceOrganisationDetails | any) => {
+        switch(ev) {
+          case "add":
+          case "update":
+            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, fromDeviceOrganisation(el));
+            break;
+          case "delete":
+            (onCollectionChangedCustom as DeleteCallback)(ev, el);
+            break;
+        }
+      });
+
+      subscribeToGroups("all", (ev: NotifyEvent, el: GroupDetails | any) => {
+        switch(ev) {
+          case "add":
+          case "update":
+            (onCollectionChangedCustom as AddOrUpdateCallback<DeviceExplorerElementInfos>)(ev, fromGroup(el));
+            break;
+          case "delete":
+            (onCollectionChangedCustom as DeleteCallback)(ev, el);
+            break;
+        }
+      });
+
+      watchDevicesStatuses();
+      watchDevicesConnectivity();
+
+      for (const deviceExplorerElement of entities.value) {
+        trackDeviceStatuses(deviceExplorerElement.status!, s => deviceExplorerElement.status = s);
+        trackDeviceConnectivity(deviceExplorerElement.connectivity!, c => deviceExplorerElement.connectivity = c);
+      }
+    }
+    finally {
+      fetching.value = false;
+    }
+  }
+
+  return {
+    fetching,
+    getMany,
+    entities
+  }
+};

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")
   }))
 ));
 
@@ -62,6 +63,10 @@ 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/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/composables/services/useGroups.ts

@@ -18,6 +18,8 @@ const GroupServiceFactory = new ServiceFactory<GroupDetailsDTO, GroupDetails>("g
   }))
 ));
 
+export const useSubscribeToGroups = ComposableFactory.subscribe(GroupServiceFactory);
+
 export const useGroup = ComposableFactory.get(GroupServiceFactory);
 export const useGroups = ComposableFactory.getMany(GroupServiceFactory);
 export const useCreateGroup = ComposableFactory.create(GroupServiceFactory);

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/composables/services/useScenarioDeviceOrganisations.ts

@@ -1,13 +1,24 @@
-import { type CreateScenarioDeviceOrganisationDTO, ScenarioDeviceOrganisationDetails, type ScenarioDeviceOrganisationDetailsDTO, type ScenarioDeviceOrganisationFilters, ScenarioDeviceOrganisationInfos, type ScenarioDeviceOrganisationInfosDTO, type UpdateScenarioDeviceOrganisationDTO } from "@dative-gpi/foundation-core-domain/models";
+import { type CreateManyScenarioDeviceOrganisationDTO, type CreateScenarioDeviceOrganisationDTO, ScenarioDeviceOrganisationDetails, type ScenarioDeviceOrganisationDetailsDTO, type ScenarioDeviceOrganisationFilters, ScenarioDeviceOrganisationInfos, type ScenarioDeviceOrganisationInfosDTO, type UpdateScenarioDeviceOrganisationDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { SCENARIO_DEVICE_ORGANISATIONS_URL, SCENARIO_DEVICE_ORGANISATION_URL } from "../../config";
 
-const ScenarioDeviceOrganisationServiceFactory = new ServiceFactory<ScenarioDeviceOrganisationDetailsDTO, ScenarioDeviceOrganisationDetails>("scenarioDeviceOrganisation", ScenarioDeviceOrganisationDetails)
-  .createComplete<ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationInfosDTO, CreateScenarioDeviceOrganisationDTO, UpdateScenarioDeviceOrganisationDTO, ScenarioDeviceOrganisationFilters>(SCENARIO_DEVICE_ORGANISATIONS_URL, SCENARIO_DEVICE_ORGANISATION_URL, ScenarioDeviceOrganisationInfos);
+const ScenarioDeviceOrganisationServiceFactory = new ServiceFactory<ScenarioDeviceOrganisationDetailsDTO, ScenarioDeviceOrganisationDetails>("scenarioDeviceOrganisation", ScenarioDeviceOrganisationDetails).create(factory => factory.build(
+  factory.addCreate<CreateScenarioDeviceOrganisationDTO>(SCENARIO_DEVICE_ORGANISATIONS_URL),
+  factory.addGet(SCENARIO_DEVICE_ORGANISATION_URL),
+  factory.addGetMany<ScenarioDeviceOrganisationInfosDTO, ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationFilters>(SCENARIO_DEVICE_ORGANISATIONS_URL, ScenarioDeviceOrganisationInfos),
+  factory.addUpdate<UpdateScenarioDeviceOrganisationDTO>(SCENARIO_DEVICE_ORGANISATION_URL),
+  factory.addRemove(SCENARIO_DEVICE_ORGANISATION_URL),
+  factory.addNotify(notifyService => ({
+    ...ServiceFactory.addCustom("createMany", (axios, payload: CreateManyScenarioDeviceOrganisationDTO) => axios.put(SCENARIO_DEVICE_ORGANISATIONS_URL(), payload), () => {
+      notifyService.notify("reset");
+    })
+  }))
+));
 
 export const useScenarioDeviceOrganisation = ComposableFactory.get(ScenarioDeviceOrganisationServiceFactory);
 export const useScenarioDeviceOrganisations = ComposableFactory.getMany(ScenarioDeviceOrganisationServiceFactory);
 export const useCreateScenarioDeviceOrganisation = ComposableFactory.create(ScenarioDeviceOrganisationServiceFactory);
 export const useUpdateScenarioDeviceOrganisation = ComposableFactory.update(ScenarioDeviceOrganisationServiceFactory);
-export const useRemoveScenarioDeviceOrganisation = ComposableFactory.remove(ScenarioDeviceOrganisationServiceFactory);
+export const useRemoveScenarioDeviceOrganisation = ComposableFactory.remove(ScenarioDeviceOrganisationServiceFactory);
+export const useCreateManyScenarioDeviceOrganisation = ComposableFactory.custom(ScenarioDeviceOrganisationServiceFactory.createMany);

package/composables/services/useServiceAccountRoleOrganisations.ts

@@ -0,0 +1,13 @@
+import { type CreateServiceAccountRoleOrganisationDTO, ServiceAccountRoleOrganisationDetails, type ServiceAccountRoleOrganisationDetailsDTO, type ServiceAccountRoleOrganisationFilters, ServiceAccountRoleOrganisationInfos, type ServiceAccountRoleOrganisationInfosDTO, type UpdateServiceAccountRoleOrganisationDTO } from "@dative-gpi/foundation-core-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
+
+import { SERVICE_ACCOUNT_ROLE_ORGANISATIONS_URL, SERVICE_ACCOUNT_ROLE_ORGANISATION_URL } from "../../config/urls";
+
+const ServiceAccountRoleOrganisationServiceFactory = new ServiceFactory<ServiceAccountRoleOrganisationDetailsDTO, ServiceAccountRoleOrganisationDetails>("serviceAccountOrganisation", ServiceAccountRoleOrganisationDetails)
+  .createComplete<ServiceAccountRoleOrganisationInfos, ServiceAccountRoleOrganisationInfosDTO, CreateServiceAccountRoleOrganisationDTO, UpdateServiceAccountRoleOrganisationDTO, ServiceAccountRoleOrganisationFilters>(SERVICE_ACCOUNT_ROLE_ORGANISATIONS_URL, SERVICE_ACCOUNT_ROLE_ORGANISATION_URL, ServiceAccountRoleOrganisationInfos);
+
+export const useServiceAccountRoleOrganisation = ComposableFactory.get(ServiceAccountRoleOrganisationServiceFactory);
+export const useServiceAccountRoleOrganisations = ComposableFactory.getMany(ServiceAccountRoleOrganisationServiceFactory);
+export const useCreateServiceAccountRoleOrganisation = ComposableFactory.create(ServiceAccountRoleOrganisationServiceFactory);
+export const useUpdateServiceAccountRoleOrganisation = ComposableFactory.update(ServiceAccountRoleOrganisationServiceFactory);
+export const useRemoveServiceAccountRoleOrganisation = ComposableFactory.remove(ServiceAccountRoleOrganisationServiceFactory);

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/deviceExplorerElements.ts

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

package/config/urls/index.ts

@@ -17,13 +17,13 @@ export * from "./dataCategories";
 export * from "./dataDefinitions";
 export * from "./deviceConnectivities";
 export * from "./deviceOrganisations";
+export * from "./deviceExplorerElements";
 export * from "./deviceStatuses";
 export * from "./folders";
 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 +35,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/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": "1.0.26",
+  "version": "1.0.28-remove-deprecated2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,13 +10,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.26"
+    "@dative-gpi/foundation-core-domain": "1.0.28-remove-deprecated2"
   },
   "peerDependencies": {
-    "@dative-gpi/bones-ui": "^0.0.75",
+    "@dative-gpi/bones-ui": "^1.0.0",
     "@microsoft/signalr": "^8.0.0",
-    "vue": "^3.4.29",
+    "vue": "^3.4.38",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "55c73ec6624ef58f78303ce68256236984c83ca9"
+  "gitHead": "65c182fd697939a07ad87c683a2f4c2fb765a7c7"
 }

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