@dative-gpi/foundation-core-services 1.1.12 → 1.1.13

package/composables/services/index.ts

@@ -14,6 +14,7 @@ export * from "./useCustomPropertyValues";
 export * from "./useDashboardOrganisations";
 export * from "./useDashboardOrganisationTypes";
 export * from "./useDashboards";
+export * from "./useDashboardExplorerElements";
 export * from "./useDashboardShallows";
 export * from "./useDataCategories";
 export * from "./useDataDefinitions";

package/composables/services/useDashboardExplorerElements.ts

@@ -0,0 +1,92 @@
+import { ref } from "vue";
+
+import { DashboardExplorerElementDetails, type DashboardExplorerElementDetailsDTO, type DashboardExplorerElementFilters, DashboardExplorerElementInfos, type DashboardExplorerElementInfosDTO } from "@dative-gpi/foundation-core-domain/models";
+import { onCollectionChanged } from "@dative-gpi/bones-ui";
+import { ServiceFactory } from "@dative-gpi/bones-ui/core";
+import { createCollectionHandler } from "@dative-gpi/foundation-shared-services/tools";
+import { containsSearchTerm } from "@dative-gpi/foundation-shared-components/utils";
+
+import { DASHBOARD_EXPLORER_ELEMENTS_URL } from "../../config/urls";
+
+import { useSubscribeToDashboardOrganisations } from "./useDashboardOrganisations";
+import { useSubscribeToDashboardShallows } from "./useDashboardShallows";
+import { useSubscribeToDashboardOrganisationTypes } from "./useDashboardOrganisationTypes";
+import { useSubscribeToFolders } from "./useFolders";
+
+const DashboardExplorerElementServiceFactory = new ServiceFactory<DashboardExplorerElementDetailsDTO, DashboardExplorerElementDetails>("dashboardExplorerElement", DashboardExplorerElementDetails).create(factory => factory.build(
+  factory.addGetMany<DashboardExplorerElementInfosDTO, DashboardExplorerElementInfos, DashboardExplorerElementFilters>(DASHBOARD_EXPLORER_ELEMENTS_URL, DashboardExplorerElementInfos),
+  factory.addNotify()
+));
+
+export const useDashboardExplorerElements = () => {
+  const { subscribe: subscribeToDashboardOrganisations } = useSubscribeToDashboardOrganisations();
+  const { subscribe: subscribeToDashboardShallows } = useSubscribeToDashboardShallows();
+  const { subscribe: subscribeToDashboardOrganisationTypes } = useSubscribeToDashboardOrganisationTypes();
+  const { subscribe: subscribeToFolders } = useSubscribeToFolders();
+
+  const fetching = ref(false);
+  const entities = ref<DashboardExplorerElementInfos[]>([]);
+  const filters = ref<DashboardExplorerElementFilters>();
+
+  const getMany = async (filter?: DashboardExplorerElementFilters) => {
+    fetching.value = true;
+    filters.value = filter;
+
+    const filterMethod = (el: DashboardExplorerElementInfos): boolean => {
+      if (!filters.value) {
+        return true;
+      }
+      if (filters.value.types && !filters.value.types.includes(el.type)) {
+        return false;
+      }
+      if (filters.value.dashboardExplorerElementsIds) {
+        return filters.value.dashboardExplorerElementsIds.includes(el.id);
+      }
+      if (!filters.value.search) {
+        return (!!filters.value.root && !el.parentId) || (!!filters.value.parentId && filters.value.parentId === el.parentId);
+      }
+      return (!filters.value.parentId || el.path.some(p => p.id === filters.value!.parentId)) &&
+        containsSearchTerm({ label: el.label, code: el.code, tags: el.tags }, filters.value.search.toLowerCase());
+    };
+
+    const onCollectionChangedCustom = onCollectionChanged(entities, filterMethod);
+
+    try {
+      entities.value = await DashboardExplorerElementServiceFactory.getMany(filters.value);
+
+      subscribeToDashboardOrganisations("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DashboardExplorerElementInfos.fromDashboardOrganisation
+        )
+      );
+      subscribeToDashboardShallows("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DashboardExplorerElementInfos.fromDashboardShallow
+        )
+      );
+      subscribeToDashboardOrganisationTypes("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DashboardExplorerElementInfos.fromDashboardOrganisationType
+        )
+      );
+      subscribeToFolders("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DashboardExplorerElementInfos.fromFolder
+        )
+      );
+    }
+    finally {
+      fetching.value = false;
+    }
+  };
+
+  return {
+    fetching,
+    getMany,
+    entities
+  };
+};

package/composables/services/useDashboardOrganisationTypes.ts

@@ -29,6 +29,7 @@ const DashboardOrganisationTypeServiceFactory = new ServiceFactory<DashboardOrga
 
 export const useDashboardOrganisationType = ComposableFactory.get(DashboardOrganisationTypeServiceFactory);
 export const useDashboardOrganisationTypes = ComposableFactory.getMany(DashboardOrganisationTypeServiceFactory);
+export const useSubscribeToDashboardOrganisationTypes = ComposableFactory.subscribe(DashboardOrganisationTypeServiceFactory);
 export const useUpdateDashboardOrganisationType = ComposableFactory.update(DashboardOrganisationTypeServiceFactory);
 export const useRemoveDashboardOrganisationType = ComposableFactory.remove(DashboardOrganisationTypeServiceFactory);
 export const usePublishDashboardOrganisationType = ComposableFactory.custom(DashboardOrganisationTypeServiceFactory.publish);

