Update create/edit user and group forms to use the new generic form

Author: hmiguim

.github/workflows/staging.yml

@@ -30,7 +30,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
       - name: Install clamdscan
-        run: sudo apt-get install clamdscan -y
+        run: sudo apt-get update && sudo apt-get install clamdscan -y
       - name: Run tests & install
         run: mvn $MAVEN_CLI_OPTS -Dtestng.groups="travis" -Denforcer.skip=true clean org.jacoco:jacoco-maven-plugin:prepare-agent install
         env:

roda-core/roda-core/src/main/resources/config/roda-roles.properties

@@ -94,6 +94,7 @@ core.roles.org.roda.wui.api.v2.controller.JobsController.createJob = job.manage
 core.roles.org.roda.wui.api.v2.controller.JobsController.obtainJobCommand = job.manage
 
 # Member roles
+core.roles.org.roda.wui.api.v2.controller.MembersController.getMember = member.read
 core.roles.org.roda.wui.api.v2.controller.MembersController.getUser = member.read
 core.roles.org.roda.wui.api.v2.controller.MembersController.getGroup = member.read
 core.roles.org.roda.wui.api.v2.controller.MembersController.deleteMultipleMembers = member.manage

roda-ui/roda-wui/src/main/java/config/i18n/client/ClientMessages.java

@@ -2773,4 +2773,16 @@ SafeHtml representationInformationAssociatedWithDescription(String field, String
   String disposalRuleSuccessfullyCreated();
 
   String disposalRuleSuccessfullyUpdated();
+
+  String userSuccessfullyCreated();
+
+  String userSuccessfullyUpdated();
+
+  String groupSuccessfullyCreated();
+
+  String groupSuccessfullyUpdated();
+
+  String failedToUpdateGroup();
+
+  String failedToUpdateUser();
 }

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/MembersController.java

@@ -79,7 +79,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ldap.NamingException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -274,7 +273,7 @@ private static Set<String> mapCasGroupstoRODAGroups(Set<String> casGroups) {
   }
 
   @Override
-  public RODAMember getUser(String name) {
+  public RODAMember getMember(String name) {
     RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     ControllerAssistant controllerAssistant = new ControllerAssistant() {};
     LogEntryState state = LogEntryState.SUCCESS;
@@ -298,6 +297,26 @@ public RODAMember getUser(String name) {
     }
   }
 
+  @Override
+  public User getUser(String name) {
+    RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
+    ControllerAssistant controllerAssistant = new ControllerAssistant() {};
+    LogEntryState state = LogEntryState.SUCCESS;
+
+    try {
+      // check user permissions
+      controllerAssistant.checkRoles(requestContext.getUser());
+
+      return membersService.retrieveUser(name);
+    } catch (RODAException e) {
+      state = LogEntryState.FAILURE;
+      throw new RESTException(e);
+    } finally {
+      // register action
+      controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_USERNAME_PARAM, name);
+    }
+  }
+
   @Override
   public User getAuthenticatedUser() {
     User user = UserUtility.getUser(request);
@@ -617,7 +636,7 @@ public Group createGroup(@RequestBody CreateGroupRequest groupRequest) {
   }
 
   @Override
-  public Void updateGroup(@RequestBody Group modifiedGroup) {
+  public Group updateGroup(@RequestBody Group modifiedGroup) {
     ControllerAssistant controllerAssistant = new ControllerAssistant() {};
     RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     LogEntryState state = LogEntryState.SUCCESS;
@@ -626,15 +645,14 @@ public Void updateGroup(@RequestBody Group modifiedGroup) {
       // check user permissions
       controllerAssistant.checkRoles(requestContext.getUser());
       // delegate
-      membersService.updateGroup(modifiedGroup);
+      return membersService.updateGroup(modifiedGroup);
     } catch (RODAException e) {
       state = LogEntryState.FAILURE;
       throw new RESTException(e);
     } finally {
       // register action
       controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_GROUP_PARAM, modifiedGroup);
     }
-    return null;
   }
 
   @Override
@@ -721,7 +739,7 @@ public Group removeMembersFromGroup(String id, String userId) {
     } finally {
       // register action
       controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_GROUP_PARAM, id,
-              RodaConstants.CONTROLLER_USER_PARAM, userId);
+        RodaConstants.CONTROLLER_USER_PARAM, userId);
     }
   }
 
