MID-9150: fix visible for seletion of relation in assign member panel

Evolveum · Sep 29, 2023 · 3ac1d18 · 3ac1d18
1 parent 50dde63
commit 3ac1d18
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
@@ -349,7 +349,7 @@ protected QName getDefaultRelation() {
             @Override
             protected boolean isVisibleParameterPanel() {
                 if (getRelationIfIsStable() == null) {
-                    super.isVisibleParameterPanel();
+                    return super.isVisibleParameterPanel();
                 }
                 return false;
             }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
@@ -80,27 +80,14 @@ private AbstractRoleSearchItemWrapper getMemberSearchItem() {
     protected void initParametersPanel(Fragment parametersPanel) {
         RelationDropDownChoice relation = new RelationDropDownChoice(ID_RELATION, getDefaultRelation(),
                 getSupportedRelations(), false);
-        relation.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return CollectionUtils.isNotEmpty(getSupportedRelations());
-            }
-
-            @Override
-            public boolean isEnabled() {
-                return CollectionUtils.isNotEmpty(getSupportedRelations())
-                        && getSupportedRelations().size() > 1;
-            }
-        });
         parametersPanel.add(relation);
-
-        parametersPanel.add(new VisibleBehaviour(() -> isVisibleParameterPanel()));
+        parametersPanel.add(new VisibleEnableBehaviour(
+                () -> isVisibleParameterPanel(),
+                () -> CollectionUtils.isNotEmpty(getSupportedRelations()) && getSupportedRelations().size() > 1));
     }
 
     protected boolean isVisibleParameterPanel() {
-        return getSupportedRelations().size() > 1;
+        return CollectionUtils.isNotEmpty(getSupportedRelations());
     }
 
     protected QName getDefaultRelation() {

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/panel/RelationSearchItemPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/panel/RelationSearchItemPanel.java
@@ -13,6 +13,7 @@
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.RelationSearchItemWrapper;
 import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 import com.evolveum.midpoint.prism.PrismConstants;
+import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.util.PolyStringUtils;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
@@ -23,6 +24,9 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.model.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class RelationSearchItemPanel extends SingleSearchItemPanel<RelationSearchItemWrapper> {
 
     public RelationSearchItemPanel(String id, IModel<RelationSearchItemWrapper> searchItemModel) {
@@ -31,9 +35,25 @@ public RelationSearchItemPanel(String id, IModel<RelationSearchItemWrapper> sear
 
     @Override
     protected Component initSearchItemField(String id) {
-        DropDownChoicePanel inputPanel = new DropDownChoicePanel(id,
+
+        IModel<List<QName>> choices;
+        if (getModel().getObject().getSupportedRelations().size() < 2) {
+            choices = new PropertyModel<>(getModel(), RelationSearchItemWrapper.F_SUPPORTED_RELATIONS);
+        } else {
+            choices = () -> {
+                List<QName> list = new ArrayList<>();
+                list.add(PrismConstants.Q_ANY);
+                list.addAll(getModel().getObject().getSupportedRelations());
+                return list;
+            };
+        }
+
+        DropDownChoicePanel inputPanel = new DropDownChoicePanel(
+                id,
                 new PropertyModel(getModel(), RelationSearchItemWrapper.F_VALUE),
-                new PropertyModel<>(getModel(), RelationSearchItemWrapper.F_SUPPORTED_RELATIONS), new RelationChoiceRenderer() , false);
+                choices,
+                new RelationChoiceRenderer() ,
+                false);
         return inputPanel;
     }