Skip to content

Commit

Permalink
fixes for self credentials panel; toast messages update
Browse files Browse the repository at this point in the history
  • Loading branch information
Kateryna Honchar committed Aug 19, 2022
1 parent 1f7cd2d commit 40c25db
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
9 changes: 0 additions & 9 deletions ...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@
import java.util.List;
import java.util.Objects;

import com.evolveum.midpoint.security.api.SecurityUtil;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;

import com.evolveum.midpoint.web.security.util.SecurityUtils;

import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Application;
import org.apache.wicket.ajax.AjaxChannel;
Expand All @@ -42,11 +39,6 @@
import com.evolveum.midpoint.authentication.api.util.AuthUtil;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.gui.impl.page.admin.focus.PageFocusDetails;
import com.evolveum.midpoint.gui.impl.page.self.PageOrgSelfProfile;
import com.evolveum.midpoint.gui.impl.page.self.PageRoleSelfProfile;
import com.evolveum.midpoint.gui.impl.page.self.PageServiceSelfProfile;
import com.evolveum.midpoint.gui.impl.page.self.PageUserSelfProfile;
import com.evolveum.midpoint.model.api.validator.StringLimitationResult;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.crypto.EncryptionException;
Expand All @@ -59,7 +51,6 @@
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.component.prism.InputPanel;
import com.evolveum.midpoint.web.component.util.EnableBehaviour;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.security.MidPointApplication;
import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsPolicyType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
Expand Down
2 changes: 1 addition & 1 deletion ...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ public void onClick(AjaxRequestTarget target) {
}
};
viewAll.add(new VisibleBehaviour(this::isPreview));
viewAll.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
viewAll.add(AttributeAppender.append("class", "btn btn-info btn-sm"));
viewAll.showTitleAsLabel(true);
return viewAll;
}
Expand Down
45 changes: 26 additions & 19 deletions ...c/main/java/com/evolveum/midpoint/gui/impl/page/self/credentials/ChangePasswordPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ public void setObject(String value) {
PasswordPanel passwordPanel = new PasswordPanel(ID_PASSWORD_PANEL, Model.of(newPasswordValue), false, true, getModelObject().asPrismObject()) {
private static final long serialVersionUID = 1L;

@Override
protected <F extends FocusType> ValuePolicyType getValuePolicy(PrismObject<F> object) {
return null;//getModelObject().getFocusPolicy();
}
// @Override
// protected <F extends FocusType> ValuePolicyType getValuePolicy(PrismObject<F> object) {
// return null;//getModelObject().getFocusPolicy();
// }

@Override
protected void updatePasswordValidation(AjaxRequestTarget target) {
Expand Down Expand Up @@ -171,9 +171,10 @@ public void onError(AjaxRequestTarget target) {
FeedbackMessages messages = getPageBase().getFeedbackMessages();
if (messages != null && !messages.isEmpty()) {
new Toast()
.cssClass("bg-danger m3")
.error()
.autohide(false)
.title(messages.first().getMessage().toString())
.title(getString("ChangePasswordPanel.savePassword"))
.body(messages.first().getMessage().toString())
.show(target);
}
}
Expand Down Expand Up @@ -264,9 +265,10 @@ private void changePasswordPerformed(AjaxRequestTarget target) {
// warn(getString("PageSelfCredentials.specifyOldPasswordMessage"));
// target.add(getPageBase().getFeedbackPanel());
new Toast()
.cssClass("bg-warning m3")
.warning()
.autohide(false)
.title(getString("PageSelfCredentials.specifyOldPasswordMessage"))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString("PageSelfCredentials.specifyOldPasswordMessage"))
.show(target);
return;
} else {
Expand All @@ -281,9 +283,10 @@ private void changePasswordPerformed(AjaxRequestTarget target) {
// error(getString("PageSelfCredentials.incorrectOldPassword"));
// target.add(getPageBase().getFeedbackPanel());
new Toast()
.cssClass("bg-danger m3")
.error()
.autohide(false)
.title(getString("PageSelfCredentials.incorrectOldPassword"))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString("PageSelfCredentials.incorrectOldPassword"))
.show(target);
return;
}
Expand All @@ -293,9 +296,10 @@ private void changePasswordPerformed(AjaxRequestTarget target) {
getString("PageAbstractSelfCredentials.message.onSavePerformed.fatalError", ex.getMessage()), ex);
// target.add(getPageBase().getFeedbackPanel());
new Toast()
.cssClass("bg-danger m3")
.error()
.autohide(false)
.title(getString("PageAbstractSelfCredentials.message.onSavePerformed.fatalError"))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString("PageAbstractSelfCredentials.message.onSavePerformed.fatalError"))
.show(target);
return;
} finally {
Expand All @@ -304,13 +308,14 @@ private void changePasswordPerformed(AjaxRequestTarget target) {
}
}

if (newPasswordValue == null || StringUtils.isEmpty(newPasswordValue.getClearValue())) {
if (newPasswordValue == null || (!newPasswordValue.isEncrypted() && StringUtils.isEmpty(newPasswordValue.getClearValue()))) {
// warn(getString("PageSelfCredentials.emptyPasswordFiled"));
// target.add(getPageBase().getFeedbackPanel());
new Toast()
.cssClass("bg-warning m3")
.warning()
.autohide(false)
.title(getString("PageSelfCredentials.emptyPasswordFiled"))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString("PageSelfCredentials.emptyPasswordFiled"))
.show(target);
return;
}
Expand Down Expand Up @@ -378,16 +383,18 @@ protected void finishChangePassword(OperationResult result, AjaxRequestTarget ta
// getPageBase().showResult(result);
// target.add(getPageBase().getFeedbackPanel());
new Toast()
.cssClass("bg-warning m3")
.warning()
.autohide(false)
.title(getString(result.getMessage()))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString(result.getMessage()))
.show(target);
}
} else {
new Toast()
.cssClass("bg-info m3")
.info()
.autohide(false)
.title(getString(result.getMessage()))
.title(getString("ChangePasswordPanel.savePassword"))
.body(getString(result.getMessage()))
.show(target);
// target.add(getPageBase().getFeedbackPanel());
}
Expand Down

0 comments on commit 40c25db

Please sign in to comment.