lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ui: Make clearer which target's detail is currently open (#2882)

Browse Source 
Signed-off-by: Mohamed Belaouad <mohamed.belaouad@wattsense.com>
This commit is contained in:
Momo Bel
2026-01-26 13:11:06 +01:00
committed by GitHub
parent c074b659bc
commit b6924ed85a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
View File

@@ -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 TargetDetails targetDetails;
private final TargetAssignedInstalled targetAssignedInstalled; private final TargetAssignedInstalled targetAssignedInstalled;
private final TargetTags targetTags; private final TargetTags targetTags;
@@ -351,6 +352,8 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
private final TargetActionsHistoryLayout targetActionsHistoryLayout; private final TargetActionsHistoryLayout targetActionsHistoryLayout;
private TargetDetailedView(final HawkbitMgmtClient hawkbitClient) { private TargetDetailedView(final HawkbitMgmtClient hawkbitClient) {
final TabSheet tabSheet = new TabSheet();
targetId = new Span();
targetDetails = new TargetDetails(hawkbitClient); targetDetails = new TargetDetails(hawkbitClient);
targetAssignedInstalled = new TargetAssignedInstalled(hawkbitClient); targetAssignedInstalled = new TargetAssignedInstalled(hawkbitClient);
targetTags = new TargetTags(hawkbitClient); targetTags = new TargetTags(hawkbitClient);
@@ -358,14 +361,17 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
targetActionsHistoryLayout = new TargetActionsHistoryLayout(hawkbitClient); targetActionsHistoryLayout = new TargetActionsHistoryLayout(hawkbitClient);
setWidthFull(); setWidthFull();
add("Details", targetDetails); add(targetId);
add("Assigned / Installed", targetAssignedInstalled); tabSheet.add("Details", targetDetails);
add("Tags", targetTags); tabSheet.add("Assigned / Installed", targetAssignedInstalled);
add("Metadata", targetMetadata); tabSheet.add("Tags", targetTags);
add("Action History", targetActionsHistoryLayout); tabSheet.add("Metadata", targetMetadata);
tabSheet.add("Action History", targetActionsHistoryLayout);
add(tabSheet);
} }
private void setItem(final MgmtTarget target) { private void setItem(final MgmtTarget target) {
this.targetId.setText(target.getControllerId());
this.targetDetails.setItem(target); this.targetDetails.setItem(target);
this.targetAssignedInstalled.setItem(target); this.targetAssignedInstalled.setItem(target);
this.targetTags.setItem(target); this.targetTags.setItem(target);

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java
View File

@@ -82,7 +82,7 @@ public class TableView<T, ID> extends Div implements Constants, BeforeEnterObser
if (detailsButtonHandler != null) { if (detailsButtonHandler != null) {
ComponentRenderer<Button, T> renderer = new ComponentRenderer<>(renderDetailsButton(detailsButtonHandler)); 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( filter = new Filter(