Some Fixes (#208)

* Some Fixes * Update cmd-factory.html
zwave-js · May 8, 2022 · 43a6811 · 43a6811
1 parent 9863a85
commit 43a6811
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
   # node-red-contrib-zwave-js Change Log
 
+  - 7.0.2
+
+    **Fixes**
+     - Fix **networkId** format
+     - Address LGTM alert
+
   - 7.0.1
 
     **Changes**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "node-red-contrib-zwave-js",
-	"version": "7.0.1",
+	"version": "7.0.2",
 	"license": "MIT",
 	"description": "An extremely powerful, easy to use, and feature rich Z-Wave node for Node Red, based on Z-Wave JS.",
 	"dependencies": {

diff --git a/zwave-js/cmd-factory.html b/zwave-js/cmd-factory.html
@@ -29,18 +29,10 @@
 
 	function GoToInfo() {
 		event.preventDefault();
-
-		const URL =
-			'https://zwave-js.github.io/node-zwave-js/#/api/CCs/' +
-			$('#node-input-cc').val().replace(/ /g, '') +
-			'?id=' +
-			$('#node-input-method').val().toLowerCase();
-		var link = document.createElement('a');
-		link.href = URL;
-		link.setAttribute('target', '_blank');
-		document.body.appendChild(link);
-		link.click();
-		link.remove();
+		const CC = $('#node-input-cc').val().replace(/ /g, '');
+		const Method = $('#node-input-method').val().toLowerCase();
+		const URL = `https://zwave-js.github.io/node-zwave-js/#/api/CCs/${CC}?id=${Method}`;
+		window.open(URL, '_blank');
 	}
 
 	function SortUI() {

diff --git a/zwave-js/ui/server.js b/zwave-js/ui/server.js
@@ -123,7 +123,7 @@ class UIServer {
 		this._RED = RED;
 		this._SmartStartCallback = this._SmartStartCallback.bind(this);
 
-		this._NetworkIdentifier = parseInt(ID);
+		this._NetworkIdentifier = ID;
 
 		AvailableNIDs = AvailableNIDs.filter(
 			(_ID) => _ID !== this._NetworkIdentifier

diff --git a/zwave-js/zwave-device.js b/zwave-js/zwave-device.js
@@ -6,7 +6,7 @@ module.exports = function (RED) {
 		RED.nodes.createNode(this, config);
 		const RedNode = this;
 
-		const NetworkIdentifier = config.networkIdentifier || 1;
+		const NetworkIdentifier = parseInt(config.networkIdentifier || 1);
 
 		function SetFlowNodeStatus(Status) {
 			Status.text = `[Net: ${NetworkIdentifier}] ${Status.text}`;

diff --git a/zwave-js/zwave-js.js b/zwave-js/zwave-js.js
@@ -61,7 +61,7 @@ module.exports = function (RED) {
 		RED.nodes.createNode(this, config);
 		const RedNode = this;
 
-		const NetworkIdentifier = config.networkIdentifier || 1;
+		const NetworkIdentifier = parseInt(config.networkIdentifier || 1);
 		let UI = new UIServer(RED, NetworkIdentifier);
 		let Driver;
 		let Logger;