Merge remote-tracking branch 'origin/master'

This commit is contained in:
Axel Uhl
2023-04-20 16:07:50 +02:00
2 changed files with 4 additions and 2 deletions
@@ -128,6 +128,7 @@ public class LandscapeManagementPanel extends SimplePanel {
//Spacing for Setupbar (AWS/SSH/REGION)
private static final int DEFAULT_SETUPBAR_HEIGHT = 300;
private static final int DEFAULT_AMOUNT_SSHKEYS_PER_PAGE = 3;
public LandscapeManagementPanel(StringMessages stringMessages, UserService userService,
AdminConsoleTableResources tableResources, ErrorReporter errorReporter) {
@@ -155,7 +156,7 @@ public class LandscapeManagementPanel extends SimplePanel {
}
};
sshKeyManagementPanel = new SshKeyManagementPanel(stringMessages, userService,
landscapeManagementService, tableResources, errorReporter, /* access key provider */ mfaLoginWidget, regionsTable.getSelectionModel());
landscapeManagementService, tableResources, errorReporter, /* access key provider */ mfaLoginWidget, regionsTable.getSelectionModel(), DEFAULT_AMOUNT_SSHKEYS_PER_PAGE);
final CaptionPanel sshKeysCaptionPanel = new CaptionPanel(stringMessages.sshKeys());
sshKeysCaptionPanel.setHeight("" + DEFAULT_SETUPBAR_HEIGHT + "px");
regionsTable.addColumn(new TextColumn<String>() {
@@ -55,7 +55,7 @@ public class SshKeyManagementPanel extends VerticalPanel {
public SshKeyManagementPanel(StringMessages stringMessages, UserService userService,
LandscapeManagementWriteServiceAsync landscapeManagementService, AdminConsoleTableResources tableResources,
ErrorReporter errorReporter, AwsAccessKeyProvider awsAccessKeyProvider,
RefreshableSingleSelectionModel<String> regionSelectionModel) {
RefreshableSingleSelectionModel<String> regionSelectionModel, int countKeysPerPage) {
this.regionSelectionModel = regionSelectionModel;
this.landscapeManagementService = landscapeManagementService;
this.errorReporter = errorReporter;
@@ -92,6 +92,7 @@ public class SshKeyManagementPanel extends VerticalPanel {
return Arrays.asList(t.getName(), t.getRegionId(), t.getCreatorName());
}
};
sshKeyTable.getTable().setPageSize(countKeysPerPage);
sshKeyTable.addColumn(object->object.getRegionId(), stringMessages.region());
sshKeyTable.addColumn(object->object.getName(), stringMessages.name());
sshKeyTable.addColumn(object->object.getCreatorName(), stringMessages.creator());