From 0c28f0f83ef0b5f01b93fc48d335bc6e38a24b5d Mon Sep 17 00:00:00 2001 From: peterservisbot <42537804+peterservisbot@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:05:31 +0000 Subject: [PATCH 1/5] Added logs (#24) Co-authored-by: Peter Phelan --- red/runtime/nodes/flows/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/red/runtime/nodes/flows/index.js b/red/runtime/nodes/flows/index.js index d1ba541f50..af790d6f5e 100644 --- a/red/runtime/nodes/flows/index.js +++ b/red/runtime/nodes/flows/index.js @@ -166,6 +166,8 @@ function setFlows(_config,type,muteLog,forceStart) { }); return flowRevision; }).catch(function(err) { + log.error('setFlows error'); + log.error(err); }) } else { events.emit("runtime-event",{id:"runtime-deploy",payload:{revision:flowRevision},retain: true}); From 01c747c6f434eb4277a55e1215b4ea700798ce6d Mon Sep 17 00:00:00 2001 From: peterservisbot <42537804+peterservisbot@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:13:33 +0000 Subject: [PATCH 2/5] ChangeLog (#25) Co-authored-by: Peter Phelan --- README.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e20e4e123..c282422901 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ To make a change to the node-red runtime being used by K4 avalanche: # CHANGE-LOG +## 0.18.7-patch-10.1 +2022-11-24 +- Added logging in a catch block with no logging + ## 0.18.7-patch-10 2021-07-14 - Updated logic to swap back org to correct value when possible diff --git a/package.json b/package.json index 7217e45872..21ca3f9f58 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@servisbot/node-red", - "version": "0.18.7-patch-10", + "version": "0.18.7-patch-10.1", "description": "A visual tool for wiring the Internet of Things", "homepage": "http://nodered.org", "license": "Apache-2.0", From 0cfb05c4703c82ee14c59ce4fbe158a9204a3e44 Mon Sep 17 00:00:00 2001 From: peterservisbot <42537804+peterservisbot@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:51:36 +0000 Subject: [PATCH 3/5] Changing how subflow node IDs are generated (#31) Co-authored-by: Peter Phelan --- red/runtime/nodes/flows/Flow.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/red/runtime/nodes/flows/Flow.js b/red/runtime/nodes/flows/Flow.js index 4fcdf6f581..28d1ddb575 100644 --- a/red/runtime/nodes/flows/Flow.js +++ b/red/runtime/nodes/flows/Flow.js @@ -329,10 +329,8 @@ 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; node.z = sfn.id; newNodes.push(node); } From 08edee231b0a07efd662fbbf27c924e24edbba7d Mon Sep 17 00:00:00 2001 From: peterservisbot <42537804+peterservisbot@users.noreply.github.com> Date: Wed, 7 Dec 2022 10:58:54 +0000 Subject: [PATCH 4/5] Updated changelog (#33) * Updated changelog * Updated changelog * Updated changelog Co-authored-by: Peter Phelan --- README.md | 5 ++++- package-lock.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c282422901..45232ecdf1 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,15 @@ To make a change to the node-red runtime being used by K4 avalanche: 6. Run `npm run build` 7. Manually publish to NPM with `npm publish` - Request creds from ops for this +Note: You need xcode installed to be able to install/build/publish this module properly + # CHANGE-LOG ## 0.18.7-patch-10.1 -2022-11-24 +2022-12-7 - Added logging in a catch block with no logging +- Removed subflow ID auto-generation ## 0.18.7-patch-10 2021-07-14 diff --git a/package-lock.json b/package-lock.json index 55a2c917f0..4ac2d2354e 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.1", "lockfileVersion": 1, "requires": true, "dependencies": { From 521bf58c45a6c6c52ed7c8e0a471ab51bb369409 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:00:15 +0000 Subject: [PATCH 5/5] Bump moment-timezone from 0.5.33 to 0.5.39 Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.33 to 0.5.39. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](https://github.com/moment/moment-timezone/compare/0.5.33...0.5.39) --- updated-dependencies: - dependency-name: moment-timezone dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ac2d2354e..a209deaae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5551,9 +5551,9 @@ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "moment-timezone": { - "version": "0.5.33", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz", - "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==", + "version": "0.5.39", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.39.tgz", + "integrity": "sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==", "requires": { "moment": ">= 2.9.0" }