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

Fix Rollout UI performance. (#485)

Browse Source 
* Fix Rollout UI performance.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove unused column definition.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Hidden columns static.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Optimized column width for readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* catch IllegalArgumentException in case directory does not exists (#487)

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* Remove unused column definition.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Hidden columns static.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Optimized column width for readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2017-04-18 12:06:53 +02:00
committed by GitHub
parent 89ec5dba57
commit 1373701ef8
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
View File

@@ -82,8 +82,6 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
private static final String DELETE_OPTION = "Delete"; private static final String DELETE_OPTION = "Delete";
private static final String IS_REQUIRED_MIGRATION_STEP = "isRequiredMigrationStep";
private static final String ROLLOUT_RENDERER_DATA = "rolloutRendererData"; private static final String ROLLOUT_RENDERER_DATA = "rolloutRendererData";
private final transient RolloutManagement rolloutManagement; private final transient RolloutManagement rolloutManagement;
@@ -115,6 +113,11 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
statusIconMap.put(RolloutStatus.DELETING, new StatusFontIcon(null, SPUIStyleDefinitions.STATUS_SPINNER_RED)); statusIconMap.put(RolloutStatus.DELETING, new StatusFontIcon(null, SPUIStyleDefinitions.STATUS_SPINNER_RED));
} }
private static final List<Object> HIDDEN_COLUMNS = Arrays.asList(SPUILabelDefinitions.VAR_NAME,
SPUILabelDefinitions.VAR_CREATED_DATE, SPUILabelDefinitions.VAR_CREATED_USER,
SPUILabelDefinitions.VAR_MODIFIED_DATE, SPUILabelDefinitions.VAR_MODIFIED_BY,
SPUILabelDefinitions.VAR_DESC);
RolloutListGrid(final VaadinMessageSource i18n, final UIEventBus eventBus, RolloutListGrid(final VaadinMessageSource i18n, final UIEventBus eventBus,
final RolloutManagement rolloutManagement, final UINotification uiNotification, final RolloutManagement rolloutManagement, final UINotification uiNotification,
final RolloutUIState rolloutUIState, final SpPermissionChecker permissionChecker, final RolloutUIState rolloutUIState, final SpPermissionChecker permissionChecker,
@@ -219,7 +222,6 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_NAME, String.class, "", false, false); rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_NAME, String.class, "", false, false);
rolloutGridContainer.addContainerProperty(ROLLOUT_RENDERER_DATA, RolloutRendererData.class, null, false, false); rolloutGridContainer.addContainerProperty(ROLLOUT_RENDERER_DATA, RolloutRendererData.class, null, false, false);
rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_DESC, String.class, null, false, false); rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_DESC, String.class, null, false, false);
rolloutGridContainer.addContainerProperty(IS_REQUIRED_MIGRATION_STEP, boolean.class, null, false, false);
rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_STATUS, RolloutStatus.class, null, false, rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_STATUS, RolloutStatus.class, null, false,
false); false);
rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_DIST_NAME_VERSION, String.class, null, false, rolloutGridContainer.addContainerProperty(SPUILabelDefinitions.VAR_DIST_NAME_VERSION, String.class, null, false,
@@ -260,19 +262,19 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
protected void setColumnExpandRatio() { protected void setColumnExpandRatio() {
getColumn(ROLLOUT_RENDERER_DATA).setMinimumWidth(40); getColumn(ROLLOUT_RENDERER_DATA).setMinimumWidth(40);
getColumn(ROLLOUT_RENDERER_DATA).setMaximumWidth(150); getColumn(ROLLOUT_RENDERER_DATA).setMaximumWidth(300);
getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION).setMinimumWidth(40); getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION).setMinimumWidth(40);
getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION).setMaximumWidth(150); getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION).setMaximumWidth(300);
getColumn(SPUILabelDefinitions.VAR_STATUS).setMinimumWidth(75); getColumn(SPUILabelDefinitions.VAR_STATUS).setMinimumWidth(40);
getColumn(SPUILabelDefinitions.VAR_STATUS).setMaximumWidth(75); getColumn(SPUILabelDefinitions.VAR_STATUS).setMaximumWidth(60);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setMinimumWidth(40); getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setMinimumWidth(40);
getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setMaximumWidth(100); getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS).setMaximumWidth(60);
getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setMinimumWidth(40); getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setMinimumWidth(40);
getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setMaximumWidth(100); getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setMaximumWidth(60);
getColumn(RUN_OPTION).setMinimumWidth(25); getColumn(RUN_OPTION).setMinimumWidth(25);
getColumn(RUN_OPTION).setMaximumWidth(25); getColumn(RUN_OPTION).setMaximumWidth(25);
@@ -299,7 +301,6 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
@Override @Override
protected void setColumnHeaderNames() { protected void setColumnHeaderNames() {
getColumn(ROLLOUT_RENDERER_DATA).setHeaderCaption(i18n.getMessage("header.name")); getColumn(ROLLOUT_RENDERER_DATA).setHeaderCaption(i18n.getMessage("header.name"));
getColumn(IS_REQUIRED_MIGRATION_STEP).setHeaderCaption(i18n.getMessage("header.migrations.step"));
getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION) getColumn(SPUILabelDefinitions.VAR_DIST_NAME_VERSION)
.setHeaderCaption(i18n.getMessage("header.distributionset")); .setHeaderCaption(i18n.getMessage("header.distributionset"));
getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setHeaderCaption(i18n.getMessage("header.numberofgroups")); getColumn(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS).setHeaderCaption(i18n.getMessage("header.numberofgroups"));
@@ -352,7 +353,6 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
final List<Object> columnList = new ArrayList<>(); final List<Object> columnList = new ArrayList<>();
columnList.add(ROLLOUT_RENDERER_DATA); columnList.add(ROLLOUT_RENDERER_DATA);
columnList.add(SPUILabelDefinitions.VAR_DIST_NAME_VERSION); columnList.add(SPUILabelDefinitions.VAR_DIST_NAME_VERSION);
columnList.add(IS_REQUIRED_MIGRATION_STEP);
columnList.add(SPUILabelDefinitions.VAR_STATUS); columnList.add(SPUILabelDefinitions.VAR_STATUS);
columnList.add(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS); columnList.add(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS);
columnList.add(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS); columnList.add(SPUILabelDefinitions.VAR_NUMBER_OF_GROUPS);
@@ -380,15 +380,7 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
@Override @Override
protected void setHiddenColumns() { protected void setHiddenColumns() {
final List<Object> columnsToBeHidden = new ArrayList<>(); for (final Object propertyId : HIDDEN_COLUMNS) {
columnsToBeHidden.add(SPUILabelDefinitions.VAR_NAME);
columnsToBeHidden.add(SPUILabelDefinitions.VAR_CREATED_DATE);
columnsToBeHidden.add(SPUILabelDefinitions.VAR_CREATED_USER);
columnsToBeHidden.add(SPUILabelDefinitions.VAR_MODIFIED_DATE);
columnsToBeHidden.add(SPUILabelDefinitions.VAR_MODIFIED_BY);
columnsToBeHidden.add(SPUILabelDefinitions.VAR_DESC);
columnsToBeHidden.add(IS_REQUIRED_MIGRATION_STEP);
for (final Object propertyId : columnsToBeHidden) {
getColumn(propertyId).setHidden(true); getColumn(propertyId).setHidden(true);
} }
} }

4
hawkbit-ui/src/main/resources/messages.properties
View File

@@ -483,7 +483,7 @@ header.assigned.ds = Assigned DS
header.installed.ds = Installed DS header.installed.ds = Installed DS
header.target.status = Status header.target.status = Status
header.target.tags = Tags header.target.tags = Tags
header.total.targets = Total targets header.total.targets = Targets
header.key = Key header.key = Key
header.value = Value header.value = Value
header.auto.assignment.ds = Auto assignment header.auto.assignment.ds = Auto assignment
@@ -505,7 +505,7 @@ label.no = No
#rollout - start #rollout - start
header.distributionset = Distribution set header.distributionset = Distribution set
header.numberofgroups = No. of groups header.numberofgroups = Groups
header.detail.status = Detail status header.detail.status = Detail status
header.rolloutgroup.installed.percentage = % Finished header.rolloutgroup.installed.percentage = % Finished