From b6924ed85af799d8ad6ac1a2d7f9ceb40ffa264b Mon Sep 17 00:00:00 2001
From: Momo Bel <mohamed.belaouad@wattsense.com>
Date: Mon, 26 Jan 2026 13:11:06 +0100
Subject: [PATCH] ui: Make clearer which target's detail is currently open
 (#2882)

Signed-off-by: Mohamed Belaouad <mohamed.belaouad@wattsense.com>
---
 .../eclipse/hawkbit/ui/view/TargetView.java    | 18 ++++++++++++------
 .../hawkbit/ui/view/util/TableView.java        |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
index 2a7d556df..b853bd385 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
@@ -342,8 +342,9 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
         }
     }
 
-    protected static class TargetDetailedView extends TabSheet {
+    protected static class TargetDetailedView extends VerticalLayout {
 
+        private final Span targetId;
         private final TargetDetails targetDetails;
         private final TargetAssignedInstalled targetAssignedInstalled;
         private final TargetTags targetTags;
@@ -351,6 +352,8 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
         private final TargetActionsHistoryLayout targetActionsHistoryLayout;
 
         private TargetDetailedView(final HawkbitMgmtClient hawkbitClient) {
+            final TabSheet tabSheet = new TabSheet();
+            targetId = new Span();
             targetDetails = new TargetDetails(hawkbitClient);
             targetAssignedInstalled = new TargetAssignedInstalled(hawkbitClient);
             targetTags = new TargetTags(hawkbitClient);
@@ -358,14 +361,17 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
             targetActionsHistoryLayout = new TargetActionsHistoryLayout(hawkbitClient);
             setWidthFull();
 
-            add("Details", targetDetails);
-            add("Assigned / Installed", targetAssignedInstalled);
-            add("Tags", targetTags);
-            add("Metadata", targetMetadata);
-            add("Action History", targetActionsHistoryLayout);
+            add(targetId);
+            tabSheet.add("Details", targetDetails);
+            tabSheet.add("Assigned / Installed", targetAssignedInstalled);
+            tabSheet.add("Tags", targetTags);
+            tabSheet.add("Metadata", targetMetadata);
+            tabSheet.add("Action History", targetActionsHistoryLayout);
+            add(tabSheet);
         }
 
         private void setItem(final MgmtTarget target) {
+            this.targetId.setText(target.getControllerId());
             this.targetDetails.setItem(target);
             this.targetAssignedInstalled.setItem(target);
             this.targetTags.setItem(target);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
index dbea10340..1d5f452d4 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
@@ -82,7 +82,7 @@ public class TableView<T, ID> extends Div implements Constants, BeforeEnterObser
 
         if (detailsButtonHandler != null) {
             ComponentRenderer<Button, T> renderer = new ComponentRenderer<>(renderDetailsButton(detailsButtonHandler));
-            selectionGrid.addColumn(renderer).setHeader("Details").setAutoWidth(true).setFlexGrow(0);
+            selectionGrid.addColumn(renderer).setHeader("Details").setAutoWidth(true).setFlexGrow(0).setFrozenToEnd(true);
         }
 
         filter = new Filter(