Merge remote-tracking branch 'origin/master' into feature/shadow-meta…

…data
Evolveum · May 24, 2023 · eabc528 · eabc528
2 parents b936653 + 551ab3f
commit eabc528
Show file tree

Hide file tree

Showing 119 changed files with 3,917 additions and 1,356 deletions.
diff --git a/config/initial-objects/archetype/507-archetype-task-report.xml b/config/initial-objects/archetype/507-archetype-task-report.xml
@@ -32,10 +32,6 @@
             <path>extension/rext:reportParam</path>
             <visibility>visible</visibility>
         </itemConstraint>
-        <itemConstraint>
-            <path>extension/rext:reportOutputOid</path>
-            <visibility>visible</visibility>
-        </itemConstraint>
         <itemConstraint>
             <path>extension/rext:reportDataParam</path>
             <visibility>visible</visibility>
@@ -53,9 +49,6 @@
                         <item>
                             <c:path>extension/rext:reportParam</c:path>
                         </item>
-                        <item>
-                            <c:path>extension/rext:reportOutputOid</c:path>
-                        </item>
                         <item>
                             <c:path>extension/rext:reportDataParam</c:path>
                         </item>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
@@ -18,16 +18,17 @@
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.image.Image;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 
 public class CaptchaPanel extends BasePanel<Void> {
 
     private static final long serialVersionUID = 1L;
 
+    private static final String CAPTCHA_TEXT_ID = "text";
+    private static final String CAPTCHA_IMAGE_ID = "image";
     /**
      * The text provided by the user.
      */
@@ -49,7 +50,7 @@ public CaptchaPanel(String id, PageAdminLTE pageBase) {
         add(feedback);
 
         captchaImageResource = createCaptchaImageResource();
-        final Image captchaImage = new Image("image", captchaImageResource);
+        final Image captchaImage = new Image(CAPTCHA_IMAGE_ID, captchaImageResource);
         captchaImage.setOutputMarkupId(true);
         add(captchaImage);
 
@@ -69,8 +70,7 @@ public void onClick(AjaxRequestTarget target) {
         add(new Label("textDescriptionLabel",
                 pageBase.createStringResource("CaptchaPanel.textDescriptionLabel")));
 
-        add(new RequiredTextField<String>("text",
-                new PropertyModel<>(CaptchaPanel.this, "captchaText"), String.class) {
+        add(new RequiredTextField<String>(CAPTCHA_TEXT_ID, Model.of()) {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -104,7 +104,8 @@ static String randomString() {
     }
 
     public String getCaptchaText() {
-        return captchaText;
+        RequiredTextField<String> captchaField = (RequiredTextField) get(CAPTCHA_TEXT_ID);
+        return captchaField.getInput();
     }
 
     public String getRandomText() {

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
@@ -14,8 +14,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
@@ -37,7 +35,7 @@
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
@@ -189,9 +187,7 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                if(this.getParent() != null){
-                    target.add(this.getParent().setVisible(false));
-                }
+                close(target, true);
             }
         };
         box.add(close);
@@ -217,9 +213,15 @@ public File getObject() {
         box.add(downloadXml);
     }
 
-    public void close(AjaxRequestTarget target) {
-        this.setVisible(false);
-        target.add(this);
+    public void close(AjaxRequestTarget target, boolean parent) {
+        if (parent) {
+            if (this.getParent() != null) {
+                target.add(this.getParent().setVisible(false));
+            }
+        } else {
+            this.setVisible(false);
+            target.add(this);
+        }
     }
 
     private WebMarkupContainer createMessage() {

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ObjectTabVisibleBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ObjectTabVisibleBehavior.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -3417,7 +3417,7 @@ public static List<InlineMenuItem> createMenuItemsFromActions(@NotNull List<GuiA
                 return;
             }
             String label = action.getDisplay() != null && PolyStringUtils.isNotEmpty(action.getDisplay().getLabel()) ?
-                    action.getDisplay().getLabel().getOrig() : action.getName();
+                    action.getDisplay().getLabel().getOrig() : action.getIdentifier();
             menuItems.add(new InlineMenuItem(Model.of(label)) {
                 private static final long serialVersionUID = 1L;
 

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java b/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
@@ -160,7 +160,6 @@ public SearchableItemsDefinitions additionalSearchContext(SearchContext ctx) {
                 ItemPath.create(CaseType.F_PARENT_REF),
                 ItemPath.create(CaseType.F_REQUESTOR_REF),
                 ItemPath.create(CaseType.F_TARGET_REF),
-                ItemPath.create(CaseType.F_TASK_REF),
                 ItemPath.create(CaseType.F_OBJECT_REF)
         ));
 

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java
@@ -483,11 +483,6 @@ private String getReportDataOid() {
         if (reportData != null && reportData.getRealValue() != null && reportData.getRealValue().getOid() != null) {
             return reportData.getRealValue().getOid();
         }
-        PrismProperty<String> reportOutputOid = task.findProperty(
-                ItemPath.create(TaskType.F_EXTENSION, ReportConstants.REPORT_OUTPUT_OID_PROPERTY_NAME));
-        if (reportOutputOid != null) {
-            return reportOutputOid.getRealValue();
-        }
         return getReportDataOidFromImportActivity(task.asObjectable());
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/AbstractPageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/AbstractPageLogin.java
@@ -142,7 +142,7 @@ private String getSequenceName() {
     }
 
     private String getSequenceIdentifier(AuthenticationSequenceType seq) {
-        return StringUtils.isNotEmpty(seq.getIdentifier()) ? seq.getIdentifier() : seq.getName();
+        return seq.getIdentifier();
     }
 
     protected abstract void initCustomLayout();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAbstractFlow.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageAbstractFlow.java
@@ -19,11 +19,9 @@
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.prism.DynamicFormPanel;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
@@ -106,7 +104,6 @@ protected void onError(AjaxRequestTarget target) {
             }
 
             protected void onSubmit(AjaxRequestTarget target) {
-                isSubmitted = true;
                 doRegistration(target);
 
             }
@@ -119,8 +116,8 @@ private void doRegistration(AjaxRequestTarget target) {
         if (!validateCaptcha(target)) {
             return;
         }
-
         submitRegistration(target);
+        isSubmitted = true;
     }
 
     private boolean validateCaptcha(AjaxRequestTarget target) {
@@ -132,7 +129,7 @@ private boolean validateCaptcha(AjaxRequestTarget target) {
         }
 
         CaptchaPanel captcha = getCaptcha();
-        if (captcha.getRandomText() == null) {
+        if (captcha.getRandomText() == null || captcha.getCaptchaText() == null) {
             String message = createStringResource("PageSelfRegistration.captcha.validation.failed")
                     .getString();
             LOGGER.error(message);
@@ -142,16 +139,14 @@ private boolean validateCaptcha(AjaxRequestTarget target) {
             return false;
         }
 
-        if (captcha.getCaptchaText() != null && captcha.getRandomText() != null) {
-            if (!captcha.getCaptchaText().equals(captcha.getRandomText())) {
-                String message = createStringResource("PageSelfRegistration.captcha.validation.failed")
-                        .getString();
-                LOGGER.error(message);
-                getSession().error(message);
-                updateCaptcha(target);
-                target.add(getFeedbackPanel());
-                return false;
-            }
+        if (!captcha.getCaptchaText().equals(captcha.getRandomText())) {
+            String message = createStringResource("PageSelfRegistration.captcha.validation.failed")
+                    .getString();
+            LOGGER.error(message);
+            getSession().error(message);
+            updateCaptcha(target);
+            target.add(getFeedbackPanel());
+            return false;
         }
         LOGGER.trace("CAPTCHA Validation OK");
         return true;