Merge pull request #385 from mStirner/dev

workin on issues
OpenHausIO · Dec 29, 2023 · abc4dfb · abc4dfb
2 parents 97c7a42 + 8122b54
commit abc4dfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/system/component/class.component.js b/system/component/class.component.js
@@ -635,6 +635,12 @@ module.exports = class COMPONENT extends COMMON {
                         let loop = (target, filter) => {
                             return Object.keys(filter).every((key) => {
 
+                                if (key === "labels" && Array.isArray(filter[key])) {
+                                    return filter[key].every((label) => {
+                                        return item.labels.includes(label);
+                                    });
+                                }
+
                                 if (target[key] instanceof Object) {
                                     return loop(target[key], filter[key]);
                                 } else {

diff --git a/system/component/class.labels.js b/system/component/class.labels.js
@@ -48,4 +48,8 @@ module.exports = class Labels extends Array {
         });
     }
 
+    includes(str) {
+        return Array.prototype.includes.call(this.toJSON(), str);
+    }
+
 };