Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Sep 13, 2023 · 40c4d86 · 40c4d86
2 parents 7d2e2a8 + 21693c1
commit 40c4d86
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 50 deletions.
diff --git a/...a/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelColumn.java b/...a/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelColumn.java
@@ -9,11 +9,12 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.export.IExportableColumn;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-public abstract class CompositedIconWithLabelColumn<T> extends CompositedIconColumn<T> {
+public abstract class CompositedIconWithLabelColumn<T> extends CompositedIconColumn<T> implements IExportableColumn<T, String> {
 
     public CompositedIconWithLabelColumn(IModel<String> displayModel) {
         super(displayModel);

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/CollectionPanelType.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/CollectionPanelType.java
@@ -7,13 +7,12 @@
 
 package com.evolveum.midpoint.gui.impl.component.search;
 
+import javax.xml.namespace.QName;
+
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
-import javax.xml.namespace.QName;
-
 public enum CollectionPanelType {
     ROLE_MEMBER_GOVERNANCE(true, "roleGovernance", true, FocusType.COMPLEX_TYPE),
     ROLE_MEMBER_MEMBER(true, "roleMembers", true, FocusType.COMPLEX_TYPE),
@@ -22,7 +21,7 @@ public enum CollectionPanelType {
     ARCHETYPE_MEMBER_GOVERNANCE(true, "archetypeGovernance", true, FocusType.COMPLEX_TYPE),
     ARCHETYPE_MEMBER_MEMBER(true, "archetypeMembers", true, AssignmentHolderType.COMPLEX_TYPE),
     ORG_MEMBER_GOVERNANCE(true, "orgGovernance", true, FocusType.COMPLEX_TYPE),
-    ORG_MEMBER_MEMBER(true, "orgMembers", true, AssignmentType.COMPLEX_TYPE),
+    ORG_MEMBER_MEMBER(true, "orgMembers", true, AssignmentHolderType.COMPLEX_TYPE),
     MEMBER_ORGANIZATION(true, null, true, AssignmentHolderType.COMPLEX_TYPE),
     CARDS_GOVERNANCE(true, null, true, FocusType.COMPLEX_TYPE),
     MEMBER_WIZARD(true, null, false, UserType.COMPLEX_TYPE),

diff --git a/...java/com/evolveum/midpoint/gui/impl/component/search/panel/ObjectTypeSearchItemPanel.java b/...java/com/evolveum/midpoint/gui/impl/component/search/panel/ObjectTypeSearchItemPanel.java
@@ -18,6 +18,7 @@
 import org.apache.wicket.model.PropertyModel;
 
 import javax.xml.namespace.QName;
+import java.util.List;
 
 public class ObjectTypeSearchItemPanel<T> extends SingleSearchItemPanel<ObjectTypeSearchItemWrapper> {
 
@@ -28,7 +29,7 @@ public ObjectTypeSearchItemPanel(String id, IModel<ObjectTypeSearchItemWrapper>
     @Override
     protected Component initSearchItemField(String id) {
         DropDownChoicePanel<QName> choices = new DropDownChoicePanel<>(id, new PropertyModel(getModel(), ObjectTypeSearchItemWrapper.F_VALUE),
-                Model.ofList(getModelObject().getAvailableValues()),
+                getSortedAvailableData(),
                 new QNameObjectTypeChoiceRenderer(), getModelObject().isAllowAllTypesSearch()) {
 
             private static final long serialVersionUID = 1L;
@@ -53,4 +54,15 @@ protected void onUpdate(AjaxRequestTarget target) {
         return choices;
     }
 
+    private IModel<List<QName>> getSortedAvailableData() {
+        QNameObjectTypeChoiceRenderer qNameObjectTypeChoiceRenderer = new QNameObjectTypeChoiceRenderer();
+        List<QName> values = getModelObject().getAvailableValues();
+        values.sort((q1, q2) -> {
+            String displayValue1 = qNameObjectTypeChoiceRenderer.getDisplayValue(q1).toString();
+            String displayValue2 = qNameObjectTypeChoiceRenderer.getDisplayValue(q2).toString();
+            return displayValue1.compareToIgnoreCase(displayValue2);
+        });
+        return Model.ofList(values);
+    }
+
 }
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/FormWrapperValidator.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/FormWrapperValidator.java
@@ -12,11 +12,17 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.wicket.Component;
+import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.validation.IFormValidator;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LambdaModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
 import org.apache.wicket.validation.Validatable;
 import org.jetbrains.annotations.NotNull;
 
@@ -109,6 +115,46 @@ protected ObjectType getObjectType() {
         };
 
         validator.validate(validatable);
+        if (!validatable.isValid()) {
+            validatable.getErrors().forEach(e -> {
+                Serializable errorMessage = e.getErrorMessage((key, vars) ->
+                        new StringResourceModel(key)
+                                .setModel(new Model<String>())
+                                .setDefaultValue(key)
+                                .getString());
+                if (errorMessage!= null && !hasError(form, errorMessage.toString())) {
+                    form.error(errorMessage);
+                }
+            });
+        }
+    }
+
+    private boolean hasError(Form<?> form, String errorMessage) {
+        if (!form.hasError()) {
+            return false;
+        }
+        Boolean hasError = form.getFeedbackMessages()
+                .messages(new ComponentFeedbackMessageFilter(form))
+                .stream()
+                .anyMatch(m -> errorMessage.equals(m.getMessage().toString()));
+        if (!hasError) {
+            hasError = form.visitChildren(Component.class, new IVisitor<Component, Boolean>() {
+                @Override
+                public void component(final Component component, final IVisit<Boolean> visit) {
+                    if (!component.hasErrorMessage()) {
+                        return;
+                    }
+                    boolean componentErrorExists = component.getFeedbackMessages()
+                            .messages(new ComponentFeedbackMessageFilter(component))
+                            .stream()
+                            .anyMatch(m -> (m != null) && errorMessage.equals(m.getMessage().toString()));
+                    if (componentErrorExists) {
+                        visit.stop(true);
+                    }
+                }
+            });
+        }
+        return Boolean.TRUE.equals(hasError);
     }
 
     protected abstract PrismObjectWrapper<O> getObjectWrapper();

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/component/OrgMemberPanel.java b/...src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/component/OrgMemberPanel.java
@@ -11,13 +11,13 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.util.ObjectTypeListUtil;
-import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.MemberOperationsQueryUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.util.ObjectTypeListUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.AbstractRoleMemberPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.MemberOperationsQueryUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.focus.FocusDetailsModels;
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.query.ObjectQuery;

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -54,7 +54,6 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -109,6 +108,7 @@ public class PageDebugList extends PageAdminConfiguration {
     private final IModel<Boolean> showAllItemsModel = Model.of(true);
     // confirmation dialog model
     private IModel<DebugConfDialogDto> confDialogModel = null;
+    private Class<? extends ObjectType> objectType = SystemConfigurationType.class;
 
     public PageDebugList() {
     }
@@ -119,7 +119,6 @@ protected void onInitialize() {
         DebugConfDialogDto searchDto = new DebugConfDialogDto();
         searchDto.setType(SystemConfigurationType.class);
         confDialogModel = Model.of(searchDto);
-
         searchModel = new LoadableDetachableModel<>() {
 
             @Override
@@ -342,7 +341,10 @@ public void exportPerformed(AjaxRequestTarget target, IModel<DebugObjectItem> mo
 
     @NotNull
     private Class<? extends ObjectType> getType() {
-        return searchModel.isAttached() ? searchModel.getObject().getTypeClass() : SystemConfigurationType.class;
+        if (searchModel.isAttached()) {
+            objectType = searchModel.getObject().getTypeClass();
+        }
+        return objectType;
     }
 
     private List<InlineMenuItem> initInlineMenu() {

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
@@ -16,9 +16,6 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.impl.component.search.SearchContext;
-
-import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -50,6 +47,8 @@
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
 import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle;
+import com.evolveum.midpoint.gui.impl.component.search.SearchContext;
+import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.query.ObjectOrdering;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
@@ -181,6 +180,7 @@ protected ObjectQuery getCustomizeContentQuery() {
     public List<AuditEventRecordType> getSelectedRealObjects() {
         return getSelectedObjects().stream().map(SelectableBean::getValue).collect(Collectors.toList());
     }
+
     @Override
     protected List<Component> createToolbarButtonsList(String idButton) {
         List<Component> buttonsList = new ArrayList<>();
@@ -334,6 +334,17 @@ public IModel<DisplayType> getLabelDisplayModel(IModel<SelectableBean<AuditEvent
                             eventType.getDisplay().getIcon().getColor() : null;
                     return Model.of(new DisplayType().label(label).color(color));
                 }
+
+                @Override
+                public IModel<String> getDataModel(IModel<SelectableBean<AuditEventRecordType>> rowModel) {
+                    AuditEventRecordType record = unwrapModel(rowModel);
+                    if (record == null) {
+                        return Model.of("");
+                    }
+                    String value = WebComponentUtil.createLocalizedModelForEnum(record.getEventType(),
+                            AuditLogViewerPanel.this).getObject();
+                    return Model.of(value);
+                }
             };
         }
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -11,9 +11,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.evolveum.midpoint.gui.impl.util.ProvisioningObjectsUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.markup.html.form.Form;
@@ -30,6 +30,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.data.provider.SelectableBeanObjectDataProvider;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
+import com.evolveum.midpoint.gui.impl.util.ProvisioningObjectsUtil;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.GetOperationOptions;
@@ -126,7 +127,7 @@ protected ISelectableDataProvider<SelectableBean<ResourceType>> createProvider()
                     SelectableBeanObjectDataProvider<ResourceType> provider = createSelectableBeanObjectDataProvider(() ->
                             getCustomizeContentQuery(), null, getQueryOptions());
                     provider.setEmptyListOnNullQuery(true);
-                    provider.setSort(null);
+                    provider.setSort(ResourceType.F_NAME.getLocalPart(), SortOrder.ASCENDING);
                     provider.setDefaultCountIfNull(Integer.MAX_VALUE);
                     return provider;
                 } else {

diff --git a/...schema/src/main/java/com/evolveum/midpoint/schema/merger/assignment/AssignmentMerger.java b/...schema/src/main/java/com/evolveum/midpoint/schema/merger/assignment/AssignmentMerger.java
@@ -118,14 +118,14 @@ private boolean matchByAssignmentType(AssignmentType def, AssignmentType source,
                     return false;
                 }
 
-                if (def.getConstruction().getKind() != null
-                        && source.getConstruction().getKind() != null) {
-                    if (!(def.getConstruction().getKind().equals(source.getConstruction().getKind()))) {
+                if (def.getConstruction().getIntent() != null
+                        && source.getConstruction().getIntent() != null) {
+                    if (!(def.getConstruction().getIntent().equals(source.getConstruction().getIntent()))) {
                         return false;
                     }
                     allIsNull = false;
-                } else if (!(def.getConstruction().getKind() == null
-                        && source.getConstruction().getKind() == null)) {
+                } else if (!(def.getConstruction().getIntent() == null
+                        && source.getConstruction().getIntent() == null)) {
                     return false;
                 }
                 return !allIsNull;

diff --git a/...l-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java b/...l-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java
@@ -10,6 +10,8 @@
 
 import java.io.IOException;
 
+import com.evolveum.midpoint.test.util.TestUtil;
+
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
@@ -45,7 +47,7 @@ public void testModifyObjectSetAdditionalName() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class,
-                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, "Jackie");
+                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_EMPLOYEE_NUMBER, "321");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
@@ -69,7 +71,7 @@ public void testModifyObjectSetAdditionalNameFalse() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class,
-                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, "Jackie");
+                        MappingTestEvaluator.USER_OLD_OID, UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_EMPLOYEE_NUMBER, "321");
 
         PrismObject<UserType> userOld = evaluator.getUserOld();

diff --git a/...el-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java b/...el-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java
@@ -63,7 +63,7 @@ public void testControlReplaceSingleValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "321");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
@@ -101,7 +101,7 @@ public void testControlReplaceMultiValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "991", "992");
 
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =
@@ -137,7 +137,7 @@ public void testReplaceMixedMultiValue() throws Exception {
 
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, MappingTestEvaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Jackie");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Jackie"));
         delta.addModificationReplaceProperty(UserType.F_SUBTYPE, "X91", "992", "Y93", "994");
 
         String shortTestName = getTestNameShort();

diff --git a/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java b/...on/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
@@ -292,7 +292,7 @@ public void testScriptSystemVariablesConditionTrueToFalse(String filename) throw
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
-                        evaluator.toPath("name"), "Jack");
+                        evaluator.toPath("name"), PolyString.fromOrig("Jack"));
         delta.addModificationDeleteProperty(evaluator.toPath("subtype"), "CAPTAIN");
 
         String shortTestName = getTestNameShort();
@@ -501,7 +501,7 @@ public void testNpeFalseToTrue() throws Exception {
         // GIVEN
         ObjectDelta<UserType> delta = evaluator.getPrismContext().deltaFactory().object()
                 .createModificationReplaceProperty(UserType.class, evaluator.USER_OLD_OID,
-                        UserType.F_ADDITIONAL_NAME, "Captain Sparrow");
+                        UserType.F_ADDITIONAL_NAME, PolyString.fromOrig("Captain Sparrow"));
 
         String shortTestName = getTestNameShort();
         MappingImpl<PrismPropertyValue<PolyString>, PrismPropertyDefinition<PolyString>> mapping =

diff --git a/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java b/...ntest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
@@ -12,6 +12,7 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.evolveum.midpoint.prism.PrismContainer;
@@ -1761,7 +1762,7 @@ public void test314RemovePasswordFail() throws Exception {
     private void setPasswordMinOccurs(Integer value, Task task, OperationResult result) throws CommonException {
         ObjectDelta<SecurityPolicyType> delta = prismContext.deltaFor(SecurityPolicyType.class)
                 .item(SecurityPolicyType.F_CREDENTIALS, CredentialsPolicyType.F_PASSWORD, PasswordCredentialsPolicyType.F_MIN_OCCURS)
-                .replace(value)
+                .replace(value != null ? value.toString() : null)
                 .asObjectDelta(getSecurityPolicyOid());
         executeChanges(delta, null, task, result);
     }

diff --git a/pom.xml b/pom.xml
@@ -1306,7 +1306,7 @@
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-archiver</artifactId>
-                <version>4.2.5</version>
+                <version>4.8.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId> <!-- We do not want multiple SLF4J implementations -->