fix: Fix duplication of nodes when converting expose as

fix: Default isEnable to true refactor: Add JSONataService to Output Controller
zachowj · Sep 24, 2023 · 39c8b03 · 39c8b03
1 parent 827b926
commit 39c8b03
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 27 deletions.
diff --git a/src/common/controllers/EposeAsController.ts b/src/common/controllers/EposeAsController.ts
@@ -46,7 +46,7 @@ export default abstract class ExposeAsController<
     }
 
     get isEnabled(): boolean {
-        return this.exposeAsConfigNode?.state?.isEnabled() ?? false;
+        return this.exposeAsConfigNode?.state?.isEnabled() ?? true;
     }
 
     protected async validateTriggerMessage(

diff --git a/src/common/controllers/OutputController.ts b/src/common/controllers/OutputController.ts
@@ -10,6 +10,7 @@ import {
     OutputProperty,
 } from '../../types/nodes';
 import { NodeEvent } from '../events/Events';
+import JSONataService from '../services/JSONataService';
 import NodeRedContextService from '../services/NodeRedContextService';
 import TypedInputService from '../services/TypedInputService';
 import Status from '../status/Status';
@@ -19,22 +20,26 @@ export interface OutputControllerConstructor<T extends BaseNode> {
     node: T;
     status: Status;
     typedInputService: TypedInputService;
+    jsonataService: JSONataService;
 }
 
 // export default abstract class OutputController<T extends BaseNode> {
 export default abstract class OutputController<T extends BaseNode = BaseNode> {
     protected readonly contextService: NodeRedContextService;
+    protected readonly jsonataService: JSONataService;
     protected readonly node: T;
     protected readonly status: Status;
     protected readonly typedInputService: TypedInputService;
 
     constructor({
         nodeRedContextService,
         node,
+        jsonataService,
         status,
         typedInputService,
     }: OutputControllerConstructor<T>) {
         this.contextService = nodeRedContextService;
+        this.jsonataService = jsonataService;
         this.node = node;
         this.status = status;
         this.typedInputService = typedInputService;

diff --git a/src/editor/convert-entity.ts b/src/editor/convert-entity.ts
@@ -1,8 +1,8 @@
 // TODO: Remove for version 1.0
-import { EditorRED } from 'node-red';
+import { EditorNodeInstance, EditorRED } from 'node-red';
 
 import { EntityType, NodeType } from '../const';
-import { HassExposedConfig } from './types';
+import { HassExposedConfig, HassNodeProperties } from './types';
 
 declare const RED: EditorRED;
 
@@ -184,7 +184,7 @@ export const convertEntityNode = (node: EntityProperties) => {
     RED.view.redraw(true);
 };
 
-export const convertEventNode = (node: any) => {
+export const convertEventNode = (node: any, haConfig: HassExposedConfig[]) => {
     // Save the wires so we can add them to the new node
     const wires = {
         // @ts-expect-error - function is not defined in types
@@ -193,29 +193,40 @@ export const convertEventNode = (node: any) => {
         target: RED.nodes.getNodeLinks(node.id, 1),
     };
 
-    const newId = generateId();
     // If the node is in a group remove it so NR doesn't think the new config node is in the group
     if (node.g) {
         const oldEntityNode = RED.nodes.node(node.id);
         if (oldEntityNode) {
             RED.group.removeFromGroup(RED.nodes.group(node.g), oldEntityNode);
         }
     }
-    RED.nodes.remove(node.id);
-    RED.nodes.import({
-        type: NodeType.EntityConfig,
-        id: node.id,
-        server: node.server,
-        deviceConfig: '',
-        name: `exposed as for ${node.name || node.id}`,
-        version: RED.settings.get('haEntityConfigVersion', 0),
-        entityType: EntityType.Switch,
-        haConfig: node.haConfig ?? [],
-        resend: false,
-    });
+    RED.nodes.import(
+        [
+            {
+                type: NodeType.EntityConfig,
+                id: node.id,
+                server: node.server,
+                deviceConfig: '',
+                name: `exposed as for ${node.name || node.id}`,
+                version: RED.settings.get('haEntityConfigVersion', 0),
+                entityType: EntityType.Switch,
+                haConfig: haConfig ?? [],
+                resend: false,
+            },
+        ],
+        // @ts-expect-error - options are not defined in types
+        {
+            importMap: {
+                [node.id]: 'replace',
+            },
+        }
+    );
+    const newId = generateId();
     RED.nodes.import({ ...node, id: newId, exposeAsEntityConfig: node.id });
     addLinks(newId, wires);
-    const entityNode = RED.nodes.node(newId);
+    const entityNode = RED.nodes.node(
+        newId
+    ) as EditorNodeInstance<HassNodeProperties>;
     if (entityNode) {
         RED.nodes.moveNodeToTab(entityNode, node.z);
         if (node.g) {
@@ -225,6 +236,4 @@ export const convertEventNode = (node: any) => {
         entityNode.changed = true;
     }
     RED.view.redraw(true);
-
-    return newId;
 };
diff --git a/src/editor/version.ts b/src/editor/version.ts
@@ -51,23 +51,22 @@ export function versionCheckOnEditPrepare(
 const exposedEventNodes: NodeType[] = [NodeType.Tag];
 
 function migrateNode(node: EditorNodeInstance<HassNodeProperties>) {
-    let data = RED.nodes.convertNode(node, false);
+    const data = RED.nodes.convertNode(node, false) as HassNodeProperties;
 
     // TODO: Remove for version 1.0
-    if (
+    const haConfig =
         exposedEventNodes.includes(node.type as unknown as NodeType) &&
         node.exposeToHomeAssistant === true
-    ) {
-        const newId = convertEventNode(data as unknown as EntityProperties);
-        node = RED.nodes.node(newId) as EditorNodeInstance<HassNodeProperties>;
-        data = RED.nodes.convertNode(node, false);
-    }
+            ? data.haConfig
+            : undefined;
 
     const migratedData: HassNodeProperties = migrate(data);
 
     // TODO: Remove for version 1.0
     if (migratedData.type === NodeType.Entity) {
         convertEntityNode(migratedData as unknown as EntityProperties);
+    } else if (haConfig) {
+        convertEventNode(migratedData as unknown as EntityProperties, haConfig);
     }
 
     let key: keyof HassNodeProperties;