From fc963ef85eb346e36e877ce90e790779a47d2a68 Mon Sep 17 00:00:00 2001
From: Oliver Kieselbach <oliver.kieselbach@outlook.com>
Date: Fri, 27 Feb 2026 17:48:04 +0100
Subject: [PATCH] fix: show domainName (tenantId) in Device Block Management
 dropdowns

Consistent with Session Event Export tenant dropdown format.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../autopilot-monitor-web/app/admin-configuration/page.tsx    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx b/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
index 711bdabc..0a67fa6b 100644
--- a/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
+++ b/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
@@ -1409,7 +1409,7 @@ export default function AdminConfigurationPage() {
                       >
                         <option value="">— select tenant —</option>
                         {tenants.map((t) => (
-                          <option key={t.tenantId} value={t.tenantId}>{t.domainName || t.tenantId}</option>
+                          <option key={t.tenantId} value={t.tenantId}>{t.domainName ? `${t.domainName} (${t.tenantId})` : t.tenantId}</option>
                         ))}
                       </select>
                     </div>
@@ -1461,7 +1461,7 @@ export default function AdminConfigurationPage() {
                       >
                         <option value="">— select tenant —</option>
                         {tenants.map((t) => (
-                          <option key={t.tenantId} value={t.tenantId}>{t.domainName || t.tenantId}</option>
+                          <option key={t.tenantId} value={t.tenantId}>{t.domainName ? `${t.domainName} (${t.tenantId})` : t.tenantId}</option>
                         ))}
                       </select>
                     </div>