package/composables/services/useDashboardOrganisations.ts

@@ -28,6 +28,7 @@ const DashboardOrganisationServiceFactoryIncomplete = new ServiceFactory("dashbo
 
 export const useDashboardOrganisation = ComposableFactory.get(DashboardOrganisationServiceFactory);
 export const useDashboardOrganisations = ComposableFactory.getMany(DashboardOrganisationServiceFactory);
+export const useSubscribeToDashboardOrganisations = ComposableFactory.subscribe(DashboardOrganisationServiceFactory);
 export const useCreateDashboardOrganisation = ComposableFactory.create(DashboardOrganisationServiceFactory);
 export const useUpdateDashboardOrganisation = ComposableFactory.update(DashboardOrganisationServiceFactory);
 export const useRemoveDashboardOrganisation = ComposableFactory.remove(DashboardOrganisationServiceFactory);

package/composables/services/useDashboardShallows.ts

@@ -23,6 +23,7 @@ const DashboardShallowServiceFactoryIncomplete = new ServiceFactory("dashboardSh
 
 export const useDashboardShallow = ComposableFactory.get(DashboardShallowServiceFactory);
 export const useDashboardShallows = ComposableFactory.getMany(DashboardShallowServiceFactory);
+export const useSubscribeToDashboardShallows = ComposableFactory.subscribe(DashboardShallowServiceFactory);
 export const useCreateDashboardShallow = ComposableFactory.create(DashboardShallowServiceFactory);
 export const useUpdateDashboardShallow = ComposableFactory.update(DashboardShallowServiceFactory);
 export const useRemoveDashboardShallow = ComposableFactory.remove(DashboardShallowServiceFactory);

package/composables/services/useDeviceExplorerElements.ts

@@ -1,9 +1,12 @@
 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 { DeviceExplorerElementDetails, type DeviceExplorerElementDetailsDTO, type DeviceExplorerElementFilters, DeviceExplorerElementInfos, type DeviceExplorerElementInfosDTO } from "@dative-gpi/foundation-core-domain/models";
+import { onCollectionChanged } from "@dative-gpi/bones-ui";
 import { ServiceFactory } from "@dative-gpi/bones-ui/core";
 
+import { createCollectionHandler } from "@dative-gpi/foundation-shared-services/tools";
+import { containsSearchTerm } from "@dative-gpi/foundation-shared-components/utils";
+
 import { DEVICE_EXPLORER_ELEMENTS_URL } from "../../config/urls";
 
 import { useTrackDeviceConnectivity, useWatchDeviceConnectivity } from "./useDeviceConnectivities";
@@ -42,9 +45,8 @@ export const useDeviceExplorerElements = () => {
         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()));
+                containsSearchTerm({ label: el.label, code: el.code, tags: el.tags }, filters.value.search.toLowerCase());
     };
 
     const onCollectionChangedCustom = onCollectionChanged(entities, filterMethod);
@@ -52,29 +54,19 @@ export const useDeviceExplorerElements = () => {
     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, DeviceExplorerElementInfos.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, DeviceExplorerElementInfos.fromGroup(el));
-            break;
-          case "delete":
-            (onCollectionChangedCustom as DeleteCallback)(ev, el);
-            break;
-        }
-      });
+      subscribeToDeviceOrganisations("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DeviceExplorerElementInfos.fromDeviceOrganisation
+        )
+      );
+
+      subscribeToGroups("all", 
+        createCollectionHandler(
+          onCollectionChangedCustom, 
+          DeviceExplorerElementInfos.fromGroup
+        )
+      );
 
       watchDevicesStatuses();
       watchDevicesConnectivity();

package/composables/services/useFolders.ts

@@ -14,6 +14,7 @@ const FolderServiceFactory = new ServiceFactory<FolderDetailsDTO, FolderDetails>
 
 export const useFolder = ComposableFactory.get(FolderServiceFactory);
 export const useFolders = ComposableFactory.getMany(FolderServiceFactory);
+export const useSubscribeToFolders = ComposableFactory.subscribe(FolderServiceFactory);
 export const useCreateFolder = ComposableFactory.create(FolderServiceFactory);
 export const useUpdateFolder = ComposableFactory.update(FolderServiceFactory);
 export const useRemoveFolder = ComposableFactory.remove(FolderServiceFactory);

package/config/urls/dashboardExplorerElements.ts

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

package/config/urls/index.ts

@@ -13,6 +13,7 @@ export * from "./customPropertyValues";
 export * from "./dashboardOrganisations";
 export * from "./dashboardOrganisationTypes";
 export * from "./dashboards";
+export * from "./dashboardExplorerElements";
 export * from "./data";
 export * from "./dataCategories";
 export * from "./dataDefinitions";

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,7 +13,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.1.12"
+    "@dative-gpi/foundation-core-domain": "1.1.13"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -21,5 +21,5 @@
     "vue": "3.5.26",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "9ad6a2732e79fef8289b5c606efaf027ea0cd5ba"
+  "gitHead": "808ff91c2715ee0c9201227529471b0a428861c1"
 }