@c8y/ngx-components 1021.22.0 → 1021.25.0

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

@@ -747,12 +747,25 @@ class ContextDashboardService {
         }
     }
     async getContextDashboards(mo, dashboardType) {
+        const filterCriteria = dashboardType.map(t => ({
+            // it's necessary to wrap fragment in quotes because dashboard type can contain spaces
+            __has: `'${this.createDashboardFragment(mo, t)}'`
+        }));
+        // the has query above does not work for device type dashboards where the type contains a dot
+        const typeFilterCriteria = dashboardType.includes(ContextDashboardType.Type) && mo.type
+            ? {
+                __and: [
+                    { 'c8y_Dashboard.deviceType': { __eq: true } },
+                    { 'c8y_Dashboard.deviceTypeValue': { __eq: mo.type } }
+                ]
+            }
+            : undefined;
+        const finalFilterCriteria = typeFilterCriteria
+            ? [...filterCriteria, typeFilterCriteria]
+            : filterCriteria;
         const query = this.queriesUtil.buildQuery({
             __filter: {
-                __or: dashboardType.map(t => ({
-                    // it's necessary to wrap fragment in quotes because dashboard type can contain spaces
-                    __has: `'${this.createDashboardFragment(mo, t)}'`
-                }))
+                __or: finalFilterCriteria
             }
         });
         const now = Date.now();