report search fix

Evolveum · Feb 8, 2022 · 325ed6d · 325ed6d
1 parent c2c10da
commit 325ed6d
Showing 1 changed file with 48 additions and 9 deletions.
diff --git a/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java b/...n/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java
@@ -3,6 +3,7 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.ContainerableListPanel;
+import com.evolveum.midpoint.gui.impl.component.search.SearchConfigurationWrapper;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.model.common.util.DefaultColumnUtils;
 import com.evolveum.midpoint.prism.Containerable;
@@ -35,6 +36,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
+import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -51,6 +54,7 @@
 
 public class ReportObjectsListPanel<C extends Containerable> extends ContainerableListPanel<C, SelectableBean<C>> {
 
+    private static final long serialVersionUID = 1L;
     private static final Trace LOGGER = TraceManager.getTrace(ReportObjectsListPanel.class);
 
     private final IModel<ReportType> report;
@@ -133,7 +137,8 @@ protected boolean isCollectionViewPanel() {
 
     @Override
     protected ISelectableDataProvider<C, SelectableBean<C>> createProvider() {
-        SelectableBeanContainerDataProvider<C> provider = new SelectableBeanContainerDataProvider<>(this, getSearchModel(), null, false) {
+        SelectableBeanContainerDataProvider<C> provider = new SelectableBeanContainerDataProvider<C>(this, getSearchModel(), null, false) {
+            private static final long serialVersionUID = 1L;
 
             @Override
             public List<SelectableBean<C>> createDataObjectWrappers(Class<? extends C> type, ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult result)
@@ -247,22 +252,56 @@ private void processVariables(VariablesMap variablesMap) {
 
     @Override
     protected SearchFormPanel initSearch(String headerId) {
-//        return new SearchFormPanel<>(headerId, getSearchModel()) {
-//            @Override
-//            protected void searchPerformed(AjaxRequestTarget target) {
-//                refreshTable(target);
-//            }
-//        };
+        return new SearchFormPanel(headerId, getSearchModel()) {
+            private static final long serialVersionUID = 1L;
 
-        return null;
+            @Override
+            protected void searchPerformed(AjaxRequestTarget target) {
+                refreshTable(target);
+            }
+        };
     }
 
     @Override
     protected Search createSearch(Class<C> type) {
 //        return SearchFactory.createSearchForReport(type,
 //                getReport().getObjectCollection() == null ? Collections.emptyList() : getReport().getObjectCollection().getParameter(),
 //                getPageBase());
-        return null;
+        return SearchFactory.createSearch(createSearchConfigurationWrapper(type), getPageBase());
+    }
+
+    private SearchConfigurationWrapper<C> createSearchConfigurationWrapper(Class<C> type) {
+        SearchBoxConfigurationType searchBoxConfiguration = new SearchBoxConfigurationType();
+        searchBoxConfiguration.setDefaultMode(SearchBoxModeType.BASIC);
+        searchBoxConfiguration.getAllowedMode().add(SearchBoxModeType.BASIC);
+        searchBoxConfiguration.setAllowToConfigureSearchItems(false);
+
+        List<SearchFilterParameterType> parameters = getReport().getObjectCollection() == null ?
+                Collections.emptyList() : getReport().getObjectCollection().getParameter();
+        List<SearchItemType> searchItems = new ArrayList<>();
+        parameters.forEach(parameter -> {
+            SearchItemType searchItemType = new SearchItemType();
+            searchItemType.setParameter(parameter);
+            searchItemType.setVisibleByDefault(true);
+            if (parameter.getDisplay() != null) {
+                if (parameter.getDisplay().getLabel() != null) {
+                    searchItemType.setDisplayName(parameter.getDisplay().getLabel());
+                } else {
+                    searchItemType.setDisplayName(new PolyStringType(parameter.getName()));
+                }
+                if (parameter.getDisplay().getHelp() != null) {
+                    searchItemType.setDescription(
+                            getPageBase().getLocalizationService().translate(parameter.getDisplay().getHelp().toPolyString()));
+                }
+            }
+            searchItems.add(searchItemType);
+        });
+
+        SearchItemsType searchItemsType = new SearchItemsType();
+        searchItemsType.createSearchItemList().addAll(searchItems);
+        searchBoxConfiguration.setSearchItems(searchItemsType);
+
+        return new SearchConfigurationWrapper<>(type, searchBoxConfiguration);
     }
 
     @Override