Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Mar 7, 2023 · a5d2462 · a5d2462
2 parents 5c5cda8 + cc82df3
commit a5d2462
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/BasicSearchPanel.java b/...src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/BasicSearchPanel.java
@@ -18,7 +18,6 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.impl.component.button.SelectableItemListPopoverPanel;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.FilterableSearchItemWrapper;
-import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.util.exception.SystemException;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
@@ -123,7 +122,7 @@ public void onClick(AjaxRequestTarget target) {
                 popoverPanel.togglePopover(target);
             }
         };
-        more.add(new VisibleBehaviour(() -> CollectionUtils.isNotEmpty(morePopupModel.getObject())));
+        more.add(new VisibleBehaviour(this::morePopupPropertyListIsNotEmpty));
         more.setOutputMarkupId(true);
         add(more);
     }
@@ -163,4 +162,9 @@ private void addItemPerformed(List<FilterableSearchItemWrapper<?>> itemList, Aja
         target.add(getParent());
     }
 
+    private boolean morePopupPropertyListIsNotEmpty() {
+        return CollectionUtils.isNotEmpty(morePopupModel.getObject()) &&
+                morePopupModel.getObject().stream().anyMatch(property -> !property.isVisible());
+    }
+
 }