debug pages search

Evolveum · Mar 15, 2016 · de2ab50 · de2ab50
1 parent aba88eb
commit de2ab50
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
@@ -52,6 +52,8 @@
             </wicket:enclosure>
 
             <div wicket:id="basicSearch"/>
+
+            <div wicket:id="search"/>
         </form>
     </wicket:fragment>
 </wicket:extend>

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -23,6 +23,9 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.web.component.search.Search;
+import com.evolveum.midpoint.web.component.search.SearchFactory;
+import com.evolveum.midpoint.web.component.search.SearchPanel;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -185,6 +188,7 @@ public class PageDebugList extends PageAdminConfiguration {
 	private static final String ID_DELETE_ALL_DIALOG = "confirmDeleteAll";
 	private static final String ID_RESOURCE = "resource";
 	private static final String ID_TABLE_HEADER = "tableHeader";
+	private static final String ID_SEARCH = "search";
 
 	private static final Integer DELETE_LOG_INTERVAL = 50;
 
@@ -204,7 +208,11 @@ public PageDebugList(boolean clearPagingInSession) {
 			@Override
 			protected DebugSearchDto load() {
 				ConfigurationStorage storage = getSessionStorage().getConfiguration();
-				return storage.getDebugSearchDto();
+				DebugSearchDto dto = storage.getDebugSearchDto();
+				Search search = SearchFactory.createSearch(UserType.class, getPrismContext(), true);
+				dto.setSearch(search);
+
+				return dto;
 			}
 		};
 
@@ -984,6 +992,18 @@ protected void onUpdate(AjaxRequestTarget target) {
 				}
 			};
 			add(zipCheck);
+
+			SearchPanel search = new SearchPanel(ID_SEARCH,
+					new PropertyModel<Search>(model, DebugSearchDto.F_SEARCH)) {
+
+				@Override
+				public void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
+					PageDebugList page = (PageDebugList) getPage();
+					//todo fix search button [lazyman]
+//					page.listObjectsPerformed(query, target);
+				}
+			};
+			searchForm.add(search);
 		}
 
 		public AjaxCheckBox getZipCheck() {

diff --git a/.../src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugSearchDto.java b/.../src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugSearchDto.java
@@ -17,6 +17,7 @@
 package com.evolveum.midpoint.web.page.admin.configuration.dto;
 
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 
 import java.io.Serializable;
@@ -29,10 +30,12 @@ public class DebugSearchDto implements Serializable {
     public static final String F_TEXT = "text";
     public static final String F_TYPE = "type";
     public static final String F_RESOURCE_OID = "resource";
+    public static final String F_SEARCH = "search";
 
     private String text;
     private ObjectTypes type;
     private ObjectViewDto resource;
+    private Search search;
 
     public String getText() {
         return text;
@@ -60,4 +63,12 @@ public ObjectViewDto getResource() {
     public void setResource(ObjectViewDto resource) {
         this.resource = resource;
     }
+
+    public Search getSearch() {
+        return search;
+    }
+
+    public void setSearch(Search search) {
+        this.search = search;
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
@@ -18,8 +18,11 @@
 
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.web.component.search.Search;
+import com.evolveum.midpoint.web.component.search.SearchFactory;
 import com.evolveum.midpoint.web.page.admin.configuration.dto.AccountDetailsSearchDto;
 import com.evolveum.midpoint.web.page.admin.configuration.dto.DebugSearchDto;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 /**
  * @author lazyman