MID-1931 - adding and showing paging size selectors to some places in…

… GUI.
Evolveum · Jun 23, 2014 · 5a698cd · 5a698cd
1 parent 911de08
commit 5a698cd
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 11 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/PagingSizePanel.java
@@ -27,6 +27,7 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.validation.validator.RangeValidator;
 
 /**
  *  @author shood
@@ -79,6 +80,7 @@ protected void onError(AjaxRequestTarget target, Form<?> form){
 
         final TextField<Integer> pagingText = new TextField<Integer>(ID_PAGING_SIZE, pagingModel);
         pagingText.setType(Integer.class);
+        pagingText.add(new RangeValidator<Integer>(1,50));
         pagingText.add(AttributeModifier.replace("placeholder", createStringResource("PagingSizePanel.label.pagingSize")));
         pagingText.add(new SearchFormEnterBehavior(setPagingButton));
         form.add(pagingText);

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
@@ -39,6 +39,7 @@
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.home.PageDashboard;
 import com.evolveum.midpoint.web.page.admin.configuration.dto.ResourceItemDto;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
@@ -200,7 +201,9 @@ public void onClick(AjaxRequestTarget target) {
         ObjectDataProvider provider = new ObjectDataProvider(this, ShadowType.class);
         provider.setOptions(SelectorOptions.createCollection(GetOperationOptions.createRaw()));
         provider.setQuery(ObjectQuery.createObjectQuery(createResourceQueryFilter()));
-        TablePanel accounts = new TablePanel(ID_ACCOUNTS, provider, createAccountsColumns());
+        TablePanel accounts = new TablePanel(ID_ACCOUNTS, provider, createAccountsColumns(),
+                getPagingSize(UserProfileStorage.TableId.CONF_PAGE_ACCOUNTS), UserProfileStorage.TableId.CONF_PAGE_ACCOUNTS);
+        accounts.setShowPagingSize(true);
         accounts.add(new VisibleEnableBehaviour() {
 
             @Override

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
@@ -55,6 +55,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.dto.DebugObjectItem;
 import com.evolveum.midpoint.web.page.admin.configuration.dto.DebugSearchDto;
 import com.evolveum.midpoint.web.session.ConfigurationStorage;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
@@ -206,7 +207,9 @@ private void addOrReplaceTable(RepositoryObjectDataProvider provider) {
         provider.setQuery(createQuery());
         Form mainForm = (Form) get(ID_MAIN_FORM);
 
-        TablePanel table = new TablePanel(ID_TABLE, provider, initColumns(provider.getType()));
+        TablePanel table = new TablePanel(ID_TABLE, provider, initColumns(provider.getType()),
+                getPagingSize(UserProfileStorage.TableId.CONF_DEBUG_LIST_PANEL), UserProfileStorage.TableId.CONF_DEBUG_LIST_PANEL);
+        table.setShowPagingSize(true);
         table.setOutputMarkupId(true);
         mainForm.addOrReplace(table);
     }

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -49,6 +49,7 @@
 import com.evolveum.midpoint.web.page.admin.reports.dto.ReportDeleteDialogDto;
 import com.evolveum.midpoint.web.page.admin.reports.dto.ReportOutputSearchDto;
 import com.evolveum.midpoint.web.session.ReportsStorage;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.web.util.WebModelUtils;
@@ -182,7 +183,9 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
 
         provider.setQuery(query);
 
-        TablePanel table = new TablePanel(ID_CREATED_REPORTS_TABLE, provider, initColumns(ajaxDownloadBehavior));
+        TablePanel table = new TablePanel(ID_CREATED_REPORTS_TABLE, provider, initColumns(ajaxDownloadBehavior),
+                getPagingSize(UserProfileStorage.TableId.PAGE_CREATED_REPORTS_PANEL), UserProfileStorage.TableId.PAGE_CREATED_REPORTS_PANEL);
+        table.setShowPagingSize(true);
         table.setShowPaging(true);
         table.setOutputMarkupId(true);
         mainForm.add(table);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
@@ -39,6 +39,7 @@
 import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceDto;
 import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceObjectTypeDto;
 import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ProvisioningScriptHostType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
@@ -121,7 +122,8 @@ private void initLayout() {
                 new PropertyModel<List<ResourceObjectTypeDto>>(model, "objectTypes"));
         provider.setSort("displayName", SortOrder.ASCENDING);
         TablePanel objectTypes = new TablePanel<ResourceObjectTypeDto>("objectTypesTable", provider,
-                initObjectTypesColumns());
+                initObjectTypesColumns(), getPagingSize(UserProfileStorage.TableId.PAGE_RESOURCE_PANEL), UserProfileStorage.TableId.PAGE_RESOURCE_PANEL);
+        objectTypes.setShowPagingSize(true);
         objectTypes.setShowPaging(true);
         objectTypes.setOutputMarkupId(true);
         mainForm.add(objectTypes);

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -55,6 +55,7 @@
 import com.evolveum.midpoint.web.page.admin.resources.dto.*;
 import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusIcon;
 import com.evolveum.midpoint.web.session.ResourcesStorage;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ConnectorHostType;
@@ -141,7 +142,9 @@ private void initLayout() {
         Form mainForm = new Form(ID_MAIN_FORM);
         add(mainForm);
 
-        TablePanel resources = new TablePanel<>(ID_TABLE, initResourceDataProvider(), initResourceColumns());
+        TablePanel resources = new TablePanel<>(ID_TABLE, initResourceDataProvider(), initResourceColumns(),
+                getPagingSize(UserProfileStorage.TableId.PAGE_RESOURCES_PANEL), UserProfileStorage.TableId.PAGE_RESOURCES_PANEL);
+        resources.setShowPagingSize(true);
         resources.setOutputMarkupId(true);
         mainForm.add(resources);
 

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java b/...main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
@@ -57,6 +57,7 @@
 import com.evolveum.midpoint.web.page.admin.users.dto.UserListItemDto;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.session.ResourcesStorage;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -236,7 +237,9 @@ protected void addInlineMenuToDto(AccountContentDto dto) {
         provider.setQuery(createQuery());
 
         List<IColumn> columns = initColumns();
-        TablePanel table = new TablePanel(ID_TABLE, provider, columns);
+        TablePanel table = new TablePanel(ID_TABLE, provider, columns,
+                getPagingSize(UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL), UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL);
+        table.setShowPagingSize(true);
         table.setOutputMarkupId(true);
         mainForm.add(table);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
@@ -42,6 +42,7 @@
 import com.evolveum.midpoint.web.page.admin.server.dto.*;
 import com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstance;
 import com.evolveum.midpoint.web.session.TasksStorage;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
@@ -156,7 +157,9 @@ private void initLayout() {
         TaskDtoProvider provider = new TaskDtoProvider(PageTasks.this, options);
 
         provider.setQuery(createTaskQuery());
-        TablePanel<TaskDto> taskTable = new TablePanel<>(ID_TASK_TABLE, provider, taskColumns);
+        TablePanel<TaskDto> taskTable = new TablePanel<>(ID_TASK_TABLE, provider, taskColumns,
+                getPagingSize(UserProfileStorage.TableId.PAGE_TASKS_PANEL), UserProfileStorage.TableId.PAGE_TASKS_PANEL);
+        taskTable.setShowPagingSize(true);
         taskTable.setOutputMarkupId(true);
         mainForm.add(taskTable);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
@@ -49,6 +49,7 @@
 import com.evolveum.midpoint.web.page.admin.users.component.ExecuteChangeOptionsPanel;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserListItemDto;
 import com.evolveum.midpoint.web.page.admin.users.dto.UsersDto;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.session.UsersStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
@@ -306,9 +307,10 @@ public UserListItemDto createDataObjectWrapper(PrismObject<UserType> obj) {
                 GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
         provider.setOptions(options);
 
-        TablePanel table = new TablePanel(ID_TABLE, provider, columns);
-        table.setOutputMarkupId(true);
+        TablePanel table = new TablePanel(ID_TABLE, provider, columns,
+                getPagingSize(UserProfileStorage.TableId.PAGE_USERS_PANEL), UserProfileStorage.TableId.PAGE_USERS_PANEL);
         table.setShowPagingSize(true);
+        table.setOutputMarkupId(true);
 
         UsersStorage storage = getSessionStorage().getUsers();
         table.setCurrentPage(storage.getUsersPaging());

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
@@ -29,6 +29,7 @@
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
 import com.evolveum.midpoint.web.component.data.column.LinkColumn;
 import com.evolveum.midpoint.web.page.admin.workflow.dto.*;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.wf.api.WorkflowManager;
@@ -91,7 +92,8 @@ private void initLayout() {
 
         List<IColumn<WorkItemDto, String>> workItemColumns = initWorkItemColumns();
         TablePanel<WorkItemDto> workItemTable = new TablePanel<>("workItemTable", new WorkItemDtoProvider(PageWorkItems.this, assigned),
-                workItemColumns);
+                workItemColumns, getPagingSize(UserProfileStorage.TableId.PAGE_WORK_ITEMS), UserProfileStorage.TableId.PAGE_WORK_ITEMS);
+        workItemTable.setShowPagingSize(true);
         workItemTable.setOutputMarkupId(true);
         mainForm.add(workItemTable);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
@@ -33,11 +33,38 @@ public class UserProfileStorage implements Serializable{
     public enum TableId{
         TABLE_ROLES,
         TABLE_USERS,
-        TREE_TABLE_PANEL
+        TREE_TABLE_PANEL,
+        RESOURCE_WIZARD_ATTRIBUTE_PANEL,
+        WF_WORK_ITEMS_PANEL,
+        CONF_PAGE_ACCOUNTS,
+        CONF_DEBUG_LIST_PANEL,
+        PAGE_REPORTS_PANEL,
+        PAGE_CREATED_REPORTS_PANEL,
+        PAGE_RESOURCE_PANEL,
+        PAGE_RESOURCES_PANEL,
+        PAGE_RESOURCE_ACCOUNTS_PANEL,
+        PAGE_TASKS_PANEL,
+        PAGE_USERS_PANEL,
+        PAGE_WORK_ITEMS
+
     }
 
     private Map<TableId, Integer> pagingSizeMap = new HashMap<TableId, Integer>(){{
         put(TableId.TABLE_ROLES, null);
+        put(TableId.TABLE_USERS, null);
+        put(TableId.TREE_TABLE_PANEL, null);
+        put(TableId.RESOURCE_WIZARD_ATTRIBUTE_PANEL, null);
+        put(TableId.WF_WORK_ITEMS_PANEL, null);
+        put(TableId.CONF_PAGE_ACCOUNTS, null);
+        put(TableId.CONF_DEBUG_LIST_PANEL, null);
+        put(TableId.PAGE_REPORTS_PANEL, null);
+        put(TableId.PAGE_CREATED_REPORTS_PANEL, null);
+        put(TableId.PAGE_RESOURCE_PANEL, null);
+        put(TableId.PAGE_RESOURCES_PANEL, null);
+        put(TableId.PAGE_RESOURCE_ACCOUNTS_PANEL, null);
+        put(TableId.PAGE_TASKS_PANEL, null);
+        put(TableId.PAGE_USERS_PANEL, null);
+        put(TableId.PAGE_WORK_ITEMS, null);
     }};
 
     public Map<TableId, Integer> getPageSizingMap(){