Skip to content

Commit d96e81d

Browse files
committed
wip
1 parent 4f4c042 commit d96e81d

6 files changed

Lines changed: 22 additions & 98 deletions

File tree

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3434
restore-keys: ${{ runner.os }}-maven-
3535
- name: Install clamdscan
36-
run: sudo apt-get install clamdscan -y
36+
run: sudo apt-get update && sudo apt-get install clamdscan -y
3737
- name: Test
3838
run:
3939
mvn $MAVEN_CLI_OPTS -Dtestng.groups="travis" -Denforcer.skip=true clean org.jacoco:jacoco-maven-plugin:prepare-agent clean test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ public User updateUser(@RequestBody UpdateUserRequest userRequest) {
804804
} finally {
805805
// register action
806806
controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_USER_PARAM,
807-
requestContext.getUser());
807+
requestContext.getUser().getFullName());
808808
}
809809
}
810810

@@ -826,7 +826,7 @@ public User updateMyUser(@RequestBody UpdateUserRequest userOperations) {
826826
} finally {
827827
// register action
828828
controllerAssistant.registerAction(requestContext, state, RodaConstants.CONTROLLER_USER_PARAM,
829-
userOperations.getUser());
829+
userOperations.getUser().getFullName());
830830
}
831831
}
832832

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

Lines changed: 0 additions & 77 deletions
This file was deleted.

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
55
import com.google.gwt.user.client.rpc.AsyncCallback;
66
import config.i18n.client.ClientMessages;
7+
import org.roda.core.common.pekko.messages.events.EventUserUpdated;
78
import org.roda.core.data.common.RodaConstants;
9+
import org.roda.core.data.common.SecureString;
810
import org.roda.core.data.utils.SelectedItemsUtils;
911
import org.roda.core.data.v2.accessKey.CreateAccessKeyRequest;
1012
import org.roda.core.data.v2.index.filter.BasicSearchFilterParameter;
@@ -283,12 +285,25 @@ public void onSuccess(Boolean result) {
283285
}
284286

285287
public static void changePassword(RODAMember object, AsyncCallback<Actionable.ActionImpact> callback) {
286-
RODAMembersDialogs.setUserPassword(messages.userDataChangePassword(), new ActionAsyncCallback<String>(callback) {
287-
@Override
288-
public void onSuccess(String result) {
288+
RODAMembersDialogs.setUserPassword(messages.userDataChangePassword(), new ActionAsyncCallback<String>(callback) {
289+
@Override
290+
public void onSuccess(String result) {
291+
UpdateUserRequest request = new UpdateUserRequest();
292+
request.setUser((User) object);
293+
request.setPassword(new SecureString(result.toCharArray()));
294+
request.setValues(((User) object).getExtra());
295+
296+
Services services = new Services("Update user password", "update");
297+
services.membersResource(s -> s.updateUser(request)).whenComplete((res, error) -> {
298+
if (error != null) {
299+
callback.onSuccess(Actionable.ActionImpact.NONE);
300+
} else {
289301
callback.onSuccess(Actionable.ActionImpact.NONE);
302+
Toast.showError(messages.editUserFailure(object.getFullName(), error.getMessage()));
290303
}
291-
});
304+
});
305+
}
306+
});
292307
}
293308

294309
public static void editPermissions(RODAMember object, AsyncCallback<Actionable.ActionImpact> callback) {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,4 @@ public void onClick(ClickEvent clickEvent) {
232232
dialogBox.center();
233233
dialogBox.show();
234234
}
235-
236-
private static FlowPanel createStackedFieldRow(Widget labelWidget, Widget inputWidget) {
237-
FlowPanel stackedField = new FlowPanel();
238-
stackedField.addStyleName("generic-stacked-field");
239-
240-
// Assemble the DOM vertically
241-
stackedField.add(labelWidget);
242-
stackedField.add(inputWidget);
243-
244-
return stackedField;
245-
}
246-
247235
}

roda-ui/roda-wui/src/main/java/org/roda/wui/client/management/members/CreateUser.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import com.google.gwt.user.client.ui.Widget;
1212
import config.i18n.client.ClientMessages;
1313
import org.roda.core.data.v2.user.User;
14-
import org.roda.core.data.v2.user.requests.CreateGroupRequest;
1514
import org.roda.core.data.v2.user.requests.CreateUserRequest;
16-
import org.roda.wui.client.common.CreateOrUpdateUserActionsToolbar;
1715
import org.roda.wui.client.common.NavigationToolbar;
1816
import org.roda.wui.client.common.NoActionsToolbar;
1917
import org.roda.wui.client.common.TitlePanel;

0 commit comments

Comments
 (0)