MID-8147: fix for updating of autocomplete field

Evolveum · Oct 4, 2022 · 5ea6615 · 5ea6615
1 parent 780aff6
commit 5ea6615
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java
@@ -16,8 +16,10 @@
 import javax.xml.namespace.QName;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.IConverter;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteTextPanel;
@@ -85,6 +87,12 @@ public void setObject(DisplayableValue<T> object) {
             return new AutoCompleteTextPanel<>(panelCtx.getComponentId(), panelCtx.getRealValueModel(), panelCtx.getTypeClass(), false) {
                 @Override
                 public Iterator<T> getIterator(String input) {
+                    if (StringUtils.isNotEmpty(input)) {
+                        IConverter<T> converter = getConverter(panelCtx.getTypeClass());
+                        return choices.stream()
+                                .filter(choice -> converter.convertToString(choice, getLocale()).contains(input))
+                                .collect(Collectors.toList()).iterator();
+                    }
                     return choices.iterator();
                 }
             };

diff --git a/...veum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismPropertyValuePanel.java b/...veum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPrismPropertyValuePanel.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -24,6 +25,7 @@
 
 public class VerticalFormPrismPropertyValuePanel<T> extends PrismPropertyValuePanel<T> {
 
+    private final static String INVALID_FIELD_CLASS = "is-invalid";
 
     public VerticalFormPrismPropertyValuePanel(String id, IModel<PrismPropertyValueWrapper<T>> model, ItemPanelSettings settings) {
         super(id, model, settings);
@@ -37,7 +39,7 @@ protected void onInitialize() {
             FormComponent baseFormComponent = ((InputPanel) valuePanel).getBaseFormComponent();
             baseFormComponent.add(AttributeAppender.append("class", () -> {
                 if (baseFormComponent.hasErrorMessage()) {
-                    return "is-invalid";
+                    return INVALID_FIELD_CLASS;
                 }
                 return "";
             }));
@@ -72,7 +74,10 @@ protected AjaxEventBehavior createEventBehavior() {
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
-                updateFeedbackPanel(target);
+                String cssClass = getCssClassForValueContainer();
+                if (StringUtils.isNotEmpty(cssClass) && cssClass.contains(INVALID_FIELD_CLASS)) {
+                    updateFeedbackPanel(target);
+                }
             }
 
             @Override