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

Make attributes layout horizonthal scroll bar visible (#1308)

Browse Source 
* Make attributes layout horizonthal scroll bar visible some more minor improvements afterwards
* Fix sonar build

Signed-off-by: Stanislav Trailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
Stanislav Trailov
2023-01-12 16:54:50 +02:00
committed by GitHub
parent 7e53c16ea6
commit 9d929e014b
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/KeyValueDetailsComponent.java
View File

@@ -36,7 +36,6 @@ public class KeyValueDetailsComponent extends CustomField<List<ProxyKeyValueDeta
keyValueDetailsLayout.setSpacing(true); keyValueDetailsLayout.setSpacing(true);
keyValueDetailsLayout.setMargin(false); keyValueDetailsLayout.setMargin(false);
keyValueDetailsLayout.setWidthFull(); keyValueDetailsLayout.setWidthFull();
keyValueDetailsLayout.addStyleName("enable-horizontal-scroll");
setReadOnly(true); setReadOnly(true);
} }

23
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAttributesDetailsComponent.java
View File

@@ -37,7 +37,7 @@ public class TargetAttributesDetailsComponent extends CustomField<ProxyTargetAtt
private final VaadinMessageSource i18n; private final VaadinMessageSource i18n;
private final transient TargetManagement targetManagement; private final transient TargetManagement targetManagement;
private final HorizontalLayout targetAttributesDetailsLayout; private final VerticalLayout targetAttributesDetailsLayout;
/** /**
* constructor for TargetAttributesDetailsComponent * constructor for TargetAttributesDetailsComponent
@@ -51,11 +51,10 @@ public class TargetAttributesDetailsComponent extends CustomField<ProxyTargetAtt
this.i18n = i18n; this.i18n = i18n;
this.targetManagement = targetManagement; this.targetManagement = targetManagement;
this.targetAttributesDetailsLayout = new HorizontalLayout(); this.targetAttributesDetailsLayout = new VerticalLayout();
this.targetAttributesDetailsLayout.setSpacing(true); this.targetAttributesDetailsLayout.setSpacing(true);
this.targetAttributesDetailsLayout.setMargin(false); this.targetAttributesDetailsLayout.setMargin(false);
this.targetAttributesDetailsLayout.setSizeFull(); this.targetAttributesDetailsLayout.setSizeFull();
this.targetAttributesDetailsLayout.addStyleName("disable-horizontal-scroll");
setReadOnly(true); setReadOnly(true);
} }
@@ -84,24 +83,24 @@ public class TargetAttributesDetailsComponent extends CustomField<ProxyTargetAtt
final List<ProxyKeyValueDetails> targetAttributes = targetAttributesDetails.getTargetAttributes(); final List<ProxyKeyValueDetails> targetAttributes = targetAttributesDetails.getTargetAttributes();
final String controllerId = targetAttributesDetails.getControllerId(); final String controllerId = targetAttributesDetails.getControllerId();
final VerticalLayout attributesLayout = buildAttributesLayout(isRequestAttributes, targetAttributes); final Button requestAttributesButton = buildRequestAttributesUpdateButton(controllerId, isRequestAttributes);
final HorizontalLayout topRow = new HorizontalLayout(requestAttributesButton);
if (isRequestAttributes) {
topRow.addComponent(buildAttributesUpdateLabel());
}
targetAttributesDetailsLayout.addComponent(topRow);
final VerticalLayout attributesLayout = buildAttributesLayout(targetAttributes);
targetAttributesDetailsLayout.addComponent(attributesLayout); targetAttributesDetailsLayout.addComponent(attributesLayout);
targetAttributesDetailsLayout.setExpandRatio(attributesLayout, 1.0F); targetAttributesDetailsLayout.setExpandRatio(attributesLayout, 1.0F);
final Button requestAttributesButton = buildRequestAttributesUpdateButton(controllerId, isRequestAttributes);
targetAttributesDetailsLayout.addComponent(requestAttributesButton);
} }
private VerticalLayout buildAttributesLayout(final boolean isRequestAttributes, private VerticalLayout buildAttributesLayout(final List<ProxyKeyValueDetails> targetAttributes) {
final List<ProxyKeyValueDetails> targetAttributes) {
final VerticalLayout attributesLayout = new VerticalLayout(); final VerticalLayout attributesLayout = new VerticalLayout();
attributesLayout.setMargin(false); attributesLayout.setMargin(false);
attributesLayout.setSpacing(false); attributesLayout.setSpacing(false);
if (isRequestAttributes) {
attributesLayout.addComponent(buildAttributesUpdateLabel());
}
final KeyValueDetailsComponent attributes = new KeyValueDetailsComponent(); final KeyValueDetailsComponent attributes = new KeyValueDetailsComponent();
attributes.disableSpacing(); attributes.disableSpacing();
attributes.setValue(targetAttributes); attributes.setValue(targetAttributes);