From 40ebf0c3ecda7ac3e6f687b8a34b0a7936d2e5c4 Mon Sep 17 00:00:00 2001
From: Steve Walsh <Steve-Walsh@users.noreply.github.com>
Date: Tue, 3 Jan 2023 11:42:16 +0000
Subject: [PATCH] Removed subflow ID auto-generation, now prefixes the nodeId
 with the subflow id

---
 README.md                       | 3 +++
 package-lock.json               | 2 +-
 red/runtime/nodes/flows/Flow.js | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1e20e4e12..9d9f96694 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,9 @@ To make a change to the node-red runtime being used by K4 avalanche:
 
 # CHANGE-LOG
 
+## 0.18.7-patch-10.3
+2023-01-03
+- Removed subflow ID auto-generation, now prefixes the nodeId with the subflow id
 ## 0.18.7-patch-10
 2021-07-14
 - Updated logic to swap back org to correct value when possible
diff --git a/package-lock.json b/package-lock.json
index 55a2c917f..8b2a2e129 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@servisbot/node-red",
-  "version": "0.18.7-patch-9.1",
+  "version": "0.18.7-patch-10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/red/runtime/nodes/flows/Flow.js b/red/runtime/nodes/flows/Flow.js
index 4fcdf6f58..6ad233cca 100644
--- a/red/runtime/nodes/flows/Flow.js
+++ b/red/runtime/nodes/flows/Flow.js
@@ -329,10 +329,11 @@ function createSubflow(sf,sfn,subflows,globalSubflows,activeNodes) {
 
     var createNodeInSubflow = function(def) {
         node = clone(def);
-        var nid = redUtil.generateId();
         node_map[node.id] = node;
         node._alias = node.id;
-        node.id = nid;
+        // Stop generating new node ids for nodes inside subflows
+        // instead we prefix it with the subflow node id, which is unique
+        node.id = sfn.id + '-' + node.id;
         node.z = sfn.id;
         newNodes.push(node);
     }