oid panel visibility

Evolveum · Dec 15, 2021 · af19f61 · af19f61
1 parent d7f5ef9
commit af19f61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchPanel.java
@@ -281,11 +281,13 @@ protected void initSearchItemsPanel(RepeatingView searchItemsRepeatingView) {
                 && getModelObject().getSearchType().equals(SearchBoxModeType.FULLTEXT)));
         searchItemsRepeatingView.add(fulltextSearchFragment);
 
-        OidSearchFragment oidSearchFragment = new OidSearchFragment(searchItemsRepeatingView.newChildId(), ID_OID_SEARCH_FRAGMENT,
-                AbstractSearchPanel.this);
-        oidSearchFragment.setOutputMarkupId(true);
-        oidSearchFragment.add(new VisibleBehaviour(() -> getModelObject().findOidSearchItem() != null && getModelObject().getSearchType().equals(SearchBoxModeType.OID)));
-        searchItemsRepeatingView.add(oidSearchFragment);
+        if (getModelObject().isOidSearchItemPresent()) {
+            OidSearchFragment oidSearchFragment = new OidSearchFragment(searchItemsRepeatingView.newChildId(), ID_OID_SEARCH_FRAGMENT,
+                    AbstractSearchPanel.this);
+            oidSearchFragment.setOutputMarkupId(true);
+            oidSearchFragment.add(new VisibleBehaviour(() -> getModelObject().getSearchType().equals(SearchBoxModeType.OID)));
+            searchItemsRepeatingView.add(oidSearchFragment);
+        }
     }
 
     private CompositedIcon getSubmitSearchButtonBuilder() {
@@ -903,7 +905,7 @@ public OidSearchFragment(String id, String markupId, AbstractSearchPanel markupP
 
         private void initOidSearchLayout() {
             OidSearchItem item = getModelObject().findOidSearchItem();
-            add(item != null ? item.createSearchItemPanel(ID_OID_ITEM) : new WebMarkupContainer(ID_OID_ITEM));
+            add(item.createSearchItemPanel(ID_OID_ITEM));
         }
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
@@ -361,7 +361,7 @@ public ContainerTypeSearchItem<C> getType() {
     }
 
     public OidSearchItem findOidSearchItem() {
-        List<SearchItem> oidItems = itemsModel.getObject().stream().filter(item -> item instanceof OidSearchItem)
+        List<SearchItem> oidItems = specialItems.stream().filter(item -> item instanceof OidSearchItem)
                 .collect(Collectors.toList());
         return CollectionUtils.isNotEmpty(oidItems) ? (OidSearchItem)oidItems.get(0) : null;
     }
@@ -961,7 +961,7 @@ public boolean isAllowedSearchMode(SearchBoxModeType searchBoxModeType){
         return !SearchBoxModeType.OID.equals(searchBoxModeType) || isOidSearchItemPresent();
     }
 
-    private boolean isOidSearchItemPresent() {
+    public boolean isOidSearchItemPresent() {
         return CollectionUtils.isNotEmpty(allDefinitions.stream().filter(def -> def instanceof OidSearchItemDefinition)
                 .collect(Collectors.toList()));
     }