From 3d186a24ff49883271f6814dde71723d8c733804 Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Wed, 8 Feb 2023 22:52:09 +0100
Subject: [PATCH] Fix incorrect handling of 0 ids

Fix tests of slave and instance ids that incorrectly return the wrong
result when the id is 0.
---
 packages/lib/logging.js                  | 4 ++--
 packages/master/src/ControlConnection.js | 2 +-
 packages/web_ui/src/util/websocket.jsx   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/lib/logging.js b/packages/lib/logging.js
index e55fa73e..fe6c6300 100644
--- a/packages/lib/logging.js
+++ b/packages/lib/logging.js
@@ -58,11 +58,11 @@ class WebConsoleFormat {
 
 	transform(info, options) {
 		let src = " ";
-		if (info.slave_id) {
+		if (info.slave_id !== undefined) {
 			let slaveName = info.slave_id;
 			src += `s:${slaveName} - `;
 		}
-		if (info.instance_id) {
+		if (info.instance_id !== undefined) {
 			let instanceName = info.instance_id;
 			src += `i:${instanceName}`;
 		}
diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js
index 9856b33b..2ce4d417 100644
--- a/packages/master/src/ControlConnection.js
+++ b/packages/master/src/ControlConnection.js
@@ -289,7 +289,7 @@ class ControlConnection extends BaseConnection {
 
 	async updateInstanceConfig(instance) {
 		let slaveId = instance.config.get("instance.assigned_slave");
-		if (slaveId) {
+		if (slaveId !== null) {
 			let connection = this._master.wsServer.slaveConnections.get(slaveId);
 			if (connection) {
 				await libLink.messages.assignInstance.send(connection, {
diff --git a/packages/web_ui/src/util/websocket.jsx b/packages/web_ui/src/util/websocket.jsx
index fd9b56a3..b6d72b15 100644
--- a/packages/web_ui/src/util/websocket.jsx
+++ b/packages/web_ui/src/util/websocket.jsx
@@ -34,10 +34,10 @@ function logFilter({ all, master, slave_ids, instance_ids }, info) {
 	if (master && info.slave_id === undefined) {
 		return true;
 	}
-	if (info.slave_id && slave_ids.includes(info.slave_id)) {
+	if (info.slave_id !== undefined && slave_ids.includes(info.slave_id)) {
 		return true;
 	}
-	if (info.instance_id && instance_ids.includes(info.instance_id)) {
+	if (info.instance_id !== undefined && instance_ids.includes(info.instance_id)) {
 		return true;
 	}
 	return false;