From 4cf4752159d268d263d149b0b1ec57d3aa8c4347 Mon Sep 17 00:00:00 2001
From: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
Date: Thu, 22 Apr 2021 16:57:01 +0800
Subject: [PATCH] Fix Z-wave USB settings list (#1160)

---
 .../all/zwave/settings-page/SettingsTab.jsx       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/front/src/routes/integration/all/zwave/settings-page/SettingsTab.jsx b/front/src/routes/integration/all/zwave/settings-page/SettingsTab.jsx
index 5019cc224e..df5e5926e4 100644
--- a/front/src/routes/integration/all/zwave/settings-page/SettingsTab.jsx
+++ b/front/src/routes/integration/all/zwave/settings-page/SettingsTab.jsx
@@ -54,11 +54,16 @@ const SettingsTab = ({ children, ...props }) => (
                 <Text id="global.emptySelectOption" />
               </option>
               {props.usbPorts &&
-                props.usbPorts.map(usbPort => (
-                  <option value={usbPort.comPath} selected={props.zwaveDriverPath === usbPort.comPath}>
-                    {usbPort.comName}
-                  </option>
-                ))}
+                props.usbPorts.map(
+                  usbPort =>
+                    usbPort.comPath && (
+                      <option value={usbPort.comPath} selected={props.zwaveDriverPath === usbPort.comPath}>
+                        {usbPort.comPath}
+                        {usbPort.comName ? ` - ${usbPort.comName}` : ''}
+                        {usbPort.comVID ? ` - ${usbPort.comVID}` : ''}
+                      </option>
+                    )
+                )}
             </select>
           </div>
           <div class="form-group">