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

Evolveum · Sep 7, 2022 · 618988a · 618988a
2 parents ccc320c + f6ac5b1
commit 618988a
Show file tree

Hide file tree

Showing 62 changed files with 1,005 additions and 954 deletions.
diff --git a/dist/src/main/bin/midpoint.sh b/dist/src/main/bin/midpoint.sh
diff --git a/gui/admin-gui/src/frontend/_to-remove/less/midpoint-theme.less b/gui/admin-gui/src/frontend/_to-remove/less/midpoint-theme.less
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -530,7 +530,7 @@ th.cog, td.cog {
 
 // Datables/lists (BoxedTablePanel)
 .boxed-table {
-	//margin-bottom: 0px;  //TODO: is this really neccessary?
+	//margin-bottom: 0px;  //TODO: is this really necessary?
 
 	&.without-box-header-top-border {
 		border-top: 0px;
@@ -2309,4 +2309,4 @@ li.navigation-details > a > span.pull-right-container {
   > small.label {
     line-height: @line-height-base !important;
   }
-}
+}
diff --git a/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AppenderAutocompletePanel.java b/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AppenderAutocompletePanel.java
@@ -12,7 +12,6 @@
 
 import org.apache.wicket.model.IModel;
 
-import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
@@ -37,7 +36,7 @@ public AppenderAutocompletePanel(String id, IModel<String> model, IModel<PrismPr
 
     @Override
     public Iterator<String> getIterator(String input) {
-        return WebComponentUtil.prepareAutoCompleteList(getLookupTable(), input, ((PageBase) getPage()).getLocalizationService()).iterator();
+        return WebComponentUtil.prepareAutoCompleteList(getLookupTable(), input).iterator();
     }
 
     @Override

diff --git a/...com/evolveum/midpoint/gui/api/component/autocomplete/LoggingPackageAutocompletePanel.java b/...com/evolveum/midpoint/gui/api/component/autocomplete/LoggingPackageAutocompletePanel.java
@@ -13,7 +13,6 @@
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.wicket.model.IModel;
 
-import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.configuration.component.ComponentLoggerType;
 import com.evolveum.midpoint.gui.impl.page.admin.configuration.component.StandardLoggerType;
@@ -31,7 +30,7 @@ public LoggingPackageAutocompletePanel(String id, IModel<String> model) {
 
     @Override
     public Iterator<String> getIterator(String input) {
-        return WebComponentUtil.prepareAutoCompleteList(getLookupTable(), input, ((PageBase) getPage()).getLocalizationService()).iterator();
+        return WebComponentUtil.prepareAutoCompleteList(getLookupTable(), input).iterator();
     }
 
     @Override

diff --git a/...in/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupAutocompletePanel.java b/...in/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupAutocompletePanel.java
@@ -11,25 +11,21 @@
 
 import org.apache.wicket.model.IModel;
 
-import com.evolveum.midpoint.common.LocalizationService;
-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;
 
 public class LookupAutocompletePanel<T> extends AutoCompleteTextPanel<T> {
 
-
     public LookupAutocompletePanel(String id, IModel<T> model, Class<T> type, boolean strict, String lookupTableOid) {
         super(id, model, type, strict, lookupTableOid);
     }
 
     @Override
     public Iterator<T> getIterator(String input) {
-        return (Iterator<T>) prepareAutoCompleteList(input, getLookupTable(), ((PageBase) getPage()).getLocalizationService()).iterator();
+        return (Iterator<T>) prepareAutoCompleteList(input, getLookupTable()).iterator();
     }
 
-    protected List<String> prepareAutoCompleteList(String input, LookupTableType lookupTable, LocalizationService localizationService) {
-        return WebComponentUtil.prepareAutoCompleteList(lookupTable, input, localizationService);
+    protected List<String> prepareAutoCompleteList(String input, LookupTableType lookupTable) {
+        return WebComponentUtil.prepareAutoCompleteList(lookupTable, input);
     }
-
 }
diff --git a/.../main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableConverter.java b/.../main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableConverter.java
@@ -6,25 +6,17 @@
  */
 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.gui.api.util.WebModelServiceUtils;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.GetOperationOptions;
-import com.evolveum.midpoint.schema.SelectorOptions;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
+import java.util.Locale;
 
 import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 
-import java.util.Collection;
-import java.util.Locale;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
 
 /**
  * @author skublik
@@ -49,12 +41,11 @@ public LookupTableConverter(IConverter<C> originConverter, String lookupTableOid
     public C convertToObject(String value, Locale locale) throws ConversionException {
         LookupTableType lookupTable = getLookupTable();
         for (LookupTableRowType row : lookupTable.getRow()) {
-            if (value.equals(row.getKey())
-                    || value.equals(WebComponentUtil.getLocalizedOrOriginPolyStringValue(row.getLabel() != null ? row.getLabel().toPolyString() : null))) {
-
+            if (value.equals(row.getKey()) || value.equals(WebComponentUtil.translateLabel(lookupTableOid, row))) {
                 return originConverter.convertToObject(row.getKey(), locale);
             }
         }
+
         boolean differentValue = true;
         if (baseComponent != null && baseComponent.getDefaultModelObject() != null
                 && baseComponent.getDefaultModelObject().equals(value)) {
@@ -66,7 +57,6 @@ public C convertToObject(String value, Locale locale) throws ConversionException
         }
 
         return originConverter.convertToObject(value, locale);
-
     }
 
     @Override
@@ -75,7 +65,7 @@ public String convertToString(C key, Locale arg1) {
         if (lookupTable != null) {
             for (LookupTableRowType row : lookupTable.getRow()) {
                 if (key.toString().equals(row.getKey())) {
-                    return WebComponentUtil.getLocalizedOrOriginPolyStringValue(row.getLabel() != null ? row.getLabel().toPolyString() : null);
+                    return WebComponentUtil.translateLabel(lookupTableOid, row);
                 }
             }
         }

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
@@ -22,11 +22,10 @@ public LookupTableLabelPanel(String id, IModel<?> model, String lookupTableOid)
     @Override
     public <C> IConverter<C> getConverter(Class<C> type) {
         IConverter<C> originConverter = super.getConverter(type);
-        if (lookupTableOid != null) {
-            LookupTableConverter<C> lookupTableConverter = new LookupTableConverter<C>(originConverter, lookupTableOid, this, true);
-            return lookupTableConverter;
+        if (lookupTableOid == null) {
+            return originConverter;
         }
-        return originConverter;
 
+        return new LookupTableConverter<C>(originConverter, lookupTableOid, this, true);
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -9,6 +9,8 @@
 import java.util.*;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.component.result.MessagePanel;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -1028,4 +1030,10 @@ public PrismObject<? extends FocusType> loadFocusSelf() {
 
         return focus;
     }
+
+    protected MessagePanel createMessagePanel(String panelId, MessagePanel.MessagePanelType type, String message, Object... params) {
+        MessagePanel panel = new MessagePanel(panelId, type,
+                createStringResource(message, params), false);
+        return panel;
+    }
 }
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismPropertyWrapper.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismPropertyWrapper.java
@@ -9,10 +9,6 @@
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;
-import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
-
-import java.util.Collection;
 
 /**
  * @author katka