Merge remote-tracking branch 'origin/master' into tmp/feature-perf

Evolveum · May 12, 2021 · 6a1f267 · 6a1f267
2 parents 35886a3 + 02c8781
commit 6a1f267
Show file tree

Hide file tree

Showing 229 changed files with 8,116 additions and 3,923 deletions.
diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -24,11 +24,11 @@
     <properties>
         <!-- see notes in main midPoint POM -->
         <!--  MID-5666: For some reason deploying of javadoc was disabled -->
-        <!--  
+        <!--
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.test.skip>true</maven.test.skip>
         -->
+        <maven.test.skip>true</maven.test.skip>
     </properties>
 
     <dependencies>

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
@@ -113,7 +113,7 @@ protected ObjectQuery addFilterToContentQuery() {
         Task task = getPageBase().createSimpleTask(OPERATION_LOAD_ASSIGNABLE_ROLES);
         OperationResult result = task.getResult();
 
-        ObjectFilter filter = WebComponentUtil.getAssignableRolesFilter(getTargetedAssignemntObject(), getObjectType().getClassDefinition(),
+        ObjectFilter filter = WebComponentUtil.getAssignableRolesFilter(getTargetedAssignmentObject(), getObjectType().getClassDefinition(),
                 isInducement() ? WebComponentUtil.AssignmentOrder.INDUCEMENT : WebComponentUtil.AssignmentOrder.ASSIGNMENT, result, task, getPageBase());
         return getPrismContext().queryFactory().createQuery(filter);
     }
@@ -126,7 +126,7 @@ protected boolean isInducement() {
         return false;
     }
 
-    protected <O extends FocusType> PrismObject<O> getTargetedAssignemntObject() {
+    protected <O extends FocusType> PrismObject<O> getTargetedAssignmentObject() {
         PrismContainerWrapper<AssignmentType> assignmentWrapper = getAssignmentWrapperModel();
         if (assignmentWrapper == null) {
             return null;

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -23,17 +23,6 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
-import com.evolveum.midpoint.gui.api.prism.wrapper.*;
-import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismReferenceValueWrapperImpl;
-import com.evolveum.midpoint.schema.expression.VariablesMap;
-import com.evolveum.midpoint.schema.util.task.TaskPartProgressInformation;
-import com.evolveum.midpoint.schema.util.task.TaskProgressInformation;
-import com.evolveum.midpoint.schema.util.task.TaskWorkStateUtil;
-import com.evolveum.midpoint.web.component.data.SelectableBeanContainerDataProvider;
-import com.evolveum.midpoint.web.page.admin.server.dto.ApprovalOutcomeIcon;
-import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.*;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -82,14 +71,17 @@
 import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.model.NonEmptyModel;
+import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyValueModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.prism.wrapper.*;
 import com.evolveum.midpoint.gui.impl.GuiChannel;
 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.icon.LayeredIconCssStyle;
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismReferenceValueWrapperImpl;
 import com.evolveum.midpoint.model.api.*;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
@@ -114,10 +106,14 @@
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.constants.RelationTypes;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.schema.expression.VariablesMap;
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.schema.util.*;
+import com.evolveum.midpoint.schema.util.task.TaskPartProgressInformation;
+import com.evolveum.midpoint.schema.util.task.TaskProgressInformation;
+import com.evolveum.midpoint.schema.util.task.TaskWorkStateUtil;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.task.api.Task;
@@ -135,6 +131,7 @@
 import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageClass;
 import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance;
 import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
+import com.evolveum.midpoint.web.component.data.SelectableBeanContainerDataProvider;
 import com.evolveum.midpoint.web.component.data.Table;
 import com.evolveum.midpoint.web.component.data.column.ColumnMenuAction;
 import com.evolveum.midpoint.web.component.data.column.ColumnUtils;
@@ -154,6 +151,7 @@
 import com.evolveum.midpoint.web.page.admin.archetype.PageArchetype;
 import com.evolveum.midpoint.web.page.admin.cases.PageCase;
 import com.evolveum.midpoint.web.page.admin.objectCollection.PageObjectCollection;
+import com.evolveum.midpoint.web.page.admin.orgs.PageOrgUnit;
 import com.evolveum.midpoint.web.page.admin.reports.PageReport;
 import com.evolveum.midpoint.web.page.admin.resources.PageResource;
 import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
@@ -163,10 +161,10 @@
 import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
 import com.evolveum.midpoint.web.page.admin.server.PageTask;
 import com.evolveum.midpoint.web.page.admin.server.PageTasks;
+import com.evolveum.midpoint.web.page.admin.server.dto.ApprovalOutcomeIcon;
 import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusPresentationProperties;
 import com.evolveum.midpoint.web.page.admin.services.PageService;
 import com.evolveum.midpoint.web.page.admin.services.PageServices;
-import com.evolveum.midpoint.web.page.admin.orgs.PageOrgUnit;
 import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.midpoint.web.page.admin.users.PageUsers;
 import com.evolveum.midpoint.web.page.admin.valuePolicy.PageValuePolicy;
@@ -185,6 +183,7 @@
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.wf.util.ApprovalUtils;
 import com.evolveum.midpoint.wf.util.ChangesByState;
+import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ExecuteScriptType;
 import com.evolveum.prism.xml.ns._public.query_3.QueryType;
@@ -1551,7 +1550,7 @@ public static PolyStringType createPolyFromOrigString(String str, String key) {
         PolyStringType poly = new PolyStringType();
         poly.setOrig(str);
 
-        if (StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotEmpty(key)) {
             PolyStringTranslationType translation = new PolyStringTranslationType();
             translation.setKey(key);
             poly.setTranslation(translation);
@@ -2321,7 +2320,7 @@ public static <AHT extends AssignmentHolderType> void initNewObjectWithReference
                 // this is needed to successfully pass through security
                 // TODO: fix MID-3234
                 if (ref.getType() != null && OrgType.COMPLEX_TYPE.equals(ref.getType())) {
-                    if(ref.getRelation() == null || pageBase.getRelationRegistry().isStoredIntoParentOrgRef(ref.getRelation())) {
+                    if (ref.getRelation() == null || pageBase.getRelationRegistry().isStoredIntoParentOrgRef(ref.getRelation())) {
                         assignmentHolder.getParentOrgRef().add(ref.clone());
                     }
                 }
@@ -3082,8 +3081,8 @@ public int compare(RelationDefinitionType rD1, RelationDefinitionType rD2) {
                 int int1 = rK1 != null ? rK1.ordinal() : 100;
                 int int2 = rK2 != null ? rK2.ordinal() : 100;
                 int compare = Integer.compare(int1, int2);
-                if (compare == 0){
-                    if(rD1.getDisplay() == null || rD1.getDisplay().getLabel() == null
+                if (compare == 0) {
+                    if (rD1.getDisplay() == null || rD1.getDisplay().getLabel() == null
                             || rD2.getDisplay() == null || rD2.getDisplay().getLabel() == null) {
                         return compare;
                     }
@@ -3108,7 +3107,7 @@ public static List<QName> getCategoryRelationChoices(AreaCategoryType category,
 
     private static RelationKindType getHighestRelationKind(List<RelationKindType> kinds) {
         RelationKindType ret = null;
-        for (RelationKindType kind : kinds){
+        for (RelationKindType kind : kinds) {
             if (ret == null || ret.ordinal() < kind.ordinal()) {
                 ret = kind;
             }
@@ -3780,14 +3779,14 @@ public static <O extends ObjectType> CompositedIcon createCompositeIconForObject
             appendActivationStatus(title, activationStatusIcon, obj, pageBase);
         }
 
-        if (obj instanceof TaskType && TaskWorkStateUtil.isCoordinator((TaskType)obj)) {
+        if (obj instanceof TaskType && TaskWorkStateUtil.isCoordinator((TaskType) obj)) {
             IconType icon = new IconType();
             icon.setCssClass(GuiStyleConstants.CLASS_OBJECT_NODE_ICON_COLORED);
             builder.appendLayerIcon(icon, IconCssStyle.BOTTOM_RIGHT_FOR_COLUMN_STYLE);
             if (title.length() > 0) {
                 title.append("\n");
             }
-            title.append(pageBase.createStringResource(TaskWorkStateUtil.getKind((TaskType)obj)).getString());
+            title.append(pageBase.createStringResource(TaskWorkStateUtil.getKind((TaskType) obj)).getString());
         }
 
         if (StringUtils.isNotEmpty(title.toString())) {
@@ -3827,7 +3826,7 @@ public static CompositedIcon createAccountIcon(ShadowType shadow, PageBase pageB
         }
 
         if (shadow.getResourceRef() != null && shadow.getResourceRef().getObject() != null
-                && !ResourceTypeUtil.isActivationCapabilityEnabled((ResourceType)shadow.getResourceRef().getObject().asObjectable(), null)) {
+                && !ResourceTypeUtil.isActivationCapabilityEnabled((ResourceType) shadow.getResourceRef().getObject().asObjectable(), null)) {
             IconType icon = new IconType();
             icon.setCssClass("fa fa-ban " + GuiStyleConstants.RED_COLOR);
             if (isColumn) {
@@ -3843,7 +3842,7 @@ public static CompositedIcon createAccountIcon(ShadowType shadow, PageBase pageB
         ActivationType activation = shadow.getActivation();
         if (activation == null) {
             builder.setTitle(pageBase.createStringResource("accountIcon.activation.unknown").getString()
-                        + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
+                    + (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
             appendUndefinedIcon(builder);
             return builder.build();
         }
@@ -4037,7 +4036,6 @@ public static DisplayType createDisplayType(OperationResultStatusPresentationPro
         return createDisplayType(OperationIcon.getIcon(), "", OperationIcon.getStatusLabelKey());
     }
 
-
     public static DisplayType createDisplayType(String iconCssClass, String iconColor, String title) {
         DisplayType displayType = new DisplayType();
         IconType icon = new IconType();
@@ -4794,8 +4792,8 @@ public static String getPendingOperationLabel(PendingOperationType realValue, Ba
         return sb.toString();
     }
 
-    public static String getObjectListPageStorageKey(String additionalKeyValue){
-        if (StringUtils.isEmpty(additionalKeyValue)){
+    public static String getObjectListPageStorageKey(String additionalKeyValue) {
+        if (StringUtils.isEmpty(additionalKeyValue)) {
             return null;
         }
         return SessionStorage.KEY_OBJECT_LIST + "." + additionalKeyValue;
@@ -4907,7 +4905,7 @@ public static <I extends Item> PrismObject<LookupTableType> findLookupTable(Pris
         return WebModelServiceUtils.loadObject(LookupTableType.class, lookupTableUid, options, page, task, result);
     }
 
-    public static <AH extends AssignmentHolderType> boolean hasAnyArchetypeAssignemnt(AH assignmentHolder) {
+    public static <AH extends AssignmentHolderType> boolean hasAnyArchetypeAssignment(AH assignmentHolder) {
         if (assignmentHolder.getAssignment() == null) {
             return false;
         }

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -251,7 +251,7 @@ public static String getName(AssignmentType assignment, PageBase pageBase) {
             return sb.toString();
         }
 
-        //TODO fix this.. what do we want to show in the name columns in the case of assignemtnRelation assignemt??
+        //TODO fix this.. what do we want to show in the name columns in the case of assignmentRelation assignment??
         if (assignment.getAssignmentRelation() != null && !assignment.getAssignmentRelation().isEmpty()) {
             for (AssignmentRelationType assignmentRelation : assignment.getAssignmentRelation()) {
                 sb.append("Assignment relation");

diff --git a/...om/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java b/...om/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
@@ -122,6 +122,7 @@ private void initLayout() {
 
         WebMarkupContainer textFieldContainer = new WebMarkupContainer(ID_TEXT_DNS_CONTAINER);
         textFieldContainer.setOutputMarkupId(true);
+        textFieldContainer.add(new VisibleBehaviour(() -> FiledType.QUERY.equals(fieldType)));
         textFieldContainer.add(AttributeAppender.append("class", classGridModel));
         textFieldContainer.add(AttributeAppender.append("style", (IModel<?>) () -> {
             if (FiledType.QUERY.equals(fieldType)) {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskBasicTabPanel.java
@@ -78,7 +78,7 @@ protected void onUpdatePerformed(AjaxRequestTarget target) {
                     return;
                 }
 
-                if (!WebComponentUtil.hasAnyArchetypeAssignemnt(getTask())) {
+                if (!WebComponentUtil.hasAnyArchetypeAssignment(getTask())) {
                     try {
                         PrismContainerWrapper<AssignmentType> archetypeAssignment = TaskBasicTabPanel.this.getModelObject().findContainer(TaskType.F_ASSIGNMENT);
                         PrismContainerValue<AssignmentType> archetypeAssignmentValue = archetypeAssignment.getItem().createNewValue();
@@ -314,7 +314,7 @@ private boolean getBasicTabEditability(ItemPath path) {
     }
 
     private boolean satisfyArchetypeAssignment() {
-        return !WebComponentUtil.hasAnyArchetypeAssignemnt(getTask())
+        return !WebComponentUtil.hasAnyArchetypeAssignment(getTask())
                 || WebComponentUtil.hasArchetypeAssignment(getTask(), SystemObjectsType.ARCHETYPE_SYSTEM_TASK.value())
                 || WebComponentUtil.hasArchetypeAssignment(getTask(), SystemObjectsType.ARCHETYPE_UTILITY_TASK.value());
     }