Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Sep 7, 2023 · 15a0ae7 · 15a0ae7
2 parents e69b755 + 5edf010
commit 15a0ae7
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableLabelPanel.java b/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableLabelPanel.java
@@ -6,19 +6,37 @@
  */
 package com.evolveum.midpoint.gui.api.component.autocomplete;
 
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
+
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.convert.IConverter;
 
 public class LookupTableLabelPanel extends Label {
 
+    private final String lookupTableOid;
 
-    public LookupTableLabelPanel(String id, IModel<?> model) {
+    public LookupTableLabelPanel(String id, IModel<?> model, String lookupTableOid) {
         super(id, model);
+        this.lookupTableOid = lookupTableOid;
     }
 
     @Override
     public <C> IConverter<C> getConverter(Class<C> type) {
-        return new LookupTableConverter<C>(super.getConverter(type), this, true);
+        return new LookupTableConverter<C>(super.getConverter(type), this, true){
+            @Override
+            protected LookupTableType getLookupTable() {
+                if (lookupTableOid != null) {
+                    return WebComponentUtil.loadLookupTable(lookupTableOid, getPageBase());
+                }
+                return null;
+            }
+        };
+    }
+
+    public PageBase getPageBase() {
+        return (PageBase) getPage();
     }
 }
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LabelPanelFactory.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LabelPanelFactory.java
@@ -6,20 +6,16 @@
  */
 package com.evolveum.midpoint.gui.impl.factory.panel;
 
-import com.evolveum.midpoint.gui.api.prism.wrapper.PrismValueWrapper;
-
 import jakarta.annotation.PostConstruct;
-
-import com.evolveum.midpoint.gui.api.component.autocomplete.LookupTableLabelPanel;
-
-import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.basic.Label;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.evolveum.midpoint.gui.api.component.autocomplete.LookupTableLabelPanel;
 import com.evolveum.midpoint.gui.api.factory.GuiComponentFactory;
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismValueWrapper;
 import com.evolveum.midpoint.gui.api.registry.GuiComponentRegistry;
 
 @Component
@@ -41,7 +37,7 @@ public void register() {
     public org.apache.wicket.Component createPanel(PrismPropertyPanelContext<T> panelCtx) {
         String lookupTableOid = panelCtx.getPredefinedValuesOid();
         if (lookupTableOid != null) {
-            return new LookupTableLabelPanel(panelCtx.getComponentId(), panelCtx.getRealValueStringModel());
+            return new LookupTableLabelPanel(panelCtx.getComponentId(), panelCtx.getRealValueStringModel(), lookupTableOid);
         }
         return new Label(panelCtx.getComponentId(), panelCtx.getRealValueStringModel());
     }

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.html
@@ -26,10 +26,6 @@
     <form wicket:id="mainForm" class="form-horizontal">
         <div wicket:id="changePasswordPanel"/>
     </form>
-    <a class="text-center login-panel-control mt-2" style="display: inline-block;" wicket:id="back">
-        <i class="fas fa-arrow-left mr-2"></i>
-        <wicket:message key="PageEmailNonce.backButtonLabel"/>
-    </a>
 </wicket:extend>
 
 </body>

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java
@@ -55,7 +55,6 @@ public class PageResetPassword extends AbstractPageLogin {
     protected static final String ID_MAIN_FORM = "mainForm";
     private static final String ID_CHANGE_PASSWORD_PANEL = "changePasswordPanel";
     private static final String CHANGE_PASSWORD_BUTTON_STYLE = "btn btn-primary login-panel-control";
-    private static final String ID_BACK_BUTTON = "back";
 
     public PageResetPassword() {
         super();
@@ -133,16 +132,6 @@ protected String getChangePasswordButtonStyle() {
         };
         changePasswordPanel.setOutputMarkupId(true);
         form.add(changePasswordPanel);
-        AjaxButton backButton = new AjaxButton(ID_BACK_BUTTON) {
-            @Serial private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                cancelPerformed();
-            }
-        };
-        backButton.setOutputMarkupId(true);
-        add(backButton);
 
     }
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageEmailNonce.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageEmailNonce.java
@@ -8,6 +8,8 @@
 package com.evolveum.midpoint.gui.impl.page.login.module;
 
 import java.io.Serial;
+
+import com.evolveum.midpoint.gui.api.component.result.Toast;
 import com.evolveum.midpoint.web.page.error.PageError;
 
 import org.apache.wicket.RestartResponseException;
@@ -62,7 +64,7 @@ public PageEmailNonce() {
         // TODO improve message with the time when the mail was sent (saved in nonce metadata)
 
         if (!alreadyHasNonce()) {
-            generateAndSendNonce();
+            generateAndSendNonce(null);
         }
 
         LOGGER.debug("Nonce won't be generated automatically, user already has one.");
@@ -93,16 +95,15 @@ private void initButtons(MidpointForm form) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                generateAndSendNonce();
-                //TODO toast with success message.
+                generateAndSendNonce(target);
             }
 
         };
         form.add(resendNonce);
     }
 
 
-    private void generateAndSendNonce() {
+    private void generateAndSendNonce(AjaxRequestTarget target) {
         UserType user = searchUser();
         validateUserNotNullOrFail(user);
         LOGGER.trace("Reset Password user: {}", user);
@@ -112,6 +113,15 @@ private void generateAndSendNonce() {
         OperationResult result = saveUserNonce(user, noncePolicy);
         if (result.getStatus() != OperationResultStatus.SUCCESS) {
             LOGGER.error("Failed to send nonce to user: {} ", result.getMessage());
+        } else if (target != null) {
+            new Toast()
+                    .success()
+                    .title(getString("PageEmailNonce.sentNonce"))
+                    .icon("fas fa-circle-check")
+                    .autohide(true)
+                    .delay(5_000)
+                    .body(getString("PageEmailNonce.sentNonce.message"))
+                    .show(target);
         }
 
     }

diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.0.6</version>
+        <version>3.0.10</version>
         <!-- This parent also declares dependencies listed here:
         https://docs.spring.io/spring-boot/docs/2.7.3/reference/html/dependency-versions.html#dependency-versions
         Or for current version of Spring Boot: