members search items visibility

Evolveum · Jan 10, 2022 · 7841407 · 7841407
1 parent fc18c15
commit 7841407
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 42 deletions.
diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -408,6 +408,12 @@ private SearchBoxConfigurationType createSearchConfig() {
         relationConfig.getSupportedRelations().addAll(getSupportedRelations());
         searchConfig.setRelationConfiguration(relationConfig);
 
+        SearchBoxConfigurationHelper searchBoxCofig = new SearchBoxConfigurationHelper(searchConfig);
+        searchConfig.setScopeConfiguration(searchBoxCofig.getDefaultSearchScopeConfiguration());
+        searchConfig.setProjectConfiguration(searchBoxCofig.getDefaultProjectConfiguration());
+        searchConfig.setIndirectConfiguration(searchBoxCofig.getDefaultIndirectConfiguration());
+        searchConfig.setTenantConfiguration(searchBoxCofig.getDefaultTenantConfiguration());
+
         return searchConfig;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
@@ -407,9 +407,9 @@ private static <C extends Containerable> com.evolveum.midpoint.web.component.sea
         if (searchItemWrappers != null) {
             searchConfigurationWrapper.getItemsList().addAll((List<AbstractSearchItemWrapper>)searchItemWrappers);
         }
-        if (Search.PanelType.MEMBER_PANEL.equals(panelType)) {
-            searchConfigurationWrapper.getItemsList().addAll(createAbstractRoleSearchItemWrapperList(searchConfigurationWrapper));
-        }
+//        if (Search.PanelType.MEMBER_PANEL.equals(panelType)) {
+//            searchConfigurationWrapper.getItemsList().addAll(createAbstractRoleSearchItemWrapperList(searchConfigurationWrapper));
+//        }
         com.evolveum.midpoint.web.component.search.refactored.Search search =
                 new com.evolveum.midpoint.web.component.search.refactored.Search(Model.of(searchConfigurationWrapper));
         return search;
@@ -437,30 +437,24 @@ private static <C extends Containerable> void createSearchItemWrapperList(Class<
             OidSearchItemWrapper oidWrapper = new OidSearchItemWrapper();
             searchConfigWrapper.addSearchItem(oidWrapper);
         }
-//                if (config.getScopeConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getScopeConfiguration()));
-//                }
-//                if (config.getObjectTypeConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getObjectTypeConfiguration()));
-//                }
-//                if (config.getRelationConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getRelationConfiguration()));
-//                }
-//                if (config.getIndirectConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getIndirectConfiguration()));
-//                }
-//                if (config.getProjectConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getProjectConfiguration()));
-//                }
-//                if (config.getTenantConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getTenantConfiguration()));
-//                }
-//                if (config.getIndirectConfiguration() != null) {
-//                    itemsList.add(new SpecialSearchItemWrapper<>(config.getIndirectConfiguration()));
-//                }
-//                if (config.getAllowedMode().contains(SearchBoxModeType.OID)) {
-//                    itemsList.add(new OidSearchItemWrapper());
-//                }
+        if (config.getScopeConfiguration() != null) {
+            searchConfigWrapper.addSearchItem(new ScopeSearchItemWrapper(searchConfigWrapper));
+        }
+//        if (config.getObjectTypeConfiguration() != null) {
+//            searchConfigWrapper.addSearchItem(new ScopeSearchItemWrapper(searchConfigWrapper));
+//        }
+        if (config.getRelationConfiguration() != null) {
+            searchConfigWrapper.addSearchItem(new RelationSearchItemWrapper(searchConfigWrapper));
+        }
+        if (config.getIndirectConfiguration() != null) {
+            searchConfigWrapper.addSearchItem(new IndirectSearchItemWrapper(searchConfigWrapper));
+        }
+        if (config.getProjectConfiguration() != null) {
+            searchConfigWrapper.addSearchItem(new ProjectSearchItemWrapper(searchConfigWrapper));
+        }
+        if (config.getTenantConfiguration() != null) {
+            searchConfigWrapper.addSearchItem(new TenantSearchItemWrapper(searchConfigWrapper));
+        }
         //todo what to do with defaultScope and defaultObjectType?
 
     }

diff --git a/...java/com/evolveum/midpoint/web/component/search/refactored/IndirectSearchItemWrapper.java b/...java/com/evolveum/midpoint/web/component/search/refactored/IndirectSearchItemWrapper.java
@@ -61,4 +61,8 @@ public String getTitle() {
         return ""; //todo
     }
 
+    @Override
+    public boolean isApplyFilter() {
+        return true;
+    }
 }
