@dative-gpi/foundation-core-services 0.0.9 → 0.0.11

package/composables/services/index.ts

@@ -21,6 +21,6 @@ export * from "./usePermissionCategories";
 export * from "./usePermissions";
 export * from "./useRoleOrganisations";
 export * from "./useRoleOrganisationTypes";
-export * from "./useUserOrganisationDispositions";
+export * from "./useTables";
 export * from "./useUserOrganisations";
 export * from "./useUsers";

package/composables/services/useAlerts.ts

@@ -37,10 +37,16 @@ export const useAlerts = ComposableFactory.getMany(AlertServiceFactory);
 export const useRemoveAlert = ComposableFactory.remove(AlertServiceFactory);
 export const useAcknowledgeAlert = () => {
     const service = AlertServiceFactory();
+    const subscribersIds : number[] = [];
 
     const changing = ref(false);
     const changed = ref<AlertDetails | null>(null) as Ref<AlertDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const change = async (alertId: string) => {
         changing.value = true;
         try {
@@ -49,10 +55,7 @@ export const useAcknowledgeAlert = () => {
         finally {
             changing.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(changed))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(changed)));
         return readonly(changed as Ref<AlertDetails>);
     }
 

package/composables/services/useDeviceOrganisations.ts

@@ -38,10 +38,16 @@ export const useUpdateDeviceOrganisation = ComposableFactory.update(DeviceOrgani
 export const useRemoveDeviceOrganisation = ComposableFactory.remove(DeviceOrganisationServiceFactory);
 export const useChangeDeviceOrganisationGroup = () => {
     const service = DeviceOrganisationServiceFactory();
+    const subscriberIds: number[] = [];
 
     const changing = ref(false);
     const changed = ref<DeviceOrganisationDetails | null>(null) as Ref<DeviceOrganisationDetails | null>;
 
+    onUnmounted(() => {
+        subscriberIds.forEach(id => service.unsubscribe(id));
+        subscriberIds.length = 0;
+    });
+
     const change = async (deviceOrganisationId: string, payload: ChangeDeviceOrganisationGroupDTO) => {
         changing.value = true;
         try {
@@ -50,10 +56,7 @@ export const useChangeDeviceOrganisationGroup = () => {
         finally {
             changing.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(changed))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscriberIds.push(service.subscribe("all", onEntityChanged(changed)));
         return readonly(changed as Ref<DeviceOrganisationDetails>);
     }
 
@@ -65,10 +68,16 @@ export const useChangeDeviceOrganisationGroup = () => {
 }
 export const useChangeDeviceOrganisationLocation = () => {
     const service = DeviceOrganisationServiceFactory();
+    const subscriberIds: number[] = [];
 
     const changing = ref(false);
     const changed = ref<DeviceOrganisationDetails | null>(null) as Ref<DeviceOrganisationDetails | null>;
 
+    onUnmounted(() => {
+        subscriberIds.forEach(id => service.unsubscribe(id));
+        subscriberIds.length = 0;
+    });
+
     const change = async (deviceOrganisationId: string, payload: ChangeDeviceOrganisationLocationDTO) => {
         changing.value = true;
         try {
@@ -77,10 +86,7 @@ export const useChangeDeviceOrganisationLocation = () => {
         finally {
             changing.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(changed))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscriberIds.push(service.subscribe("all", onEntityChanged(changed)));
         return readonly(changed as Ref<DeviceOrganisationDetails>);
     }
 

package/composables/services/useGroups.ts

@@ -30,10 +30,16 @@ export const useUpdateGroup = ComposableFactory.update(GroupServiceFactory);
 export const useRemoveGroup = ComposableFactory.remove(GroupServiceFactory);
 export const useChangeGroupParent = () => {
     const service = GroupServiceFactory();
+    const subscriberIds: number[] = [];
 
     const changing = ref(false);
     const changed = ref<GroupDetails | null>(null) as Ref<GroupDetails | null>;
 
+    onUnmounted(() => {
+        subscriberIds.forEach(id => service.unsubscribe(id));
+        subscriberIds.length = 0;
+    });
+
     const change = async (groupId: string, payload: ChangeGroupParentDTO) => {
         changing.value = true;
         try {
@@ -42,10 +48,7 @@ export const useChangeGroupParent = () => {
         finally {
             changing.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(changed))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscriberIds.push(service.subscribe("all", onEntityChanged(changed)));
         return readonly(changed as Ref<GroupDetails>);
     }
 

package/composables/services/useOrganisations.ts

@@ -21,10 +21,16 @@ const OrganisationServiceFactory = new ServiceFactory<OrganisationDetailsDTO, Or
 
 export const useChangeDashboardOrganisation = () => {
     const service = OrganisationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const changing = ref(false);
     const changed = ref<OrganisationDetails | null>(null) as Ref<OrganisationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const change = async (payload: ChangeOrganisationDashboardDTO) => {
         changing.value = true;
         try {
@@ -33,10 +39,7 @@ export const useChangeDashboardOrganisation = () => {
         finally {
             changing.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(changed))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(changed)));
         return readonly(changed as Ref<OrganisationDetails>);
     }
 

package/composables/services/useTables.ts

@@ -0,0 +1,14 @@
+import { TableDetails, TableDetailsDTO, UpdateTableDTO } from "@dative-gpi/foundation-core-domain";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
+
+import { TABLE_URL } from "../../config/urls";
+
+const TableServiceFactory = new ServiceFactory<TableDetailsDTO, TableDetails>("table", TableDetails).create(factory => factory.build(
+    factory.addGet(TABLE_URL),
+    factory.addUpdate<UpdateTableDTO>(TABLE_URL),
+    factory.addNotify()
+));
+
+
+export const useTable = ComposableFactory.get(TableServiceFactory);
+export const useUpdateTable = ComposableFactory.update(TableServiceFactory);

package/composables/services/useUserOrganisations.ts

@@ -38,10 +38,16 @@ export const useUpdateUserOrganisation = ComposableFactory.update(UserOrganisati
 export const useRemoveUserOrganisation = ComposableFactory.remove(UserOrganisationServiceFactory);
 export const useCurrentUserOrganisation = () => {
     const service = UserOrganisationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const fetching = ref(false);
     const fetched = ref<UserOrganisationDetails | null>(null) as Ref<UserOrganisationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const fetch = async () => {
         fetching.value = true;
         try {
@@ -50,10 +56,7 @@ export const useCurrentUserOrganisation = () => {
         finally {
             fetching.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(fetched))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(fetched)));
         return readonly(fetched as Ref<UserOrganisationDetails>);
     }
 
@@ -65,10 +68,16 @@ export const useCurrentUserOrganisation = () => {
 }
 export const useUpdateCurrentUserOrganisation = () => {
     const service = UserOrganisationServiceFactory();
+    const subscribersIds: number[] = [];
 
     const updating = ref(false);
     const updated = ref<UserOrganisationDetails | null>(null) as Ref<UserOrganisationDetails | null>;
 
+    onUnmounted(() => {
+        subscribersIds.forEach(id => service.unsubscribe(id));
+        subscribersIds.length = 0;
+    });
+
     const update = async (payload: UpdateUserOrganisationDTO) => {
         updating.value = true;
         try {
@@ -77,10 +86,7 @@ export const useUpdateCurrentUserOrganisation = () => {
         finally {
             updating.value = false;
         }
-
-        const subscriberId = service.subscribe("all", onEntityChanged(updated))
-        onUnmounted(() => service.unsubscribe(subscriberId));
-
+        subscribersIds.push(service.subscribe("all", onEntityChanged(updated)));
         return readonly(updated as Ref<UserOrganisationDetails>);
     }
 

package/composables/useOrganisationId.ts

@@ -1,6 +1,4 @@
-import { provide, ref, watch } from "vue";
-
-import { ORGANISATION_ID } from "@dative-gpi/foundation-core-services/config/literals";
+import { ref, watch } from "vue";
 
 let initialized = false;
 
@@ -11,10 +9,6 @@ export const useOrganisationId = () => {
         organisationId.value = payload;
     };
 
-    if (!initialized) {
-        provide(ORGANISATION_ID, organisationId);
-    }
-
     initialized = true;
 
     const ready = new Promise((resolve) => {

package/config/urls/index.ts

@@ -23,6 +23,6 @@ export * from "./permissionCategories";
 export * from "./permissions";
 export * from "./roleOrganisations";
 export * from "./roleOrganisationTypes";
-export * from "./userOrganisationDispositions";
+export * from "./tables";
 export * from "./userOrganisations";
 export * from "./users";

package/config/urls/tables.ts

@@ -0,0 +1,4 @@
+import { CORE_URL } from "./base";
+
+export const TABLES_URL = () => `${CORE_URL()}/tables`;
+export const TABLE_URL = (tableCode: string) => `${TABLES_URL()}/${encodeURIComponent(tableCode)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dative-gpi/foundation-core-services",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/bones-ui": "^0.0.58",
-    "@dative-gpi/foundation-core-domain": "0.0.9",
+    "@dative-gpi/bones-ui": "^0.0.60",
+    "@dative-gpi/foundation-core-domain": "0.0.11",
     "@microsoft/signalr": "^8.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "d079d93c7d8677f8269b97bc71820bc35dc46921"
+  "gitHead": "4f28939e7d42ab1ef8319c614fbc210b1291fd79"
 }

package/composables/services/useUserOrganisationDispositions.ts

@@ -1,76 +0,0 @@
-import { Ref, onUnmounted, readonly, ref } from "vue";
-
-import { UpdateUserOrganisationDispositionDTO, UserOrganisationDispositionDetails, UserOrganisationDispositionDetailsDTO, UserOrganisationDispositionInfos, UserOrganisationDispositionInfosDTO } from "@dative-gpi/foundation-core-domain";
-import { ComposableFactory, onEntityChanged, ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { USER_ORGANISATION_DISPOSITION_URL } from "../../config/urls";
-
-const UserOrganisationDispositionServiceFactory = new ServiceFactory<UserOrganisationDispositionDetailsDTO, UserOrganisationDispositionDetails>("userOrganisationDisposition", UserOrganisationDispositionDetails).create(factory => factory.build(
-    factory.addNotify((notifyService) => ({
-        getTable: async (tableCode: string): Promise<UserOrganisationDispositionInfosDTO[]> => {
-            const response = await ServiceFactory.http.get(USER_ORGANISATION_DISPOSITION_URL(tableCode));
-            const result = response.data.map((dto: UserOrganisationDispositionInfosDTO) => new UserOrganisationDispositionInfos(dto));
-
-            notifyService.notify("update", result);
-
-            return result;
-        },
-        updateTable: async(tableCode: string, payload: UpdateUserOrganisationDispositionDTO[]): Promise<UserOrganisationDispositionInfosDTO[]> => {
-            const response = await ServiceFactory.http.post(USER_ORGANISATION_DISPOSITION_URL(tableCode), payload);
-            const result = response.data.map((dto: UserOrganisationDispositionInfosDTO) => new UserOrganisationDispositionInfos(dto));
-
-            notifyService.notify("update", result);
-
-            return result;
-        }
-    }))
-));
-
-export const useGetTable = () => {
-    const service = UserOrganisationDispositionServiceFactory();
-
-    const fetching = ref(false);
-    const fetched = ref<UserOrganisationDispositionInfos[]>([]) as Ref<UserOrganisationDispositionInfos[]>;
-
-    const fetch = async (tableCode: string) => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getTable(tableCode);
-        }
-        finally {
-            fetching.value = false;
-        }
-
-        return readonly(fetched as Ref<UserOrganisationDispositionInfos[]>);
-    }
-
-    return {
-        fetching: readonly(fetching),
-        fetch,
-        fetched: readonly(fetched)
-    }
-}
-export const useUpdateTable = () => {
-    const service = UserOrganisationDispositionServiceFactory();
-
-    const updating = ref(false);
-    const updated = ref<UserOrganisationDispositionInfos[]>([]) as Ref<UserOrganisationDispositionInfos[]>;
-
-    const update = async (tableCode: string, payload: UpdateUserOrganisationDispositionDTO[]) => {
-        updating.value = true;
-        try {
-            updated.value = await service.updateTable(tableCode, payload);
-        }
-        finally {
-            updating.value = false;
-        }
-
-        return readonly(updated as Ref<UserOrganisationDispositionInfos[]>);
-    }
-
-    return {
-        updating: readonly(updating),
-        update,
-        updated: readonly(updated)
-    }
-}

package/config/urls/userOrganisationDispositions.ts

@@ -1,4 +0,0 @@
-import { CORE_URL } from "./base";
-
-export const USER_ORGANISATION_DISPOSITIONS_URL = () => `${CORE_URL()}/user-organisation-dispositions`;
-export const USER_ORGANISATION_DISPOSITION_URL = (tableCode: string) => `${USER_ORGANISATION_DISPOSITIONS_URL()}/${encodeURIComponent(tableCode)}`;