@c8y/ngx-components 1023.14.47 → 1023.14.57

package/fesm2022/c8y-ngx-components-context-dashboard.mjs

@@ -670,11 +670,7 @@ class ContextDashboardService {
         const finalFilterCriteria = typeFilterCriteria
             ? [...filterCriteria, typeFilterCriteria]
             : filterCriteria;
-        const query = this.queriesUtil.buildQuery({
-            __filter: {
-                __and: [{ __or: finalFilterCriteria }, this.appliedToFilter()]
-            }
-        });
+        const query = this.queriesUtil.buildQuery({ __filter: { __or: finalFilterCriteria } });
         const now = Date.now();
         const cacheHasValidResponse = this.contextDashboardsCache &&
             this.contextDashboardsCache.query === query &&
@@ -687,11 +683,17 @@ class ContextDashboardService {
         }
         this.contextDashboardsCache = {
             query,
-            result: this.inventory.list({ query, pageSize: this.DEFAULT_PAGESIZE }),
+            result: this.listAndFilterByApplication(query),
             timestamp: now
         };
         return this.contextDashboardsCache.result;
     }
+    /**
+     * Creates query for application bound dashboards.
+     * If application key is not available, it returns empty object.
+     * Use it when you need to filter dashboards according to
+     * application they are applied to and need pagination.
+     */
     appliedToFilter() {
         const key = this.appStateService?.currentApplication?.value?.key || '';
         if (!key) {
@@ -984,6 +986,17 @@ class ContextDashboardService {
             [`c8y_Dashboard!name!${dashboardCfg.name}`]: {}
         };
     }
+    /*
+     * For dashboard views within applications, filter dashboards by application association.
+     * Do it on the client side as the inventory query doesn't perform well on not indexed fragments.
+     */
+    async listAndFilterByApplication(query) {
+        const dashboards = await this.inventory.list({ query, pageSize: this.DEFAULT_PAGESIZE });
+        dashboards.data = dashboards.data.filter(dashboard => {
+            return (Array.from(dashboard[this.APPLIED_TO_FRAGMENT] || []).includes(this.appStateService?.currentApplication?.value?.key) || !dashboard[this.APPLIED_TO_FRAGMENT]);
+        });
+        return dashboards;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ContextDashboardService, deps: [{ token: i1$1.InventoryService }, { token: i2.TabsService }, { token: i2.ModalService }, { token: i2$1.TranslateService }, { token: i1.Router }, { token: i2.NavigatorService }, { token: i2.Permissions }, { token: i2.AlertService }, { token: i2.DynamicComponentService }, { token: i2.GroupService }, { token: i2.OptionsService }, { token: i2.AppStateService }, { token: i2.ContextRouteService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: ContextDashboardService, providedIn: 'root' }); }
 }