@c8y/ngx-components 1022.27.0 → 1022.30.0

package/fesm2022/c8y-ngx-components-dashboard-manager-devicemanagement.mjs

@@ -0,0 +1,19 @@
+import { hookPreview } from '@c8y/ngx-components';
+
+const dashboardManagerFeatureProvider = [
+    hookPreview({
+        key: 'ui.dm-dashboard-manager',
+        label: 'Dashboard manager',
+        description: () => import('@c8y/style/markdown-files/dm-dashboard-manager-preview.md').then(m => m.default),
+        settings: {
+            reload: true
+        }
+    })
+];
+
+/**
+ * Generated bundle index. Do not edit.
+ */
+
+export { dashboardManagerFeatureProvider };
+//# sourceMappingURL=c8y-ngx-components-dashboard-manager-devicemanagement.mjs.map

package/fesm2022/c8y-ngx-components-dashboard-manager-devicemanagement.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"c8y-ngx-components-dashboard-manager-devicemanagement.mjs","sources":["../../dashboard-manager/devicemanagement/index.ts","../../dashboard-manager/devicemanagement/c8y-ngx-components-dashboard-manager-devicemanagement.ts"],"sourcesContent":["import { hookPreview } from '@c8y/ngx-components';\n\nexport const dashboardManagerFeatureProvider = [\n  hookPreview({\n    key: 'ui.dm-dashboard-manager',\n    label: 'Dashboard manager',\n    description: () =>\n      import('@c8y/style/markdown-files/dm-dashboard-manager-preview.md').then(m => m.default),\n    settings: {\n      reload: true\n    }\n  })\n];\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;AAEa,MAAA,+BAA+B,GAAG;AAC7C,IAAA,WAAW,CAAC;AACV,QAAA,GAAG,EAAE,yBAAyB;AAC9B,QAAA,KAAK,EAAE,mBAAmB;AAC1B,QAAA,WAAW,EAAE,MACX,OAAO,2DAA2D,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;AAC1F,QAAA,QAAQ,EAAE;AACR,YAAA,MAAM,EAAE;AACT;KACF;;;ACXH;;AAEG;;;;"}

package/fesm2022/c8y-ngx-components-map.mjs

@@ -4,9 +4,10 @@ import * as i1$1 from '@c8y/ngx-components';
 import { gettext, sortByPriority, ManagedObjectRealtimeService, globalAutoRefreshLoading, CountdownIntervalComponent, IconDirective, C8yTranslatePipe, CommonModule as CommonModule$1, FormsModule as FormsModule$1, RealtimeModule, CoreModule } from '@c8y/ngx-components';
 import * as i3 from '@ngx-translate/core';
 import * as i4 from 'rxjs';
-import { of, combineLatest, defer, NEVER, BehaviorSubject, Subject, fromEvent, EMPTY, merge, from } from 'rxjs';
+import { of, combineLatest, defer, firstValueFrom, NEVER, BehaviorSubject, Subject, fromEvent, EMPTY, merge, from } from 'rxjs';
 import { map, first, takeUntil, scan, filter, switchMap, tap, mergeMap, catchError, debounceTime, skip } from 'rxjs/operators';
 import * as i1 from '@c8y/client';
