From 7de64b840f7525c487644e24f786b5df882461ee Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:11:31 +0100 Subject: [PATCH 01/33] 3.8.0 --- package.json | 6 +++--- zwave-js/zwave-js.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d1c92e88..38d4e86f 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "node-red-contrib-zwave-js", - "version": "3.7.1", + "version": "3.8.0", "license": "MIT", "description": "An extremely easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.", "dependencies": { - "serialport": "9.1.0", - "zwave-js": "7.7.1", + "serialport": "9.0.7", + "zwave-js": "7.7.3", "winston": "3.3.3" }, "keywords": [ diff --git a/zwave-js/zwave-js.html b/zwave-js/zwave-js.html index 58d60c7b..57398494 100644 --- a/zwave-js/zwave-js.html +++ b/zwave-js/zwave-js.html @@ -145,12 +145,12 @@
From c1b34ce66b263544e2d98cf748cb5db38c4b5863 Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Fri, 11 Jun 2021 13:57:46 +0100 Subject: [PATCH 02/33] 3.8.0 --- zwave-js/ui/client.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js index 84863672..c42ada1a 100644 --- a/zwave-js/ui/client.js +++ b/zwave-js/ui/client.js @@ -448,7 +448,7 @@ let ZwaveJsUI = (function () { .then(({ object }) => { let controllerNode = object.filter(N => N.isControllerNode) if (controllerNode.length > 0) { - makeInfo('#zwave-js-controller-info', controllerNode[0].deviceConfig) + makeInfo('#zwave-js-controller-info', controllerNode[0].deviceConfig,controllerNode[0].firmwareVersion) } $('#zwave-js-node-list') @@ -483,12 +483,12 @@ let ZwaveJsUI = (function () { return i } - function makeInfo(elId, deviceConfig = {}) { + function makeInfo(elId, deviceConfig = {},firmwareVersion) { let el = $(elId) el.empty().append( $('').text(`${deviceConfig.manufacturer} ${deviceConfig.label}`), - $('').text(`(${deviceConfig.description})`) + $('').text(`Firmware Version: ${firmwareVersion})`) ) if (Object.keys(deviceConfig.metadata || {}).length) { @@ -569,7 +569,7 @@ let ZwaveJsUI = (function () { $('#zwave-js-selected-node-location').text("") } - makeInfo('#zwave-js-selected-node-info', info.deviceConfig) + makeInfo('#zwave-js-selected-node-info', info.deviceConfig,info.firmwareVersion) getProperties() RED.comms.subscribe(`/zwave-js/${selectedController}/${selectedNode}`, handleNodeEvent) } From 84b11cd7795dd046c076aa963624dabbfe8bc4db Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Fri, 11 Jun 2021 18:34:04 +0100 Subject: [PATCH 03/33] 3.8.0 --- package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 38d4e86f..2d89762e 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,12 @@ "zwave-js": "7.7.3", "winston": "3.3.3" }, + "resolutions": { + "serialport": "9.0.7" + }, + "scripts": { + "preinstall": "npx npm-force-resolutions" + }, "keywords": [ "node-red", "zwave", @@ -42,4 +48,4 @@ "url": "https://github.com/marcus-j-davies/node-red-contrib-zwave-js/issues" }, "homepage": "https://github.com/marcus-j-davies/node-red-contrib-zwave-js#readme" -} +} \ No newline at end of file From 60d7906171f9a656396abee0cad387770571107a Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Mon, 14 Jun 2021 11:09:31 +0100 Subject: [PATCH 04/33] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2d89762e..d8c4b459 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "winston": "3.3.3" }, "resolutions": { - "serialport": "9.0.7" + "serialport": "9.0.7", + "@serialport/bindings": "9.0.7" }, "scripts": { "preinstall": "npx npm-force-resolutions" From d0d7b0890e395f6f1386090ca8e2df237f3cb1f8 Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Mon, 14 Jun 2021 12:53:54 +0100 Subject: [PATCH 05/33] Update package.json --- package.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index d8c4b459..9ada872a 100644 --- a/package.json +++ b/package.json @@ -4,17 +4,10 @@ "license": "MIT", "description": "An extremely easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.", "dependencies": { - "serialport": "9.0.7", - "zwave-js": "7.7.3", + "serialport": "9.1.0", + "zwave-js": "7.7.4", "winston": "3.3.3" }, - "resolutions": { - "serialport": "9.0.7", - "@serialport/bindings": "9.0.7" - }, - "scripts": { - "preinstall": "npx npm-force-resolutions" - }, "keywords": [ "node-red", "zwave", From 7e3a2eac04773592e9f383644b2db5e527b8884a Mon Sep 17 00:00:00 2001 From: Marcus Davies <55892693+marcus-j-davies@users.noreply.github.com> Date: Thu, 17 Jun 2021 19:33:02 +0100 Subject: [PATCH 06/33] 3.8.0 --- package.json | 2 +- zwave-js/ui/client.js | 185 ++++++++++++++++++++++-------------------- zwave-js/ui/server.js | 28 +++++-- zwave-js/zwave-js.js | 23 +++++- 4 files changed, 138 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 9ada872a..c1b546d9 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "An extremely easy to use, zero dependency and feature rich Z-Wave node for Node Red, based on Z-Wave JS.", "dependencies": { "serialport": "9.1.0", - "zwave-js": "7.7.4", + "zwave-js": "7.7.5", "winston": "3.3.3" }, "keywords": [ diff --git a/zwave-js/ui/client.js b/zwave-js/ui/client.js index c42ada1a..3548eb57 100644 --- a/zwave-js/ui/client.js +++ b/zwave-js/ui/client.js @@ -1,15 +1,4 @@ let ZwaveJsUI = (function () { - const AUTO_HIDE_CC = [ - 'Association', - 'Association Group Information', - 'Firmware Update Meta Data', - 'Manufacturer Specific', - 'Multi Channel', - 'Multi Channel Association', - 'Node Naming and Location', - 'Version', - 'Z-Wave Plus Info' - ] function confirm(text, onYes, onCancel) { $('
') @@ -83,7 +72,7 @@ let ZwaveJsUI = (function () { .appendTo(controllerHeader) $('') - .html('Auto expand node properties') + .html('Expand properties') .appendTo(controllerHeader) $('