feat(sentence): Add device id to output properties

zachowj · Apr 12, 2024 · 8f1ccd9 · 8f1ccd9
1 parent 629c1c5
commit 8f1ccd9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/common/services/TypedInputService.ts b/src/common/services/TypedInputService.ts
@@ -80,6 +80,7 @@ export default class TypedInputService {
                 break;
             }
             case TypedInputTypes.Data:
+            case TypedInputTypes.DeviceId:
             case TypedInputTypes.Entity:
             case TypedInputTypes.EntityState:
             case TypedInputTypes.EventData:

diff --git a/src/const.ts b/src/const.ts
@@ -135,6 +135,7 @@ export enum TypedInputTypes {
     Value = 'value',
     PreviousValue = 'previousValue',
     CalendarItem = 'calendarItem',
+    DeviceId = 'deviceId',
 }
 
 export enum TimeUnit {

diff --git a/src/editor/components/output-properties.ts b/src/editor/components/output-properties.ts
@@ -10,7 +10,7 @@ let _extraTypes: string[] = [];
 
 const customTypes: { [key: string]: EditorWidgetTypedInputTypeDefinition } = {
     config: { value: 'config', label: 'config.', hasValue: true },
-    deviceId: { value: 'triggerId', label: 'device id', hasValue: false },
+    deviceId: { value: 'deviceId', label: 'device id', hasValue: false },
     entity: { value: 'entity', label: 'entity', hasValue: false },
     entityId: { value: 'triggerId', label: 'entity id', hasValue: false },
     entityState: {

diff --git a/src/nodes/device/editor/index.ts b/src/nodes/device/editor/index.ts
@@ -362,7 +362,7 @@ const DeviceEditor: EditorNodeDef<DeviceEditorNodeProperties> = {
         const getExtraTypes = (type: 'action' | 'trigger') => {
             const extraTypes = {
                 action: ['sentData'],
-                trigger: ['eventData', 'deviceId'],
+                trigger: ['eventData', 'triggerId'],
             };
             return extraTypes[type];
         };

diff --git a/src/nodes/sentence/SentenceController.ts b/src/nodes/sentence/SentenceController.ts
@@ -2,10 +2,12 @@ import ExposeAsMixin from '../../common/controllers/ExposeAsMixin';
 import OutputController from '../../common/controllers/OutputController';
 import { NodeMessage } from '../../types/nodes';
 import { SentenceNode } from '.';
+import { TypedInputTypes } from '../../const';
 
 interface SentenceResponse {
     sentence: string;
-    result: Record<string, unknown>;
+    result: Record<string, unknown> | null;
+    deviceId: string | null;
 }
 
 const ExposeAsController = ExposeAsMixin(OutputController<SentenceNode>);
@@ -18,9 +20,10 @@ export default class SentenseController extends ExposeAsController {
             this.node.config.outputProperties,
             message,
             {
-                config: this.node.config,
-                triggerId: data.sentence,
-                results: data.result,
+                [TypedInputTypes.Config]: this.node.config,
+                [TypedInputTypes.TriggerId]: data.sentence,
+                [TypedInputTypes.Results]: data.result,
+                [TypedInputTypes.DeviceId]: data.deviceId,
             },
         );
         this.status.setSuccess('home-assistant.status.triggered');

diff --git a/src/nodes/sentence/editor.ts b/src/nodes/sentence/editor.ts
@@ -48,13 +48,13 @@ const SentenceEditor: EditorNodeDef<SentenceEditorNodeProperties> = {
             value: [
                 {
                     property: 'topic',
-                    propertyType: 'msg',
+                    propertyType: TypedInputTypes.Message,
                     value: '',
                     valueType: TypedInputTypes.TriggerId,
                 },
                 {
                     property: 'payload',
-                    propertyType: 'msg',
+                    propertyType: TypedInputTypes.Message,
                     value: '',
                     valueType: TypedInputTypes.TriggerId,
                 },
@@ -92,7 +92,11 @@ const SentenceEditor: EditorNodeDef<SentenceEditorNodeProperties> = {
             );
 
         haOutputs.createOutputs(this.outputProperties, {
-            extraTypes: ['triggerId', 'results'],
+            extraTypes: [
+                TypedInputTypes.TriggerId,
+                TypedInputTypes.Results,
+                TypedInputTypes.DeviceId,
+            ],
         });
     },
     oneditsave: function () {