+import { QueriesUtil } from '@c8y/client';
 import { latLng, latLngBounds } from 'leaflet';
 import { get, remove, isUndefined, flatten, every, isNull, isEmpty, cloneDeep } from 'lodash-es';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -111,10 +112,11 @@ class MapService {
     /**
      * @ignore: Only DI.
      */
-    constructor(inventory, options, serviceRegistry) {
+    constructor(inventory, options, serviceRegistry, featureCacheService) {
         this.inventory = inventory;
         this.options = options;
         this.serviceRegistry = serviceRegistry;
+        this.featureCacheService = featureCacheService;
         /**
          * The devices that are maximal displayed in one cluster.
          */
@@ -124,6 +126,7 @@ class MapService {
          * three clusters: 1, 4 or 16.
          */
         this.CLUSTER_LEVEL_THRESHOLD = 500;
+        this.queriesUtil = new QueriesUtil();
     }
     /**
      * Returns the leaflet instance used by the cumulocity core.
@@ -196,31 +199,63 @@ class MapService {
     /**
      * Counts all managed objects in a given bound with a c8y_Position fragment.
      * @param bound The lat lng bound to request the managed objects for.
-     * @param byGroupIdMO The group managed object of which direct children should be searched for.
+     * @param isinhierarchyofMO The group managed object of which direct children should be searched for.
      * @returns The number of all position managed objects in the given bound (and group).
      */
-    async getPositionMOsFromBoundCount(bound, byGroupIdMO) {
-        return this.getPositionMOsFromBound(bound, byGroupIdMO, true);
+    async getPositionMOsFromBoundCount(bound, isinhierarchyofMO) {
+        return this.getPositionMOsFromBound(bound, isinhierarchyofMO, true);
     }
-    async getPositionMOsFromBound(bound, byGroupIdMO, count = false) {
+    async getPositionMOsFromBound(bound, isinhierarchyofMO, count = false) {
         const { lat: latMin, lng: lngMinRaw } = bound.getSouthWest();
         const { lat: latMax, lng: lngMaxRaw } = bound.getNorthEast();
         const lngMin = lngMaxRaw - lngMinRaw > 360 ? -180 : this.normalizeLongitude(lngMinRaw);
         const lngMax = lngMaxRaw - lngMinRaw > 360 ? 180 : this.normalizeLongitude(lngMaxRaw);
-        const byGroupIdFilter = byGroupIdMO
-            ? `(bygroupid(${byGroupIdMO.id}) or id eq '${byGroupIdMO.id}') and `
-            : '';
-        let boundFilter = `$filter=${byGroupIdFilter}has(c8y_Position) and c8y_Position.lat gt ${latMin}d and c8y_Position.lat lt ${latMax}d`;
-        if (lngMin < lngMax) {
-            boundFilter = `${boundFilter} and c8y_Position.lng gt ${lngMin}d and c8y_Position.lng lt ${lngMax}d`;
-        }
-        else {
-            boundFilter = `${boundFilter} and (c8y_Position.lng gt ${lngMin}d or c8y_Position.lng lt ${lngMax}d)`;
-        }
+        const filterObjWithCoordinates = {
+            __and: [
+                ...(isinhierarchyofMO
+                    ? [
+                        {
+                            __or: [
+                                { id: isinhierarchyofMO.id },
+                                await this.childrenOfGroupFilter(isinhierarchyofMO)
+                            ]
+                        }
+                    ]
+                    : []),
+                {
+                    __has: 'c8y_Position'
+                },
+                {
+                    ['c8y_Position.lat']: {
+                        __gt: latMin
+                    }
+                },
+                {
+                    ['c8y_Position.lat']: {
+                        __lt: latMax
+                    }
+                },
+                {
+                    [lngMin < lngMax ? '__and' : '__or']: [
+                        {
+                            ['c8y_Position.lng']: {
+                                __gt: lngMin
+                            }
+                        },
+                        {
+                            ['c8y_Position.lng']: {
+                                __lt: lngMax
+                            }
+                        }
+                    ]
+                }
+            ]
+        };
+        const query = this.queriesUtil.buildQuery(filterObjWithCoordinates);
         const { paging, data } = await this.inventory.list({
             pageSize: count ? 1 : this.MAX_DEVICE_PER_CLUSTER,
             withTotalPages: count,
-            query: boundFilter
+            query
         });
         if (count) {
             return paging.totalPages;
@@ -236,10 +271,13 @@ class MapService {
      * @returns All devices or the device count with a c8y_Position fragment.
      */
     async getPositionDevices(pageSize = this.MAX_DEVICE_PER_CLUSTER, count) {
+        const query = this.queriesUtil.buildQuery({
+            __and: [{ __has: 'c8y_Position' }, { __has: 'c8y_IsDevice' }]
+        });
         const { paging, data } = await this.inventory.list({
             pageSize: count ? 1 : pageSize,
             withTotalPages: !!count,
-            query: '$filter=has(c8y_Position) and has(c8y_IsDevice)'
+            query
         });
         if (count) {
             return paging.totalPages;
@@ -248,19 +286,27 @@ class MapService {
     }
     /**
      * Returns all managed object with a c8y_Position fragment.
-     * @param byGroupIdMO The group managed object of which direct children should be searched for.
+     * @param isinhierarchyofMO The group managed object of which direct children should be searched for.
      * @param pageSize Defines how many results should be returned.
      * @returns The managed objects with position.
      */
-    async getAllPositionMOs(byGroupIdMO, pageSize = 500) {
+    async getAllPositionMOs(isinhierarchyofMO, pageSize = 500) {
+        const childrenFilter = isinhierarchyofMO
+            ? await this.childrenOfGroupFilter(isinhierarchyofMO)
+            : undefined;
+        const orValue = childrenFilter ? [{ id: isinhierarchyofMO.id }, childrenFilter] : undefined;
+        const queryObj = {
+            __filter: {
+                __and: [{ __has: 'c8y_Position' }],
+                ...(orValue ? { __or: orValue } : {})
+            }
+        };
+        const query = this.queriesUtil.buildQuery(queryObj);
         const filter = {
             pageSize,
             withTotalPages: true,
-            query: 'has(c8y_Position)'
+            query
         };
-        if (byGroupIdMO) {
-            filter.query = `$filter=(bygroupid(${byGroupIdMO.id}) or id eq '${byGroupIdMO.id}') and has(c8y_Position)`;
-        }
         const { paging, data, res } = await this.inventory.list(filter);
         return {
             res,
@@ -364,7 +410,19 @@ class MapService {
         pmo.c8y_Position.lng = lng;
         return pmo;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: MapService, deps: [{ token: i1.InventoryService }, { token: i1$1.OptionsService }, { token: i1$1.ServiceRegistry }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    async childrenOfGroupFilter(mo) {
+        try {
+            const useInHierarchyOf = await firstValueFrom(this.featureCacheService.getFeatureState('ui.map.isinhierarchyof'));
+            if (useInHierarchyOf) {
+                return { __isinhierarchyof: mo.id };
+            }
+        }
+        catch (e) {
+            console.warn('Error while determining isinhierarchyof feature toggle state:', e);
+        }
+        return { __bygroupid: mo.id };
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: MapService, deps: [{ token: i1.InventoryService }, { token: i1$1.OptionsService }, { token: i1$1.ServiceRegistry }, { token: i1$1.FeatureCacheService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: MapService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: MapService, decorators: [{
@@ -372,7 +430,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1.InventoryService }, { type: i1$1.OptionsService }, { type: i1$1.ServiceRegistry }] });
+        }], ctorParameters: () => [{ type: i1.InventoryService }, { type: i1$1.OptionsService }, { type: i1$1.ServiceRegistry }, { type: i1$1.FeatureCacheService }] });
 
 class ClusterMap {
     set clusterMarker(item) {