The Unified and Autonomous Development Platform
chore: Display number of finds of various list at the bottom
Robin Shen4e02fea73208
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 78529c23f8..917e341424 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -32,7 +32,6 @@<wicket:svg href="select" class="icon"></wicket:svg> <wicket:t>Display Params</wicket:t></a><span wicket:id="extraActions"></span>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body"><div wicket:id="feedback"></div>@@ -77,4 +76,4 @@</form></div></wicket:fragment>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex aa588844f6..ff2bf57834 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -135,7 +135,6 @@ public abstract class BuildListPanel extends Panel {};- private Component countLabel;private DataTable<Build, Void> buildsTable;@@ -225,7 +224,6 @@ public abstract class BuildListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {buildsTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -473,7 +471,6 @@ public abstract class BuildListPanel extends Panel {}});- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -692,7 +689,6 @@ public abstract class BuildListPanel extends Panel {}});dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -1026,21 +1022,6 @@ public abstract class BuildListPanel extends Panel {});}- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} builds"), String.valueOf(dataProvider.size()));- else- return _T("found 1 build");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -1316,7 +1297,7 @@ public abstract class BuildListPanel extends Panel {});body.add(buildsTable = new DefaultDataTable<>("builds", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()));+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true));setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex 05a103da8a..8db7bd7bf2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -25,7 +25,6 @@<a wicket:id="operations" class="text-gray mr-4 mb-2 d-inline-block text-nowrap"><wicket:svg href="ellipsis-circle" class="icon rotate-180"></wicket:svg> <wicket:t>Operations</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body" class="body"><div wicket:id="feedback"></div>@@ -43,4 +42,4 @@<span wicket:id="file" class="d-none d-lg-inline text-break"></span></div></wicket:fragment>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 7ed3559ed8..f6eac2ed90 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -120,7 +120,6 @@ public abstract class CodeCommentListPanel extends Panel {};- private Component countLabel;private DataTable<CodeComment, Void> commentsTable;@@ -147,7 +146,6 @@ public abstract class CodeCommentListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {commentsTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -242,7 +240,6 @@ public abstract class CodeCommentListPanel extends Panel {OneDev.getInstance(CodeCommentStatusChangeService.class).create(changes, note);selectionColumn.getSelections().clear();dataProvider.detach();- target.add(countLabel);target.add(body);close();@@ -377,7 +374,6 @@ public abstract class CodeCommentListPanel extends Panel {comments.add(each.getObject());OneDev.getInstance(CodeCommentService.class).delete(comments, getProject());selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);}@@ -534,7 +530,6 @@ public abstract class CodeCommentListPanel extends Panel {OneDev.getInstance(CodeCommentService.class).delete(comments, getProject());dataProvider.detach();selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);}@@ -736,21 +731,6 @@ public abstract class CodeCommentListPanel extends Panel {body.add(new FencedFeedbackPanel("feedback", this));- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} comments"), String.valueOf(dataProvider.size()));- else- return _T("found 1 comment");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -879,7 +859,7 @@ public abstract class CodeCommentListPanel extends Panel {});body.add(commentsTable = new DefaultDataTable<>("comments", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()) {+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true) {@Overrideprotected Item<CodeComment> newRowItem(String id, int index, IModel<CodeComment> model) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.javaindex 4076f41819..49c2cf3d99 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/DefaultDataTable.java@@ -25,6 +25,12 @@ public class DefaultDataTable<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,@Nullable PagingHistorySupport pagingHistorySupport) {+ this(id, columns, dataProvider, rowsPerPage, pagingHistorySupport, false);+ }++ public DefaultDataTable(final String id, final List<? extends IColumn<T, S>> columns,+ final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage,+ @Nullable PagingHistorySupport pagingHistorySupport, boolean showCount) {super(id, columns, dataProvider, rowsPerPage);if (pagingHistorySupport != null)@@ -32,14 +38,18 @@ public class DefaultDataTable<T, S> extends DataTable<T, S> {addTopToolbar(new AjaxFallbackHeadersToolbar<S>(this, dataProvider));- addBottomToolbar(new NavigationToolbar(this) {+ if (showCount) {+ addBottomToolbar(new ListNavigationToolbar(this, pagingHistorySupport));+ } else {+ addBottomToolbar(new NavigationToolbar(this) {- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new OnePagingNavigator(navigatorId, table, pagingHistorySupport);- }+ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new OnePagingNavigator(navigatorId, table, pagingHistorySupport);+ }- });+ });+ }addBottomToolbar(new NoRecordsToolbar(this, Model.of("Unspecified")));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.htmlnew file mode 100644index 0000000000..076ed927f6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.html@@ -0,0 +1,10 @@+<wicket:panel>+ <tr class="navigation">+ <td wicket:id="span">+ <div class="d-flex align-items-center justify-content-between">+ <span wicket:id="count" class="d-none d-lg-inline text-gray text-nowrap mr-2"></span>+ <div class="navigator"><ul wicket:id="navigator"></ul></div>+ </div>+ </td>+ </tr>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.java b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.javanew file mode 100644index 0000000000..629d7f7b0a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/ListNavigationToolbar.java@@ -0,0 +1,50 @@+package io.onedev.server.web.component.datatable;++import static io.onedev.server.web.translation.Translation._T;++import java.text.MessageFormat;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.jspecify.annotations.Nullable;++import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;++public class ListNavigationToolbar extends AbstractToolbar {++ public ListNavigationToolbar(DataTable<?, ?> table, @Nullable PagingHistorySupport pagingHistorySupport) {+ super(table);++ var span = new WebMarkupContainer("span");+ span.add(AttributeModifier.replace("colspan", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return String.valueOf(table.getColumns().size());+ }++ }));+ span.add(new Label("count", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return MessageFormat.format(_T("{0} found"), String.valueOf(table.getItemCount()));+ }++ }));+ span.add(new OnePagingNavigator("navigator", table, pagingHistorySupport));+ add(span);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getTable().getItemCount() != 0);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 0cd3374cee..7cba9d6064 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -40,7 +40,6 @@<wicket:svg href="clock" class="icon"></wicket:svg> <wicket:t>Timing</wicket:t></a><span wicket:id="extraActions"></span>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body" class="body"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex d9609928ad..ccb0898e8d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -41,7 +41,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport 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.feedback.FencedFeedbackPanel;@@ -56,7 +55,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;-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;@@ -118,6 +116,7 @@ import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.NoRecordsBehavior;+import io.onedev.server.web.component.datatable.ListNavigationToolbar;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateBadge;@@ -135,7 +134,6 @@ import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;-import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesLink;@@ -168,7 +166,6 @@ public abstract class IssueListPanel extends Panel {};- private Component countLabel;private DataTable<Issue, Void> issuesTable;@@ -261,7 +258,6 @@ public abstract class IssueListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {issuesTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -934,7 +930,6 @@ public abstract class IssueListPanel extends Panel {protected void onUpdated(AjaxRequestTarget target) {modal.close();selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);onBatchUpdated(target);}@@ -1186,7 +1181,6 @@ public abstract class IssueListPanel extends Panel {}});selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);onBatchDeleted(target);}@@ -1306,7 +1300,6 @@ public abstract class IssueListPanel extends Panel {protected void onUpdated(AjaxRequestTarget target) {modal.close();selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);onBatchUpdated(target);}@@ -1562,7 +1555,6 @@ public abstract class IssueListPanel extends Panel {});dataProvider.detach();selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);onBatchDeleted(target);}@@ -1835,22 +1827,6 @@ public abstract class IssueListPanel extends Panel {add(new WebMarkupContainer("showProgress").setVisible(false));}- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} issues"), String.valueOf(dataProvider.size()));- else- return _T("found 1 issue");- }-- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -2186,14 +2162,7 @@ public abstract class IssueListPanel extends Panel {if (getPagingHistorySupport() != null)issuesTable.setCurrentPage(getPagingHistorySupport().getCurrentPage());- issuesTable.addBottomToolbar(new NavigationToolbar(issuesTable) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new OnePagingNavigator(navigatorId, table, getPagingHistorySupport());- }-- });+ issuesTable.addBottomToolbar(new ListNavigationToolbar(issuesTable, getPagingHistorySupport()));issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));issuesTable.add(new NoRecordsBehavior());diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.htmlindex 646da7aa9e..70be615a7d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html@@ -30,7 +30,6 @@<a wicket:id="help" class="help text-gray mr-4 mb-2 d-inline-block text-nowrap"><wicket:svg href="question-circle" class="icon"></wicket:svg> <wicket:t>How to Publish</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body"><div wicket:id="feedback"></div>@@ -51,4 +50,4 @@<ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-4"></ul><div wicket:id="content"></div></wicket:fragment>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.javaindex af11bd052b..c4fcb285b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.component.pack.list;import static io.onedev.server.web.translation.Translation._T;-import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;@@ -103,7 +102,6 @@ public abstract class PackListPanel extends Panel {};- private Component countLabel;private DataTable<Pack, Void> packsTable;@@ -189,7 +187,6 @@ public abstract class PackListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {packsTable.setCurrentPage(0);target.add(helpLink);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -289,7 +286,6 @@ public abstract class PackListPanel extends Panel {getAuditService().audit(pack.getProject(), "deleted package \"" + pack.getReference(false) + "\"", oldAuditContent, null);}});- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -361,7 +357,6 @@ public abstract class PackListPanel extends Panel {}});dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -547,21 +542,6 @@ public abstract class PackListPanel extends Panel {});add(queryForm);- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} packages"), String.valueOf(dataProvider.size()));- else- return _T("found 1 package");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -711,7 +691,7 @@ public abstract class PackListPanel extends Panel {});body.add(packsTable = new DefaultDataTable<>("packs", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()) {+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true) {@Overrideprotected void onConfigure() {super.onConfigure();diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex c02b9c91d3..3fc7948f00 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -31,7 +31,6 @@<a wicket:id="importProjects" class="import-projects d-inline-block mb-2 mr-4 text-gray"><wicket:svg href="import" class="icon"></wicket:svg> <wicket:t>Import</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 4ebcfeef77..c2fbfa874f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -228,7 +227,6 @@ public class ProjectListPanel extends Panel {};- private Component countLabel;private DataTable<Project, Void> projectsTable;@@ -273,7 +271,6 @@ public class ProjectListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {projectsTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -490,7 +487,6 @@ public class ProjectListPanel extends Panel {if (!Objects.equals(oldAuditContent, newAuditContent))auditService.audit(project, "changed parent", oldAuditContent, newAuditContent);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Projects moved"));@@ -585,7 +581,6 @@ public class ProjectListPanel extends Panel {if (oldAuditContent != null)auditService.audit(project, "changed parent", oldAuditContent, null);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Projects modified"));@@ -666,7 +661,6 @@ public class ProjectListPanel extends Panel {projectService.delete(projects);auditDeletions(projects);selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);Session.get().success(_T("Projects deleted"));var page = (BasePage) getPage();@@ -781,7 +775,6 @@ public class ProjectListPanel extends Panel {auditService.audit(project, "changed parent", oldAuditContent, newAuditContent);}dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Projects moved"));@@ -879,7 +872,6 @@ public class ProjectListPanel extends Panel {}dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Projects modified"));@@ -964,7 +956,6 @@ public class ProjectListPanel extends Panel {auditDeletions(projects);dataProvider.detach();selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);Session.get().success(_T("Projects deleted"));var page = (BasePage) getPage();@@ -1130,21 +1121,6 @@ public class ProjectListPanel extends Panel {.setVisible(canCreateProjects));}- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} projects"), String.valueOf(dataProvider.size()));- else- return _T("found 1 project");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -1377,7 +1353,7 @@ public class ProjectListPanel extends Panel {});body.add(projectsTable = new DefaultDataTable<>("projects", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()));+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true));setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex 12ff4859bc..c3950991c1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -29,7 +29,6 @@<wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> <wicket:t>Operations</wicket:t></a><span wicket:id="extraActions"></span>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body" class="body"><div wicket:id="feedback"></div>@@ -66,4 +65,4 @@</div></div></wicket:fragment>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 7b20e94ba1..ad14e2a7c9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -31,7 +31,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport 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.feedback.FencedFeedbackPanel;@@ -44,7 +43,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-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;@@ -90,6 +88,7 @@ import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.PullRequestQueryBehavior;import io.onedev.server.web.component.branch.BranchLink;+import io.onedev.server.web.component.datatable.ListNavigationToolbar;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -98,7 +97,6 @@ import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;-import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.pullrequest.RequestStatusBadge;import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;@@ -161,7 +159,6 @@ public abstract class PullRequestListPanel extends Panel {};- private Component countLabel;private DataTable<PullRequest, Void> requestsTable;@@ -226,7 +223,6 @@ public abstract class PullRequestListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {requestsTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -380,7 +376,6 @@ public abstract class PullRequestListPanel extends Panel {if (pullRequest.isOpen())pullRequestService.discard(user, pullRequest, null);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -457,7 +452,6 @@ public abstract class PullRequestListPanel extends Panel {auditService.audit(request.getProject(), "deleted pull request \"" + request.getReference().toString(request.getProject()) + "\"", oldAuditContent, null);}});- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -583,7 +577,6 @@ public abstract class PullRequestListPanel extends Panel {pullRequestService.discard(user, pullRequest, null);}dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -662,7 +655,6 @@ public abstract class PullRequestListPanel extends Panel {}});dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -1086,21 +1078,6 @@ public abstract class PullRequestListPanel extends Panel {});- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} pull requests"), String.valueOf(dataProvider.size()));- else- return _T("found 1 pull request");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -1172,14 +1149,7 @@ public abstract class PullRequestListPanel extends Panel {if (getPagingHistorySupport() != null)requestsTable.setCurrentPage(getPagingHistorySupport().getCurrentPage());- requestsTable.addBottomToolbar(new NavigationToolbar(requestsTable) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new OnePagingNavigator(navigatorId, table, getPagingHistorySupport());- }-- });+ requestsTable.addBottomToolbar(new ListNavigationToolbar(requestsTable, getPagingHistorySupport()));requestsTable.addBottomToolbar(new NoRecordsToolbar(requestsTable));requestsTable.add(new NoRecordsBehavior());diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.htmlindex 5a08c51f4c..eb6a0ac565 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.html@@ -28,7 +28,6 @@<a wicket:id="operations" class="operations text-gray mr-4 mb-2 d-inline-block text-nowrap"><wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> <wicket:t>Operations</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.javaindex 865a0d6864..0cf2f26476 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.workspace.list;import static io.onedev.server.model.Workspace.SORT_FIELDS;import static io.onedev.server.web.translation.Translation._T;-import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.Iterator;@@ -99,8 +98,6 @@ public abstract class WorkspaceListPanel extends Panel {}};- private Component countLabel;-private DataTable<Workspace, Void> workspacesTable;private SelectionColumn<Workspace, Void> selectionColumn;@@ -174,7 +171,6 @@ public abstract class WorkspaceListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {workspacesTable.setCurrentPage(0);- target.add(countLabel);target.add(body);if (selectionColumn != null)selectionColumn.getSelections().clear();@@ -268,7 +264,6 @@ public abstract class WorkspaceListPanel extends Panel {for (IModel<Workspace> each : selectionColumn.getSelections())workspaces.add(each.getObject());getWorkspaceService().delete(workspaces);- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -332,7 +327,6 @@ public abstract class WorkspaceListPanel extends Panel {workspaces.add(it.next());getWorkspaceService().delete(workspaces);dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();}@@ -556,22 +550,6 @@ public abstract class WorkspaceListPanel extends Panel {});}- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} workspaces"), String.valueOf(dataProvider.size()));- else- return _T("found 1 workspace");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));-dataProvider = new LoadableDetachableDataProvider<>() {@Override@@ -729,7 +707,7 @@ public abstract class WorkspaceListPanel extends Panel {});body.add(workspacesTable = new DefaultDataTable<>("workspaces", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()));+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true));setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.htmlindex 67ed7e435b..479ed3b8c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html@@ -31,7 +31,6 @@<a wicket:id="tokens" class="text-gray mr-4 d-inline-block mb-2 text-nowrap"><wicket:svg href="token" class="icon"></wicket:svg> <wicket:t>Tokens</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><div wicket:id="body"><div wicket:id="feedback"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex 79d19e1433..0b9d300ce9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -36,7 +36,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;@@ -110,7 +109,6 @@ class AgentListPanel extends Panel {};- private Component countLabel;private DataTable<Agent, Void> agentsTable;@@ -150,7 +148,6 @@ class AgentListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {agentsTable.setCurrentPage(0);- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();querySubmitted = true;@@ -310,7 +307,6 @@ class AgentListPanel extends Panel {agentService.pause(agent);auditService.audit(null, "paused agent \"" + agent.getName() + "\"", null, null);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Paused selected agents"));@@ -358,7 +354,6 @@ class AgentListPanel extends Panel {agentService.resume(agent);auditService.audit(null, "resumed agent \"" + agent.getName() + "\"", null, null);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Resumed selected agents"));@@ -411,7 +406,6 @@ class AgentListPanel extends Panel {agentService.restart(agent);auditService.audit(null, "restarted agent \"" + agent.getName() + "\"", null, null);}- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Restart command issued to selected agents"));@@ -477,7 +471,6 @@ class AgentListPanel extends Panel {agents.add(model.getObject());removeAgents(agents);selectionColumn.getSelections().clear();- target.add(countLabel);target.add(body);});}@@ -545,7 +538,6 @@ class AgentListPanel extends Panel {}selectionColumn.getSelections().clear();dataProvider.detach();- target.add(countLabel);target.add(body);Session.get().success(_T("Paused all queried agents"));});@@ -613,7 +605,6 @@ class AgentListPanel extends Panel {auditService.audit(null, "resumed agent \"" + agent.getName() + "\"", null, null);}dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Resumed all queried agents"));@@ -682,7 +673,6 @@ class AgentListPanel extends Panel {auditService.audit(null, "restarted agent \"" + agent.getName() + "\"", null, null);}dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();Session.get().success(_T("Restart command issued to all queried agents"));@@ -750,7 +740,6 @@ class AgentListPanel extends Panel {agents.add(it.next());removeAgents(agents);dataProvider.detach();- target.add(countLabel);target.add(body);selectionColumn.getSelections().clear();});@@ -841,21 +830,6 @@ class AgentListPanel extends Panel {});- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} agents"), String.valueOf(dataProvider.size()));- else- return _T("found 1 agent");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<Agent, Void>() {@@ -948,7 +922,7 @@ class AgentListPanel extends Panel {});body.add(agentsTable = new DefaultDataTable<>("agents", columns, dataProvider,- WebConstants.PAGE_SIZE, getPagingHistorySupport()));+ WebConstants.PAGE_SIZE, getPagingHistorySupport(), true));setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.htmlindex b7a6a2cdf3..5c70d80c76 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.html@@ -15,7 +15,6 @@<svg wicket:id="icon" class="icon"></svg><wicket:t>Include Disabled</wicket:t></a>- <span wicket:id="count" class="float-right text-gray"></span></div><table wicket:id="users" class="users table table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex 226fdc2ecb..66b3207c37 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -6,7 +6,6 @@ import static io.onedev.server.model.User.Type.SERVICE;import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import java.text.MessageFormat;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -114,8 +113,6 @@ public class UserListPage extends AdministrationPage {private TextField<String> searchField;- private Component countLabel;-private AjaxLink<?> includeDisabledLink;private DataTable<User, Void> usersTable;@@ -143,7 +140,6 @@ public class UserListPage extends AdministrationPage {getPageParameters().set(PARAM_QUERY, state.query);getPageParameters().set(PARAM_INCLUDE_DISABLED, state.includeDisabled);target.add(searchField);- target.add(countLabel);if (WicketUtils.isSubscriptionActive())target.add(includeDisabledLink);selectionColumn.getSelections().clear();@@ -182,7 +178,6 @@ public class UserListPage extends AdministrationPage {elsepushState(target, url, state);- target.add(countLabel);usersTable.setCurrentPage(0);selectionColumn.getSelections().clear();target.add(usersTable);@@ -236,7 +231,6 @@ public class UserListPage extends AdministrationPage {for (var user: users) {auditService.audit(null, "enabled account \"" + user.getName() + "\"", null, null);}- target.add(countLabel);target.add(usersTable);selectionColumn.getSelections().clear();Session.get().success(_T("Users enabled successfully"));@@ -299,7 +293,6 @@ public class UserListPage extends AdministrationPage {for (var user: users) {auditService.audit(null, "disabled account \"" + user.getName() + "\"", null, null);}- target.add(countLabel);target.add(usersTable);selectionColumn.getSelections().clear();Session.get().success(_T("Users disabled successfully"));@@ -377,7 +370,6 @@ public class UserListPage extends AdministrationPage {for (var user: users) {auditService.audit(null, "converted \"" + user.getName() + "\" to service account", null, null);}- target.add(countLabel);target.add(usersTable);selectionColumn.getSelections().clear();Session.get().success(_T("Users converted to service accounts successfully"));@@ -456,7 +448,6 @@ public class UserListPage extends AdministrationPage {var oldAuditContent = VersionedXmlDoc.fromBean(user).toXML();auditService.audit(null, "deleted account \"" + user.getName() + "\"", oldAuditContent, null);}- target.add(countLabel);target.add(usersTable);selectionColumn.getSelections().clear();Session.get().success(_T("Users deleted successfully"));@@ -815,7 +806,6 @@ public class UserListPage extends AdministrationPage {pushState(target, url, state);target.add(this);- target.add(countLabel);usersTable.setCurrentPage(0);selectionColumn.getSelections().clear();@@ -956,21 +946,6 @@ public class UserListPage extends AdministrationPage {});- add(countLabel = new Label("count", new AbstractReadOnlyModel<String>() {- @Override- public String getObject() {- if (dataProvider.size() > 1)- return MessageFormat.format(_T("found {0} users"), String.valueOf(dataProvider.size()));- else- return _T("found 1 user");- }- }) {- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(dataProvider.size() != 0);- }- }.setOutputMarkupPlaceholderTag(true));dataProvider = new LoadableDetachableDataProvider<>() {@@ -1017,7 +992,7 @@ public class UserListPage extends AdministrationPage {};add(usersTable = new DefaultDataTable<User, Void>("users", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport));+ WebConstants.PAGE_SIZE, pagingHistorySupport, true));}private UserService getUserService() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 3532583f19..abc6768378 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -151,7 +151,10 @@ table>thead>tr>th, table>tbody>tr>td {}tr.navigation>td {- padding: 20px;+ padding-top: 20px;+ padding-bottom: 20px;+ padding-left: 0;+ padding-right: 0;}.hidden {display: none !important;