diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java index 377330433e8..3eccf050046 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java @@ -326,7 +326,7 @@ public class CompetitorTableWrapper competitorActionColumn = create( + final AccessControlledActionsColumn competitorActionColumn = create( new CompetitorConfigImagesBarCell(getStringMessages()), userService); competitorActionColumn.addAction(CompetitorConfigImagesBarCell.ACTION_UPDATE, HasPermissions.DefaultActions.UPDATE, this::editCompetitor); competitorActionColumn.addAction(CompetitorConfigImagesBarCell.ACTION_REFRESH, this::allowUpdate); diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyManagementPanel.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyManagementPanel.java index e6484633a95..98b25a83ff2 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyManagementPanel.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyManagementPanel.java @@ -1,5 +1,8 @@ package com.sap.sailing.landscape.ui.client; +import static com.sap.sse.security.shared.HasPermissions.DefaultActions.CHANGE_OWNERSHIP; +import static com.sap.sse.security.ui.client.component.AccessControlledActionsColumn.create; + import java.util.ArrayList; import java.util.Arrays; import java.util.Optional; @@ -20,16 +23,18 @@ import com.sap.sse.gwt.client.controls.busyindicator.BusyIndicator; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; import com.sap.sse.landscape.common.SecuredLandscapeTypes; +import com.sap.sse.security.shared.HasPermissions.DefaultActions; import com.sap.sse.security.ui.client.UserService; +import com.sap.sse.security.ui.client.component.AccessControlledActionsColumn; import com.sap.sse.security.ui.client.component.AccessControlledButtonPanel; +import com.sap.sse.security.ui.client.component.EditOwnershipDialog; +import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn; +import com.sap.sse.security.ui.client.component.EditOwnershipDialog.DialogConfig; +import com.sap.sse.security.ui.client.component.editacl.EditACLDialog; /** * A panel with a table that allows the user to manage a set of SSH key pairs for the landscape. * - * TODO add ownership columns - * TODO add action column with remove, change ownership and edit ACL actions - * TODO add filter based on can UPDATE check - * * @author Axel Uhl (D043530) * */ @@ -71,7 +76,8 @@ public class SshKeyManagementPanel extends VerticalPanel { return (t.getRegionId() == null ? 0 : t.getRegionId().hashCode()) ^ (t.getName() == null ? 0 : t.getName().hashCode()); } - }), tableResources, Optional.empty(), /* filter label */ Optional.empty(), /* filter checkbox label */ null) { + }), tableResources, Optional.of(sshKey -> userService.hasPermission(sshKey, DefaultActions.UPDATE)), + /* filter label */ Optional.empty(), /* filter checkbox label */ stringMessages.hideElementsWithoutUpdateRights()) { @Override protected Iterable getSearchableStrings(SSHKeyPairDTO t) { return Arrays.asList(t.getName(), t.getRegionId(), t.getCreatorName()); @@ -81,6 +87,32 @@ public class SshKeyManagementPanel extends VerticalPanel { sshKeyTable.addColumn(object->object.getName(), stringMessages.name()); sshKeyTable.addColumn(object->object.getCreatorName(), stringMessages.creator()); sshKeyTable.addColumn(object->object.getCreationTime().toString(), stringMessages.creationTime()); + SecuredDTOOwnerColumn.configureOwnerColumns(sshKeyTable.getTable(), sshKeyTable.getColumnSortHandler(), stringMessages); + final AccessControlledActionsColumn sshKeyPairActionColumn = create( + new SshKeyPairImagesBarCell(stringMessages), userService); + final DialogConfig editOwnerShipDialog = EditOwnershipDialog.create(userService.getUserManagementWriteService(), SecuredLandscapeTypes.SSH_KEY, + competitorDTO -> sshKeyTable.refresh(), stringMessages); + sshKeyPairActionColumn.addAction(SshKeyPairImagesBarCell.ACTION_CHANGE_OWNERSHIP, CHANGE_OWNERSHIP, + editOwnerShipDialog::openOwnershipDialog); + final EditACLDialog.DialogConfig configACL = EditACLDialog + .create(userService.getUserManagementWriteService(), SecuredLandscapeTypes.SSH_KEY, null, stringMessages); + sshKeyPairActionColumn.addAction(SshKeyPairImagesBarCell.ACTION_CHANGE_ACL, DefaultActions.CHANGE_ACL, + configACL::openDialog); + sshKeyPairActionColumn.addAction(SshKeyPairImagesBarCell.ACTION_REMOVE, DefaultActions.DELETE, + sshKeyPairDTO->landscapeManagementService.removeSshKey(awsAccessKeyProvider.getAwsAccessKeyId(), awsAccessKeyProvider.getAwsSecret(), + sshKeyPairDTO, new AsyncCallback() { + @Override + public void onFailure(Throwable caught) { + errorReporter.reportError(caught.getMessage()); + } + + @Override + public void onSuccess(Void result) { + sshKeyTable.remove(sshKeyPairDTO); + } + + })); + sshKeyTable.addColumn(sshKeyPairActionColumn); add(sshKeyTable); sshKeyLoadingBusy = new SimpleBusyIndicator(); add(sshKeyLoadingBusy); diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyPairImagesBarCell.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyPairImagesBarCell.java new file mode 100755 index 00000000000..75d4ffddb13 --- /dev/null +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/SshKeyPairImagesBarCell.java @@ -0,0 +1,38 @@ +package com.sap.sailing.landscape.ui.client; + +import java.util.Arrays; + +import com.google.gwt.text.shared.SafeHtmlRenderer; +import com.sap.sailing.landscape.ui.client.i18n.StringMessages; +import com.sap.sse.gwt.client.IconResources; +import com.sap.sse.gwt.client.celltable.ImagesBarCell; +import com.sap.sse.security.shared.HasPermissions.DefaultActions; + +public class SshKeyPairImagesBarCell extends ImagesBarCell { + static final String ACTION_REMOVE = "ACTION_REMOVE"; + public static final String ACTION_CHANGE_OWNERSHIP = DefaultActions.CHANGE_OWNERSHIP.name(); + public static final String ACTION_CHANGE_ACL = DefaultActions.CHANGE_ACL.name(); + + private final StringMessages stringMessages; + + public SshKeyPairImagesBarCell(StringMessages stringMessages) { + super(); + this.stringMessages = stringMessages; + } + + public SshKeyPairImagesBarCell(SafeHtmlRenderer renderer, StringMessages stringMessages) { + super(); + this.stringMessages = stringMessages; + } + + @Override + protected Iterable getImageSpecs() { + return Arrays.asList( + new ImageSpec(ACTION_REMOVE, stringMessages.remove(), + IconResources.INSTANCE.removeIcon()), + new ImageSpec(ACTION_CHANGE_OWNERSHIP, stringMessages.actionChangeOwnership(), + IconResources.INSTANCE.changeOwnershipIcon()), + new ImageSpec(ACTION_CHANGE_ACL, stringMessages.actionChangeACL(), + IconResources.INSTANCE.changeACLIcon())); + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java index 7747bb6241e..b88d2408607 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java @@ -128,8 +128,10 @@ public class LandscapeManagementWriteServiceImpl extends ResultCachingProxiedRem final AwsRegion region = new AwsRegion(regionId); for (final KeyPairInfo keyPairInfo : landscape.getAllKeyPairInfos(region)) { final SSHKeyPair key = landscape.getSSHKeyPair(region, keyPairInfo.keyName()); - if (key != null && SecurityUtils.getSubject().isPermitted(key.getPermissionType().getStringPermission(DefaultActions.READ))) { - result.add(new SSHKeyPairDTO(key.getRegionId(), key.getName(), key.getCreatorName(), key.getCreationTime())); + if (key != null && SecurityUtils.getSubject().isPermitted(key.getIdentifier().getStringPermission(DefaultActions.READ))) { + final SSHKeyPairDTO sshKeyPairDTO = new SSHKeyPairDTO(key.getRegionId(), key.getName(), key.getCreatorName(), key.getCreationTime()); + SecurityDTOUtil.addSecurityInformation(getSecurityService(), sshKeyPairDTO); + result.add(sshKeyPairDTO); } } return result; diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapper.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapper.java index 44d819fc9b4..8d733c6c8d6 100755 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapper.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapper.java @@ -225,4 +225,9 @@ public abstract class TableWrapper, SM return selectionModel.getSelectedSet() != null && selectionModel.getSelectedSet().size() == 1 ? selectionModel.getSelectedSet().iterator().next() : null; } + + public void refresh() { + // TODO Implement TableWrapper.refresh(...) + + } } \ No newline at end of file diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapperWithFilter.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapperWithFilter.java index 04a65c530db..2414908d8ab 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapperWithFilter.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/celltable/TableWrapperWithFilter.java @@ -96,6 +96,11 @@ extends TableWrapper { public void refresh(Iterable newItems) { getFilterPanel().updateAll(newItems); } + + @Override + public void refresh() { + getFilterPanel().filter(); + } @Override public void add(T t) {