From c1f2e6d82b6e7aae49b8ee46e212ef70a15e9bec Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 28 Feb 2025 08:03:15 +0000
Subject: [PATCH] Small fixes for Bluetooth device info (#24436)

* Add missing service uuids to Bluetooth device info

Service UUIDs are different from Service data because
they do not have any data attached to them. I only
discovered that they were missing in the UI because
of helping a user troubleshoot of device, and we could
not find the Service UUID

* fix mapping

* fix mapping

* fix mapping

* tweaks
---
 .../bluetooth/dialog-bluetooth-device-info.ts | 23 ++++++++++++++-----
 src/translations/en.json                      |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts
index 635da34b03..25c09a9284 100644
--- a/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts
+++ b/src/panels/config/integrations/integration-panels/bluetooth/dialog-bluetooth-device-info.ts
@@ -81,10 +81,8 @@ class DialogBluetoothDeviceInfo extends LitElement implements HassDialog {
             ${Object.entries(this._params.entry.manufacturer_data).map(
               ([key, value]) => html`
                 <tr>
-                  ${key}
-                </tr>
-                <tr>
-                  ${this.showDataAsHex(value)}
+                  <td><b>${key}</b></td>
+                  <td>${this.showDataAsHex(value)}</td>
                 </tr>
               `
             )}
@@ -97,10 +95,23 @@ class DialogBluetoothDeviceInfo extends LitElement implements HassDialog {
             ${Object.entries(this._params.entry.service_data).map(
               ([key, value]) => html`
                 <tr>
-                  ${key}
+                  <td><b>${key}</b></td>
+                  <td>${this.showDataAsHex(value)}</td>
                 </tr>
+              `
+            )}
+          </tbody>
+        </table>
+
+        <h4>
+          ${this.hass.localize("ui.panel.config.bluetooth.service_uuids")}
+        </h4>
+        <table width="100%">
+          <tbody>
+            ${this._params.entry.service_uuids.map(
+              (uuid) => html`
                 <tr>
-                  ${this.showDataAsHex(value)}
+                  <td>${uuid}</td>
                 </tr>
               `
             )}
diff --git a/src/translations/en.json b/src/translations/en.json
index e675761a8a..3d62799c47 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -5377,6 +5377,7 @@
           "advertisement_data": "Advertisement data",
           "manufacturer_data": "Manufacturer data",
           "service_data": "Service data",
+          "service_uuids": "Service UUIDs",
           "copy_to_clipboard": "[%key:ui::panel::config::automation::editor::copy_to_clipboard%]"
         },
         "thread": {