diff --git a/.../java/com/evolveum/midpoint/web/component/search/refactored/ProjectSearchItemWrapper.java b/.../java/com/evolveum/midpoint/web/component/search/refactored/ProjectSearchItemWrapper.java
@@ -12,6 +12,8 @@
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxScopeType;
+
 import org.apache.commons.lang3.StringUtils;
 
 public class ProjectSearchItemWrapper extends AbstractRoleSearchItemWrapper{
@@ -66,4 +68,9 @@ public String getHelp() {
     public String getTitle() {
         return ""; //todo
     }
+
+    @Override
+    public boolean isApplyFilter() {
+        return true;
+    }
 }
diff --git a/...java/com/evolveum/midpoint/web/component/search/refactored/RelationSearchItemWrapper.java b/...java/com/evolveum/midpoint/web/component/search/refactored/RelationSearchItemWrapper.java
@@ -6,13 +6,18 @@
  */
 package com.evolveum.midpoint.web.component.search.refactored;
 
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.util.DisplayableValue;
-import com.evolveum.midpoint.web.component.search.SearchValue;
+import javax.xml.namespace.QName;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxConfigurationType;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxScopeType;
 
 import org.apache.commons.collections4.CollectionUtils;
 
-import javax.xml.namespace.QName;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.util.DisplayableValue;
+import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ScopeSearchItemConfigurationType;
 
 public class RelationSearchItemWrapper extends AbstractRoleSearchItemWrapper {
 
@@ -62,9 +67,8 @@ public String getTitle() {
         return ""; //todo
     }
 
-//    @Override
-//            public boolean isApplyFilter() {
-//                return !memberPanelStorage.isSearchScopeVisible()
-//                        || !memberPanelStorage.isSearchScope(SearchBoxScopeType.SUBTREE);
-//            }
+    @Override
+    public boolean isApplyFilter() {
+        return !getSearchConfig().getScope().equals(SearchBoxScopeType.SUBTREE);
+    }
 }
diff --git a/...in/java/com/evolveum/midpoint/web/component/search/refactored/ScopeSearchItemWrapper.java b/...in/java/com/evolveum/midpoint/web/component/search/refactored/ScopeSearchItemWrapper.java
@@ -9,6 +9,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.web.component.search.SearchValue;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ScopeSearchItemConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxScopeType;
 
 import javax.xml.namespace.QName;
@@ -61,8 +62,10 @@ public String getTitle() {
         return ""; //todo
     }
 
-//    public boolean isApplyFilter() {
-//        return  getScopeConfig() != null && getScopeConfig().getDefaultValue() == SearchBoxScopeType.SUBTREE;
-//    }
+    @Override
+    public boolean isApplyFilter() {
+        ScopeSearchItemConfigurationType config = getSearchConfig().getConfig().getScopeConfiguration();
+        return  config != null && config.getDefaultValue() == SearchBoxScopeType.SUBTREE;
+    }
 
 }
diff --git a/...n/java/com/evolveum/midpoint/web/component/search/refactored/TenantSearchItemWrapper.java b/...n/java/com/evolveum/midpoint/web/component/search/refactored/TenantSearchItemWrapper.java
@@ -60,8 +60,9 @@ public String getTitle() {
         return ""; //todo
     }
 
-//    public boolean isApplyFilter() {
-//        return  getScopeConfig() != null && getScopeConfig().getDefaultValue() == SearchBoxScopeType.SUBTREE;
-//    }
+    public boolean isApplyFilter() {
+        return  getSearchConfig().getConfig().getScopeConfiguration() != null
+                && SearchBoxScopeType.SUBTREE.equals(getSearchConfig().getConfig().getScopeConfiguration().getDefaultValue());
+    }
 
 }
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
@@ -352,6 +352,12 @@ private SearchBoxConfigurationType createSearchConfig() {
         relationConfig.getSupportedRelations().addAll(getSupportedRelations());
         searchConfig.setRelationConfiguration(relationConfig);
 
+        SearchBoxConfigurationHelper searchBoxCofig = new SearchBoxConfigurationHelper(searchConfig);
+        searchConfig.setScopeConfiguration(searchBoxCofig.getDefaultSearchScopeConfiguration());
+        searchConfig.setProjectConfiguration(searchBoxCofig.getDefaultProjectConfiguration());
+        searchConfig.setIndirectConfiguration(searchBoxCofig.getDefaultIndirectConfiguration());
+        searchConfig.setTenantConfiguration(searchBoxCofig.getDefaultTenantConfiguration());
+
         return searchConfig;
     }