The Unified and Autonomous Development Platform
Add history support for page navigations
robin shen8c442b3d279d
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.javaindex 1696064eda..9460b15061 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/OnTypingDoneBehavior.java@@ -30,9 +30,12 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBeharesponse.render(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));String script = String.format(""- + "$('#%s').doneEvents('input', function() {"- + " $(this).trigger('donetyping');"- + "}, %s);",+ + "var $input = $('#%s');"+ + "$input.doneEvents('input', function() {"+ + " $input.trigger('donetyping');"+ + "}, %s);"+ + "if ($input.val() != '')"+ + " $input.trigger('donetyping');",component.getMarkupId(true), timeout);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java b/web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareDataTable.javasimilarity index 61%rename from web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.javarename to web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareDataTable.javaindex 4baa20f51a..0b059287b2 100644--- a/web/src/main/java/com/gitplex/server/web/component/datatable/DefaultDataTable.java+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareDataTable.java@@ -2,34 +2,30 @@ package com.gitplex.server.web.component.datatable;import java.util.List;+import javax.annotation.Nullable;+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.OddEvenItem;import org.apache.wicket.model.IModel;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")-public class DefaultDataTable<T, S> extends DataTable<T, S> {+public class HistoryAwareDataTable<T, S> extends DataTable<T, S> {- public DefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns,- final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage) {+ public HistoryAwareDataTable(final String id, final List<? extends IColumn<T, S>> columns,+ final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage,+ @Nullable PagingHistorySupport pagingHistorySupport) {super(id, columns, dataProvider, rowsPerPage);- addBottomToolbar(new AjaxNavigationToolbar(this) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new BootstrapAjaxPagingNavigator(navigatorId, table);- }-- });+ if (pagingHistorySupport != null)+ setCurrentPage(pagingHistorySupport.getCurrentPage());+ addBottomToolbar(new HistoryAwareNavToolbar(this, pagingHistorySupport));addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));addBottomToolbar(new NoRecordsToolbar(this));}diff --git a/web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareNavToolbar.java b/web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareNavToolbar.javanew file mode 100644index 0000000000..1b1161e0b2--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/datatable/HistoryAwareNavToolbar.java@@ -0,0 +1,96 @@+package com.gitplex.server.web.component.datatable;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;+import org.apache.wicket.markup.html.link.AbstractLink;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.DisabledAttributeLinkBehavior;+import org.apache.wicket.markup.html.list.LoopItem;+import org.apache.wicket.markup.html.navigation.paging.IPageable;+import org.apache.wicket.markup.html.navigation.paging.IPagingLabelProvider;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigation;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigationIncrementLink;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigationLink;+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;++import com.gitplex.server.web.util.PagingHistorySupport;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;++@SuppressWarnings("serial")+public class HistoryAwareNavToolbar extends NavigationToolbar {++ private final PagingHistorySupport pagingHistorySupport;++ public HistoryAwareNavToolbar(DataTable<?, ?> table, PagingHistorySupport pagingHistorySupport) {+ super(table);+ this.pagingHistorySupport = pagingHistorySupport;+ }++ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new BootstrapPagingNavigator(navigatorId, table) {++ @Override+ protected PagingNavigation newNavigation(String id, IPageable pageable,+ IPagingLabelProvider labelProvider) {++ return new PagingNavigation(id, pageable, labelProvider) {+ private final AttributeModifier activeAttribute = AttributeModifier.append("class", "active");++ @Override+ protected AbstractLink newPagingNavigationLink(String id, IPageable pageable, long pageIndex) {+ if (pagingHistorySupport != null) {+ return new BookmarkablePageLink<Void>(id, getPage().getClass(),+ pagingHistorySupport.newPageParameters((int)pageIndex));+ } else {+ return super.newPagingNavigationLink(id, pageable, pageIndex);+ }+ }++ @Override+ protected void populateItem(final LoopItem loopItem) {+ super.populateItem(loopItem);+ if ((getStartIndex() + loopItem.getIndex()) == pageable.getCurrentPage()) {+ loopItem.add(activeAttribute);+ }+ }+ };+ }++ @Override+ protected AbstractLink newPagingNavigationIncrementLink(String id, IPageable pageable, int increment) {+ AbstractLink link;+ if (pagingHistorySupport != null) {+ int pageNumber = (int) pageable.getCurrentPage() + increment;+ link = new BookmarkablePageLink<Void>(id, getPage().getClass(),+ pagingHistorySupport.newPageParameters(pageNumber));+ link.setEnabled(pageNumber>=0 && pageNumber<getPageable().getPageCount());+ link.add(new DisabledAttributeLinkBehavior());+ } else {+ link = new PagingNavigationIncrementLink<Void>(id, pageable, increment);+ }+ return link;+ }++ @Override+ protected AbstractLink newPagingNavigationLink(String id, IPageable pageable, int pageNumber) {+ AbstractLink link;+ if (pagingHistorySupport != null) {+ if (pageNumber == -1)+ pageNumber = (int) (getPageable().getPageCount()) - 1;+ link = new BookmarkablePageLink<Void>(id, getPage().getClass(),+ pagingHistorySupport.newPageParameters(pageNumber));+ link.setEnabled(pageNumber != pageable.getCurrentPage());+ link.add(new DisabledAttributeLinkBehavior());+ } else {+ link = new PagingNavigationLink<Void>(id, pageable, pageNumber);+ }+ return link;+ }++ };+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.javaindex 4a6cda5fb0..45acdb7eb8 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.java@@ -145,24 +145,24 @@ abstract class InsertUrlPanel extends Panel {};- BlobIdent rootBlobIdent = new BlobIdent(blobRenderContext.getBlobIdent().revision, null,- FileMode.TYPE_TREE);+ /*+ * We resolve revision to get latest commit id so that we can select to insert newly+ * added/uploaded files while editing a markdown file+ */+ ObjectId commitId;+ try {+ commitId = blobRenderContext.getProject().getRepository()+ .resolve(blobRenderContext.getBlobIdent().revision);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ BlobIdent rootBlobIdent = new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE);if (!blobRenderContext.getProject().getChildren(rootBlobIdent, blobIdentFilter).isEmpty()) {add(new DropdownLink("blobPicker") {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- /*- * We resolve revision to get latest commit id so that we can select to insert newly- * added/uploaded files while editing a markdown file- */- ObjectId commitId;- try {- commitId = blobRenderContext.getProject().getRepository()- .resolve(blobRenderContext.getBlobIdent().revision);- } catch (IOException e) {- throw new RuntimeException(e);- }BlobIdent blobIdent = blobRenderContext.getBlobIdent();String openDirectory;diff --git a/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.java b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.javaindex 02c5213af4..4aebf8ddd7 100644--- a/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.java@@ -4,12 +4,13 @@ import java.util.ArrayList;import java.util.Iterator;import java.util.List;+import javax.annotation.Nullable;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.head.CssHeaderItem;@@ -17,7 +18,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;@@ -32,21 +32,25 @@ import com.gitplex.server.model.Project;import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.HistoryAwareNavToolbar;import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import com.gitplex.server.web.page.project.commit.CommitDetailPage;import com.gitplex.server.web.util.DateUtils;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectListPanel extends Panel {private final IModel<List<ProjectFacade>> projectsModel;- public ProjectListPanel(String id, IModel<List<ProjectFacade>> projectsModel) {+ private final PagingHistorySupport pagingHistorySupport;++ public ProjectListPanel(String id, IModel<List<ProjectFacade>> projectsModel,+ @Nullable PagingHistorySupport pagingHistorySupport) {super(id);this.projectsModel = projectsModel;+ this.pagingHistorySupport = pagingHistorySupport;}@Override@@ -152,20 +156,17 @@ public class ProjectListPanel extends Panel {DataTable<ProjectFacade, Void> projectsTable =new DataTable<ProjectFacade, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);- projectsTable.addBottomToolbar(new NavigationToolbar(projectsTable) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new BootstrapPagingNavigator(navigatorId, table);- }-- });++ if (pagingHistorySupport != null)+ projectsTable.setCurrentPage(pagingHistorySupport.getCurrentPage());++ projectsTable.addBottomToolbar(new HistoryAwareNavToolbar(projectsTable, pagingHistorySupport));projectsTable.addBottomToolbar(new NoRecordsToolbar(projectsTable, Model.of("No Projects Found")));add(projectsTable);setOutputMarkupId(true);}-+@Overrideprotected void onDetach() {projectsModel.detach();diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.cssindex e880cc4ccd..1a02241fc6 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css@@ -102,6 +102,9 @@ a.wicket_orderUp:AFTER {a.wicket_orderDown:AFTER {content: "\f063";}+.pagination a.first, .pagination a.prev, .pagination a.next, .pagination a.last {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}/* TREE */.tree-theme-windows .tree-node span.tree-content a {@@ -492,4 +495,5 @@ input.search {.modal-header .close {font-family: sans-serif;-}\ No newline at end of file+}+diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.javaindex f351780a7a..24dd21651a 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java@@ -72,7 +72,7 @@ public class DashboardPage extends LayoutPage {};- add(new ProjectListPanel("recentVisitedProjects", recentVisitedProjectsModel) {+ add(new ProjectListPanel("recentVisitedProjects", recentVisitedProjectsModel, null) {@Overrideprotected void onConfigure() {@@ -111,7 +111,7 @@ public class DashboardPage extends LayoutPage {};- add(new ProjectListPanel("recentAddedProjects", recentAddedProjectsModel) {+ add(new ProjectListPanel("recentAddedProjects", recentAddedProjectsModel, null) {@Overrideprotected void onConfigure() {diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.javaindex 39e80601c7..df91185bad 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java@@ -46,7 +46,7 @@ import com.gitplex.server.util.matchscore.MatchScoreProvider;import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;@@ -57,10 +57,13 @@ import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupAuthorizationsPage extends GroupPage {+ private static final String PARAM_PAGE = "page";+private String searchInput;private DataTable<GroupAuthorization, Void> authorizationsTable;@@ -281,9 +284,25 @@ public class GroupAuthorizationsPage extends GroupPage {};}};++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };- add(authorizationsTable = new DefaultDataTable<GroupAuthorization, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE));+ add(authorizationsTable = new HistoryAwareDataTable<GroupAuthorization, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.javaindex 8d9f842437..fd2b413b87 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java@@ -22,6 +22,7 @@ import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -34,15 +35,18 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.ComponentRenderer;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.link.LabelLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.layout.LayoutPage;import com.gitplex.server.web.util.ConfirmOnClick;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupListPage extends LayoutPage {+ private static final String PARAM_PAGE = "page";+private DataTable<Group, Void> groupsTable;private String searchInput;@@ -190,9 +194,25 @@ public class GroupListPage extends LayoutPage {};}};++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };- add(groupsTable = new DefaultDataTable<Group, Void>("groups", columns, dataProvider,- WebConstants.PAGE_SIZE));+ add(groupsTable = new HistoryAwareDataTable<Group, Void>("groups", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.javaindex 08f3c9c446..4d561ce795 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java@@ -44,7 +44,7 @@ import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.select2.Response;@@ -52,10 +52,13 @@ import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupMembershipsPage extends GroupPage {+ private static final String PARAM_PAGE = "page";+private String searchInput;private DataTable<Membership, Void> membershipsTable;@@ -246,8 +249,24 @@ public class GroupMembershipsPage extends GroupPage {}};- add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,- WebConstants.PAGE_SIZE));+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };++ add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.javaindex d486b43507..00e81406bf 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java@@ -8,17 +8,18 @@ import java.util.Set;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CacheManager;@@ -35,10 +36,15 @@ import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.component.projectlist.ProjectListPanel;import com.gitplex.server.web.page.layout.LayoutPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectListPage extends LayoutPage {+ private static final String PARAM_PAGE = "page";++ private static final String PARAM_ORPHAN = "orphan";+private boolean showOrphanProjects;private final IModel<List<ProjectFacade>> orphanProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {@@ -77,6 +83,11 @@ public class ProjectListPage extends LayoutPage {};+ public ProjectListPage(PageParameters params) {+ super(params);+ showOrphanProjects = params.get(PARAM_ORPHAN).toBoolean(false);+ }+private final IModel<List<ProjectFacade>> projectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {@Override@@ -138,7 +149,7 @@ public class ProjectListPage extends LayoutPage {orphanProjectsNote.setOutputMarkupPlaceholderTag(true);add(orphanProjectsNote);- add(new AjaxLink<Void>("showOrphanProjects") {+ add(new Link<Void>("showOrphanProjects") {@Overrideprotected void onInitialize() {@@ -156,11 +167,11 @@ public class ProjectListPage extends LayoutPage {}@Override- public void onClick(AjaxRequestTarget target) {+ public void onClick() {showOrphanProjects = !showOrphanProjects;- target.add(this);- target.add(projectList);- target.add(orphanProjectsNote);+ PageParameters params = new PageParameters();+ params.add(PARAM_ORPHAN, showOrphanProjects);+ setResponsePage(ProjectListPage.class, params);}@Override@@ -181,6 +192,22 @@ public class ProjectListPage extends LayoutPage {return projectsModel.getObject();}+ }, new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ if (showOrphanProjects)+ params.add(PARAM_ORPHAN, showOrphanProjects);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }+}));}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex bd45de2656..5106aab243 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -54,7 +54,7 @@ import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;@@ -67,10 +67,13 @@ import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.component.userchoice.AbstractUserChoiceProvider;import com.gitplex.server.web.component.userchoice.UserChoiceResourceReference;import com.gitplex.server.web.page.project.setting.ProjectSettingPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectAuthorizationsPage extends ProjectSettingPage {+ private static final String PARAM_PAGE = "page";+private String searchInput;private DataTable<Long, Void> authorizationsTable;@@ -476,7 +479,24 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {}};- add(authorizationsTable = new DefaultDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE));+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };++ add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));}+}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.javaindex 534d2aea3a..065d26f086 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java@@ -26,17 +26,20 @@ import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.EntityDataProvider;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.link.BranchLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.util.DateUtils;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class TaskListPage extends UserPage {+ private static final String PARAM_PAGE = "page";+public TaskListPage(PageParameters params) {super(params);}@@ -136,8 +139,24 @@ public class TaskListPage extends UserPage {});- DataTable<PullRequestTask, String> dataTable =- new DefaultDataTable<PullRequestTask, String>("tasks", columns, dataProvider, WebConstants.PAGE_SIZE);+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };++ DataTable<PullRequestTask, String> dataTable = new HistoryAwareDataTable<PullRequestTask, String>("tasks", columns,+ dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport);dataTable.setVisible(dataTable.getRowCount() != 0);add(dataTable);diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.javaindex ba697bb134..0b4fd6821f 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java@@ -51,7 +51,7 @@ import com.gitplex.server.util.matchscore.MatchScoreProvider;import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.DropdownLink;@@ -63,10 +63,13 @@ import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserAuthorizationsPage extends UserPage {+ private static final String PARAM_PAGE = "page";+private String searchInput;private DataTable<Long, Void> authorizationsTable;@@ -462,8 +465,24 @@ public class UserAuthorizationsPage extends UserPage {return Model.of(object);}};++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };- add(authorizationsTable = new DefaultDataTable<Long, Void>("authorizations", columns,- dataProvider, WebConstants.PAGE_SIZE));+ add(authorizationsTable = new HistoryAwareDataTable<Long, Void>("authorizations", columns,+ dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport));}}diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.javaindex 970ddc4d70..8e3461cf35 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java@@ -36,15 +36,18 @@ import com.gitplex.server.web.ComponentRenderer;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;import com.gitplex.server.web.component.avatar.AvatarLink;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.link.ViewStateAwarePageLink;import com.gitplex.server.web.page.layout.LayoutPage;import com.gitplex.server.web.util.ConfirmOnClick;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserListPage extends LayoutPage {+ private static final String PARAM_PAGE = "page";+private DataTable<User, Void> usersTable;private String searchInput;@@ -186,8 +189,24 @@ public class UserListPage extends LayoutPage {}};- add(usersTable = new DefaultDataTable<User, Void>("users", columns, dataProvider,- WebConstants.PAGE_SIZE));+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };++ add(usersTable = new HistoryAwareDataTable<User, Void>("users", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.javaindex 60f7432ac2..587a60ed4b 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java@@ -45,7 +45,7 @@ import com.gitplex.server.util.matchscore.MatchScoreProvider;import com.gitplex.server.util.matchscore.MatchScoreUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.OnTypingDoneBehavior;-import com.gitplex.server.web.component.datatable.DefaultDataTable;+import com.gitplex.server.web.component.datatable.HistoryAwareDataTable;import com.gitplex.server.web.component.datatable.SelectionColumn;import com.gitplex.server.web.component.groupchoice.AbstractGroupChoiceProvider;import com.gitplex.server.web.component.groupchoice.GroupChoiceResourceReference;@@ -53,10 +53,13 @@ import com.gitplex.server.web.component.select2.Response;import com.gitplex.server.web.component.select2.ResponseFiller;import com.gitplex.server.web.component.select2.SelectToAddChoice;import com.gitplex.server.web.page.group.GroupProfilePage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserMembershipsPage extends UserPage {+ private static final String PARAM_PAGE = "page";+private String searchInput;private DataTable<Membership, Void> membershipsTable;@@ -255,8 +258,24 @@ public class UserMembershipsPage extends UserPage {}};- add(membershipsTable = new DefaultDataTable<Membership, Void>("memberships", columns, dataProvider,- WebConstants.PAGE_SIZE));+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = new PageParameters();+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }++ };++ add(membershipsTable = new HistoryAwareDataTable<Membership, Void>("memberships", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport));}}diff --git a/web/src/main/java/com/gitplex/server/web/util/PagingHistorySupport.java b/web/src/main/java/com/gitplex/server/web/util/PagingHistorySupport.javanew file mode 100644index 0000000000..de5d9e214a--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/util/PagingHistorySupport.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.util;++import java.io.Serializable;++import org.apache.wicket.request.mapper.parameter.PageParameters;++public interface PagingHistorySupport extends Serializable {++ int getCurrentPage();++ PageParameters newPageParameters(int currentPage);++}