1.5.23

Changed app trigger 'entity state changed' to autocomplete field.
RonnyWinkler · May 30, 2024 · 9e5429a · 9e5429a
1 parent 1045bf0
commit 9e5429a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/.homeychangelog.json b/.homeychangelog.json
@@ -574,6 +574,10 @@
   "1.5.22": {
     "en": "Added app trigger for entity state changes.",
     "de": "App-Trigger für Entitäts-Statusänderungen hinzugefügt."
+  },
+  "1.5.23": {
+    "en": "Changed app trigger 'entity state changed' to autocomplete field.",
+    "de": "App-Trigger 'Entitäts-Status geändert' zu Autocomplete-Feld geändert."
   }
 
 }
diff --git a/.homeycompose/app.json b/.homeycompose/app.json
@@ -1,6 +1,6 @@
 {
   "id": "io.home-assistant.community",
-  "version": "1.5.22",
+  "version": "1.5.23",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",

diff --git a/.homeycompose/flow/triggers/event_state_changed_triggered_filter.json b/.homeycompose/flow/triggers/event_state_changed_triggered_filter.json
@@ -37,8 +37,7 @@
     "args": [
         {
             "name": "entity",
-            "type": "text",
-            "required": false,
+            "type": "autocomplete",
             "title": { 
                 "en": "Entity",
                 "de": "Entität",

diff --git a/app.js b/app.js
@@ -949,6 +949,7 @@ class App extends Homey.App {
         this._flowTriggerAutomationTriggeredFilter.registerRunListener(async (args, state) => {
             return ( !args.name || args.name === state.name);
         });
+
 		this._flowTriggerEventTriggeredFilter = this.homey.flow.getTriggerCard("event_triggered_filter");
         this._flowTriggerEventTriggeredFilter.registerRunListener(async (args, state) => {
 			// Check for event name and entity id
@@ -969,18 +970,25 @@ class App extends Homey.App {
 				return false;
 			}
         });
+
 		this._flowTriggerEventStateChangedTriggeredFilter = this.homey.flow.getTriggerCard("event_state_changed_triggered_filter");
         this._flowTriggerEventStateChangedTriggeredFilter.registerRunListener(async (args, state) => {
 			// Check for entity id
 			if (
-				( !args.entity || args.entity === state.entity )	
+				( !args.entity || args.entity.id === state.entity )	
 			){
 				return true;
 			}
 			else{
 				return false;
 			}
         });
+		this._flowTriggerEventStateChangedTriggeredFilter.registerArgumentAutocompleteListener('entity', async (query, args) => {
+			const entityList = await this._getAutocompleteEntityList();
+			return entityList.filter((result) => { 
+				return result.name.toLowerCase().includes(query.toLowerCase());
+			});
+		});
 
 		// Flow Trigger: Devices
 		// Flow trigger for all capabilities (compound device)
@@ -1227,12 +1235,6 @@ class App extends Homey.App {
 
 		for(let i=0; i<args.length; i++){
 			this.flowTriggerArguments["event_triggered_filter"][args[i].event] = true;
-			// this.flowTriggerArguments["event_triggered_filter"].push(
-			// 	{	
-			// 		event: args[i].event,
-			// 	 	entity: args[i].entity
-			// 	}
-			// );
 		}
 		this.log(this.flowTriggerArguments["event_triggered_filter"]);
 	}
@@ -1243,13 +1245,7 @@ class App extends Homey.App {
 		this.flowTriggerArguments["event_state_changed_triggered_filter"] = {};
 
 		for(let i=0; i<args.length; i++){
-			this.flowTriggerArguments["event_state_changed_triggered_filter"][args[i].entity] = true;
-			// this.flowTriggerArguments["event_triggered_filter"].push(
-			// 	{	
-			// 		event: args[i].event,
-			// 	 	entity: args[i].entity
-			// 	}
-			// );
+			this.flowTriggerArguments["event_state_changed_triggered_filter"][args[i].entity.id] = true;
 		}
 		this.log(this.flowTriggerArguments["event_state_changed_triggered_filter"]);
 	}

diff --git a/app.json b/app.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file is generated. Please edit .homeycompose/app.json instead.",
   "id": "io.home-assistant.community",
-  "version": "1.5.22",
+  "version": "1.5.23",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",
@@ -635,8 +635,7 @@
         "args": [
           {
             "name": "entity",
-            "type": "text",
-            "required": false,
+            "type": "autocomplete",
             "title": {
               "en": "Entity",
               "de": "Entität",