engine: Add button to remove all direct user permissions (#967)

engine: Add button to remove all direct user permissions This button useful for large instances, when we have many roles for each user. Some times we want to totally clean roles for user, and this can be hard to look at all roles and search each direct one. Signed-off-by: Stanislav Melnichuk <[email protected]>
oVirt · Oct 16, 2024 · ff9d113 · ff9d113
1 parent 1e10b6e
commit ff9d113
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 1 deletion.
diff --git a/...dules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/...dules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -647,6 +647,8 @@ public interface CommonApplicationConstants extends Constants {
 
     String removePermission();
 
+    String removeDirectSystemPermissionsButtonLabel();
+
     String objectPermission();
 
     String addSystemPermission();

diff --git a/...ommon/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties b/...ommon/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants.properties
@@ -635,6 +635,7 @@ refreshRate=Refresh Rate
 registerDisksLabel=Register Disks
 remoteDesktop=Remote Desktop
 removeConfirmationPopupMessage=Are you sure you want to remove the following items?
+removeDirectSystemPermissionsButtonLabel=Remove Direct System Permissions
 removeDisk=Remove
 removeInterface=Remove
 removePermission=Remove

diff --git a/...on/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties b/...on/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ru.properties
@@ -20,6 +20,7 @@ addInstanceImages=\u0421\u043E\u0437\u0434\u0430\u0442\u044C
 addItemButtonLabel=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 addPermission=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 addSanStorage=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
+addSystemPermission=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f
 addVmHostDevice=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
 addressSanStorage=\u0410\u0434\u0440\u0435\u0441
 admin=\u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440
@@ -548,6 +549,7 @@ refreshRate=\u041E\u0441\u0432\u0435\u0436\u0438\u0442\u044C \u043E\u0446\u0435\
 registerDisksLabel=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0434\u0438\u0441\u043A\u0438
 remoteDesktop=\u0423\u0434\u0430\u043B\u0451\u043D\u043D\u044B\u0439 \u0440\u0430\u0431\u043E\u0447\u0438\u0439 \u0441\u0442\u043E\u043B
 removeConfirmationPopupMessage=\u0412\u044B \u0442\u043E\u0447\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B?
+removeDirectSystemPermissionsButtonLabel=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u044b\u0434\u0430\u043d\u043d\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
 removeDisk=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 removeInterface=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 removePermission=\u0423\u0434\u0430\u043B\u0438\u0442\u044C

diff --git a/...b/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java b/...b/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java
@@ -15,6 +15,7 @@
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.common.queries.QueryReturnValue;
 import org.ovirt.engine.core.common.queries.QueryType;
+import org.ovirt.engine.core.common.utils.ObjectUtils;
 import org.ovirt.engine.ui.frontend.AsyncCallback;
 import org.ovirt.engine.ui.frontend.Frontend;
 import org.ovirt.engine.ui.uicommonweb.UICommand;
@@ -29,6 +30,7 @@
 public class UserPermissionListModel extends PermissionListModel<DbUser> {
 
     private UICommand addRoleToUserCommand;
+    private UICommand removeDirectRolesFromUserCommand;
 
     @Inject
     public UserPermissionListModel(Provider<AdElementListModel> adElementListModelProvider) {
@@ -39,6 +41,11 @@ public UserPermissionListModel(Provider<AdElementListModel> adElementListModelPr
 
         setAddRoleToUserCommand(new UICommand("AddRoleToUser", this)); // $NON-NLS-1$
         getCommands().add(getAddRoleToUserCommand());
+
+        setRemoveDirectRolesFromUserCommand(new UICommand("RemoveDirectRolesFromUser", this)); // $NON-NLS-1$
+        getCommands().add(getRemoveDirectRolesFromUserCommand());
+        getItemsChangedEvent().addListener((ev, sender, args) -> updateRemoveDirectPermissionActionAvailability());
+
         updateActionAvailability();
     }
 
@@ -86,6 +93,45 @@ private void setAddRoleToUserCommand(UICommand value) {
         addRoleToUserCommand = value;
     }
 
+    public UICommand getRemoveDirectRolesFromUserCommand() {
+        return removeDirectRolesFromUserCommand;
+    }
+
+    private void setRemoveDirectRolesFromUserCommand(UICommand removeDirectRolesFromUserCommand) {
+        this.removeDirectRolesFromUserCommand = removeDirectRolesFromUserCommand;
+    }
+
+    private void removeAllDirect() {
+        List<Permission> elementsToRemove = getDirectPermissions();
+
+        if (elementsToRemove.isEmpty()) {
+            return;
+        }
+
+        // Correctly set permissions to delete into the selected items.
+        setSelectedItem(elementsToRemove.get(0));
+        setSelectedItems(elementsToRemove);
+
+        remove();
+    }
+
+    private List<Permission> getDirectPermissions() {
+        List<Permission> directPermissions = new ArrayList<>();
+
+        if (ObjectUtils.isEmpty(getItems())) {
+            return directPermissions;
+        }
+
+        for (Permission item : getItems()) {
+            if (item.getAdElementId() != null &&
+                    getEntity() != null &&
+                    item.getAdElementId().equals(getEntity().getId())) {
+                directPermissions.add(item);
+            }
+        }
+        return directPermissions;
+    }
+
     public void remove() {
         if (getWindow() != null) {
             return;
@@ -167,10 +213,18 @@ private void updateActionAvailability() {
         getAddCommand().setIsAvailable(false);
     }
 
+    private void updateRemoveDirectPermissionActionAvailability() {
+        getRemoveDirectRolesFromUserCommand()
+                .setIsExecutionAllowed(!getDirectPermissions().isEmpty());
+    }
+
     @Override
     public void executeCommand(UICommand command) {
         super.executeCommand(command);
 
+        if (command == getRemoveDirectRolesFromUserCommand()) {
+            removeAllDirect();
+        }
         if (command == getRemoveCommand()) {
             remove();
         } else if (command == getAddRoleToUserCommand()) {

diff --git a/.../modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java b/.../modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java
@@ -137,7 +137,7 @@ public SearchableDetailModelProvider<Permission, UserListModel, UserPermissionLi
                     @Override
                     public AbstractModelBoundPopupPresenterWidget<? extends ConfirmationModel, ?> getConfirmModelPopup(UserPermissionListModel source,
                             UICommand lastExecutedCommand) {
-                        if (lastExecutedCommand == getModel().getRemoveCommand()) {
+                        if (lastExecutedCommand == getModel().getRemoveCommand() || lastExecutedCommand == getModel().getRemoveDirectRolesFromUserCommand()) {
                             return removeConfirmPopupProvider.get();
                         } else {
                             return super.getConfirmModelPopup(source, lastExecutedCommand);

diff --git a/...ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java b/...ui/webadmin/section/main/presenter/tab/user/UserPermissionActionPanelPresenterWidget.java
@@ -34,6 +34,12 @@ protected UICommand resolveCommand() {
                 return getDetailModel().getAddRoleToUserCommand();
             }
         });
+        addActionButton(new UiCommandButtonDefinition<DbUser, Permission>(getSharedEventBus(), constants.removeDirectSystemPermissionsButtonLabel()) {
+            @Override
+            protected UICommand resolveCommand() {
+                return getDetailModel().getRemoveDirectRolesFromUserCommand();
+            }
+        });
         super.initializeButtons();
     }
 }