search filter fix

Evolveum · Feb 16, 2022 · 18a8496 · 18a8496
1 parent d965443
commit 18a8496
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -186,11 +186,11 @@ public Search<C> load() {
                     search = storage.getSearch();
                 }
 
-                if (search == null
+                if (search == null || search.isTypeChanged()) {
 //                ||
 //                        (!SearchBoxModeType.ADVANCED.equals(search.getSearchMode()) && !search.getItems().containsAll(newSearch.getItems()))
 //                        || search.isTypeChanged()
-                        ) {
+//                        ) {
                     search = newSearch;
 //                    search.searchWasReload();
                 }
@@ -1106,7 +1106,6 @@ protected Collection<SelectorOptions<GetOperationOptions>> getOptions(){
 
     public void refreshTable(AjaxRequestTarget target) {
         BoxedTablePanel<PO> table = getTable();
-        //todo implement isTypeChanged for new search
         if (searchModel.getObject().isTypeChanged()){
             resetTable(target);
         } else {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java
@@ -66,7 +66,6 @@ public enum PanelType {
         MEMBER_PANEL,
     }
 
-    private SearchBoxModeType searchMode;
     private List<SearchBoxModeType> allowedSearchType = new ArrayList<>();
 
     private String advancedQuery;
@@ -123,6 +122,7 @@ public String getAdvancedQuery() {
     }
 
     private ObjectFilter createAdvancedObjectFilter(PrismContext ctx) throws SchemaException {
+        SearchBoxModeType searchMode = searchConfigModel.getObject().getSearchBoxMode();
         if (SearchBoxModeType.ADVANCED.equals(searchMode)) {
             if (StringUtils.isEmpty(advancedQuery)) {
                 return null;
@@ -179,6 +179,7 @@ public ObjectQuery createObjectQuery(VariablesMap variables, PageBase pageBase)
     public ObjectQuery createObjectQuery(VariablesMap variables, PageBase pageBase, ObjectQuery customizeContentQuery) {
         LOGGER.debug("Creating query from {}", this);
         ObjectQuery query;
+        SearchBoxModeType searchMode = searchConfigModel.getObject().getSearchBoxMode();
         if (SearchBoxModeType.OID.equals(getSearchMode())) {
             query = createObjectQueryOid(pageBase);
         } else {

diff --git a/...n/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java b/...n/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
@@ -172,8 +172,7 @@ protected boolean isUseObjectCounting() {
 
     @Override
     protected Search createSearch() {
-//        return SearchFactory.createSearch(ShadowType.class, getPageBase());
-        return null;
+        return SearchFactory.createSearchNew(ShadowType.class, getPageBase());
     }
 
     @Override