@@ -786,7 +804,7 @@ public User updateUser(@RequestBody UpdateUserRequest userRequest) {
     } finally {
       // register action
       controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_USER_PARAM,
-        requestContext.getUser());
+        requestContext.getUser().getFullName());
     }
   }
 
@@ -808,7 +826,7 @@ public User updateMyUser(@RequestBody UpdateUserRequest userOperations) {
     } finally {
       // register action
       controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_USER_PARAM,
-        userOperations.getUser());
+        userOperations.getUser().getFullName());
     }
   }
 
@@ -997,7 +1015,7 @@ public LongResponse count(@RequestBody CountRequest countRequest) {
   }
 
   @Override
-  public List<String> suggest(SuggestRequest suggestRequest) {
+  public List<String> suggest(@RequestBody SuggestRequest suggestRequest) {
     return indexService.suggest(suggestRequest, RODAMember.class);
   }
 

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/services/MembersService.java

@@ -271,9 +271,10 @@ public Group createGroup(Group group) throws GenericException, AlreadyExistsExce
     return newGroup;
   }
 
-  public void updateGroup(Group group) throws GenericException, NotFoundException, AuthorizationDeniedException {
-    RodaCoreFactory.getModelService().updateGroup(group, true);
+  public Group updateGroup(Group group) throws GenericException, NotFoundException, AuthorizationDeniedException {
+    Group updatedGroup = RodaCoreFactory.getModelService().updateGroup(group, true);
     RodaCoreFactory.getIndexService().commit(true, RODAMember.class);
+    return updatedGroup;
   }
 
   public void deleteGroup(String groupname) throws GenericException, AuthorizationDeniedException {

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/BrowseObjectActionsToolbar.java

@@ -13,12 +13,11 @@
 import org.roda.core.data.v2.index.IsIndexed;
 import org.roda.core.data.v2.ip.AIPState;
 import org.roda.core.data.v2.ip.Permissions;
-import org.roda.wui.client.GenericDataPanel;
+import org.roda.wui.client.common.forms.GenericDataPanel;
 import org.roda.wui.client.common.actions.Actionable;
 import org.roda.wui.client.common.labels.Tag;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import org.roda.wui.client.disposal.rule.DisposalRuleDataPanel;
 
 /**
  *

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/NoActionsToolbar.java

@@ -0,0 +1,33 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE file at the root of the source
+ * tree and available online at
+ *
+ * https://github.com/keeps/roda
+ */
+package org.roda.wui.client.common;
+
+import org.roda.core.data.v2.user.RODAMember;
+
+/**
+ *
+ * @author Miguel Guimarães <mguimaraes@keep.pt>
+ */
+public class NoActionsToolbar extends BrowseObjectActionsToolbar<RODAMember> {
+
+  public void build() {
+    setObjectAndBuild(null, null, null);
+  }
+
+  public void buildIcon() {
+    // do nothing
+  }
+
+  public void buildTags() {
+    // do nothing
+  }
+
+  public void buildActions() {
+    this.actions.clear();
+  }
+}

roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/actions/RODAMemberAction.java

@@ -13,6 +13,7 @@
 public enum RODAMemberAction implements Actionable.Action<RODAMember> {
   NEW_USER(RodaConstants.PERMISSION_METHOD_CREATE_USER), NEW_GROUP(RodaConstants.PERMISSION_METHOD_CREATE_GROUP),
   ACTIVATE(RodaConstants.PERMISSION_METHOD_UPDATE_USER), DEACTIVATE(RodaConstants.PERMISSION_METHOD_UPDATE_USER),
+  CHANGE_PASSWORD(RodaConstants.PERMISSION_METHOD_UPDATE_USER),
   EDIT(RodaConstants.PERMISSION_METHOD_UPDATE_USER), REMOVE(RodaConstants.PERMISSION_METHOD_DELETE_USER),
   ADD_NEW_GROUP(RodaConstants.PERMISSION_METHOD_UPDATE_USER),
   ADD_NEW_MEMBER(RodaConstants.PERMISSION_METHOD_UPDATE_USER),