Skip to content

The Unified and Autonomous Development Platform

Performance tuning

Robin Shen9a43b1375aa6
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
index 50cee75fc3..326d0250e4 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
@@ -9,7 +9,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -191,9 +190,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
orders.add(builder.desc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));
}
- Path<String> idPath = root.get("id");
if (orders.isEmpty())
- orders.add(builder.desc(idPath));
+ orders.add(builder.desc(root.get("id")));
query.orderBy(orders);
return query;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
index 1c3bb91ec0..9d95d75b6d 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
@@ -18,7 +18,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -273,9 +272,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));
}
- Path<String> idPath = root.get("id");
if (orders.isEmpty())
- orders.add(builder.desc(idPath));
+ orders.add(builder.desc(root.get("id")));
query.orderBy(orders);
return query;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 71a765b9eb..813627960b 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -15,7 +15,6 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -145,9 +144,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
}
- Path<String> idPath = root.get("id");
if (orders.isEmpty())
- orders.add(builder.desc(idPath));
+ orders.add(builder.desc(root.get("number")));
query.orderBy(orders);
return query;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index 4706ca1be5..feb7344e56 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -26,7 +26,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -959,9 +958,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));
}
- Path<String> idPath = root.get("id");
if (orders.isEmpty())
- orders.add(builder.desc(idPath));
+ orders.add(builder.desc(root.get("number")));
query.orderBy(orders);
return query;
diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index dce61a2537..fec05960a1 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -52,6 +52,7 @@ import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -197,11 +198,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {
});
add(form);
- dataProvider = new SortableDataProvider<Build, Void>() {
-
- @Override
- public void detach() {
- }
+ dataProvider = new LoadableDetachableDataProvider<Build, Void>() {
@Override
public Iterator<? extends Build> iterator(long first, long count) {
@@ -209,7 +206,7 @@ public abstract class BuildListPanel extends GenericPanel<String> {
}
@Override
- public long size() {
+ public long calcSize() {
BuildQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
return getBuildManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 353ea4c8fb..41060e793a 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -49,6 +49,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
@@ -176,7 +177,7 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {
add(new NotificationPanel("feedback", this));
- SortableDataProvider<CodeComment, Void> dataProvider = new SortableDataProvider<CodeComment, Void>() {
+ SortableDataProvider<CodeComment, Void> dataProvider = new LoadableDetachableDataProvider<CodeComment, Void>() {
@Override
public void detach() {
@@ -189,7 +190,7 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {
}
@Override
- public long size() {
+ public long calcSize() {
CodeCommentQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
return getCodeCommentManager().count(getProject(), getPullRequest(), SecurityUtils.getUser(), parsedQuery.getCriteria());
diff --git a/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java b/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
index fcaa687bc0..378766b76d 100644
--- a/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.component.datatable;
import java.util.Iterator;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.hibernate.criterion.Order;
@@ -14,7 +13,7 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@SuppressWarnings("serial")
-public class EntityDataProvider<T extends AbstractEntity> extends SortableDataProvider<T, String> {
+public class EntityDataProvider<T extends AbstractEntity> extends LoadableDetachableDataProvider<T, String> {
private final Class<T> entityType;
@@ -28,7 +27,6 @@ public class EntityDataProvider<T extends AbstractEntity> extends SortableDataPr
@Override
public Iterator<T> iterator(long first, long count) {
EntityCriteria<T> criteria = EntityCriteria.of(entityType);
- restrict(criteria);
if (getSort() != null) {
if (getSort().isAscending())
@@ -41,9 +39,8 @@ public class EntityDataProvider<T extends AbstractEntity> extends SortableDataPr
}
@Override
- public long size() {
+ public long calcSize() {
EntityCriteria<? extends AbstractEntity> criteria = EntityCriteria.of(entityType);
- restrict(criteria);
return AppLoader.getInstance(Dao.class).count(criteria);
}
@@ -60,8 +57,4 @@ public class EntityDataProvider<T extends AbstractEntity> extends SortableDataPr
};
}
- protected void restrict(EntityCriteria<? extends AbstractEntity> criteria) {
-
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java b/core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java
index 7d87d4e177..96fb6ff30c 100644
--- a/core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java
+++ b/core/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java
@@ -56,8 +56,15 @@ public class HistoryAwarePagingNavigator extends BootstrapPagingNavigator {
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());
+ pagingHistorySupport.newPageParameters(pageNumber)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(pageNumber >= 0 && pageNumber < getPageable().getPageCount());
+ }
+
+ };
link.add(new DisabledAttributeLinkBehavior());
} else {
link = new PagingNavigationIncrementLink<Void>(id, pageable, increment);
@@ -69,11 +76,19 @@ public class HistoryAwarePagingNavigator extends BootstrapPagingNavigator {
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());
+ pagingHistorySupport.newPageParameters(pageNumber)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ if (pageNumber == -1)
+ setEnabled(getPageable().getPageCount() - 1 != pageable.getCurrentPage());
+ else
+ setEnabled(pageNumber != pageable.getCurrentPage());
+ }
+
+ };
link.add(new DisabledAttributeLinkBehavior());
} else {
link = new PagingNavigationLink<Void>(id, pageable, pageNumber);
diff --git a/core/src/main/java/io/onedev/server/web/component/datatable/LoadableDetachableDataProvider.java b/core/src/main/java/io/onedev/server/web/component/datatable/LoadableDetachableDataProvider.java
new file mode 100644
index 0000000000..c6f5c004d0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/datatable/LoadableDetachableDataProvider.java
@@ -0,0 +1,23 @@
+package io.onedev.server.web.component.datatable;
+
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+
+@SuppressWarnings("serial")
+public abstract class LoadableDetachableDataProvider<T, S> extends SortableDataProvider<T, S> {
+
+ private Long size;
+
+ @Override
+ public final long size() {
+ if (size == null)
+ size = calcSize();
+ return size;
+ }
+
+ @Override
+ public void detach() {
+ size = null;
+ }
+
+ protected abstract long calcSize();
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 1da08f4afc..7688289768 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -55,6 +55,7 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.issue.state.IssueStateLabel;
@@ -383,11 +384,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
});
- dataProvider = new SortableDataProvider<Issue, Void>() {
-
- @Override
- public void detach() {
- }
+ dataProvider = new LoadableDetachableDataProvider<Issue, Void>() {
@Override
public Iterator<? extends Issue> iterator(long first, long count) {
@@ -395,7 +392,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
}
@Override
- public long size() {
+ public long calcSize() {
IssueQuery parsedQuery = parsedQueryModel.getObject();
if (parsedQuery != null)
return getIssueManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
index 96d800e9bc..f0356fdd1e 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -32,6 +32,7 @@ import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.link.BranchLink;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -135,7 +136,7 @@ public abstract class IssuePullRequestsPanel extends Panel {
});
- SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {
+ SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {
@Override
public Iterator<? extends PullRequest> iterator(long first, long count) {
@@ -143,7 +144,7 @@ public abstract class IssuePullRequestsPanel extends Panel {
}
@Override
- public long size() {
+ public long calcSize() {
return requestsModel.getObject().size();
}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstBuildQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstBuildQueryLink.java
deleted file mode 100644
index c85db99de5..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstBuildQueryLink.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.NamedBuildQuery;
-import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.page.project.builds.BuildListPage;
-
-public class FirstBuildQueryLink extends ViewStateAwarePageLink<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public FirstBuildQueryLink(String id, Project project) {
- super(id, BuildListPage.class, getPageParameters(project));
- }
-
- private static PageParameters getPageParameters(Project project) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (project.getBuildQuerySettingOfCurrentUser() != null) {
- for (NamedBuildQuery namedQuery: project.getBuildQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedBuildQuery namedQuery: project.getSavedBuildQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !BuildQuery.parse(project, each, true).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- return BuildListPage.paramsOf(project, query);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java
deleted file mode 100644
index bdc460bb07..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstCodeCommentQueryLink.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
-import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
-
-public class FirstCodeCommentQueryLink extends ViewStateAwarePageLink<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public FirstCodeCommentQueryLink(String id, Project project) {
- super(id, ProjectCodeCommentsPage.class, getPageParameters(project));
- }
-
- private static PageParameters getPageParameters(Project project) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (project.getCodeCommentQuerySettingOfCurrentUser() != null) {
- for (NamedCodeCommentQuery namedQuery: project.getCodeCommentQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedCodeCommentQuery namedQuery: project.getSavedCodeCommentQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(project, each, true).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- return ProjectCodeCommentsPage.paramsOf(project, query);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java
deleted file mode 100644
index f4e22c0aca..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstCommitQueryLink.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.NamedCommitQuery;
-import io.onedev.server.search.commit.CommitQueryUtils;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
-
-public class FirstCommitQueryLink extends ViewStateAwarePageLink<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public FirstCommitQueryLink(String id, Project project) {
- super(id, ProjectCommitsPage.class, getPageParameters(project));
- }
-
- private static PageParameters getPageParameters(Project project) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (project.getCommitQuerySettingOfCurrentUser() != null) {
- for (NamedCommitQuery namedQuery: project.getCommitQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedCommitQuery namedQuery: project.getSavedCommitQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !CommitQueryUtils.needsLogin(each)) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- ProjectCommitsPage.State state = new ProjectCommitsPage.State();
- state.query = query;
- return ProjectCommitsPage.paramsOf(project, state);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
deleted file mode 100644
index 4f62589dcc..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
-
-public class FirstIssueQueryLink extends ViewStateAwarePageLink<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public FirstIssueQueryLink(String id, Project project) {
- super(id, IssueListPage.class, getPageParameters(project));
- }
-
- private static PageParameters getPageParameters(Project project) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (project.getIssueQuerySettingOfCurrentUser() != null) {
- for (NamedIssueQuery namedQuery: project.getIssueQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedIssueQuery namedQuery: project.getSavedIssueQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !IssueQuery.parse(project, each, true).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- return IssueListPage.paramsOf(project, query, 0);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java
deleted file mode 100644
index 5a433d2e77..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.web.component.link;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.page.project.pullrequests.list.PullRequestListPage;
-
-public class FirstPullRequestQueryLink extends ViewStateAwarePageLink<Void> {
-
- private static final long serialVersionUID = 1L;
-
- public FirstPullRequestQueryLink(String id, Project project) {
- super(id, PullRequestListPage.class, getPageParameters(project));
- }
-
- private static PageParameters getPageParameters(Project project) {
- String query = null;
- List<String> queries = new ArrayList<>();
- if (project.getPullRequestQuerySettingOfCurrentUser() != null) {
- for (NamedPullRequestQuery namedQuery: project.getPullRequestQuerySettingOfCurrentUser().getUserQueries())
- queries.add(namedQuery.getQuery());
- }
- for (NamedPullRequestQuery namedQuery: project.getSavedPullRequestQueries())
- queries.add(namedQuery.getQuery());
- for (String each: queries) {
- try {
- if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(project, each, true).needsLogin()) {
- query = each;
- break;
- }
- } catch (Exception e) {
- }
- }
- return PullRequestListPage.paramsOf(project, query, 0);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index c514832da2..14270cebe5 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -36,6 +36,7 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.link.ProjectLink;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -132,7 +133,7 @@ public class ProjectListPanel extends Panel {
}
});
- SortableDataProvider<ProjectFacade, Void> dataProvider = new SortableDataProvider<ProjectFacade, Void>() {
+ SortableDataProvider<ProjectFacade, Void> dataProvider = new LoadableDetachableDataProvider<ProjectFacade, Void>() {
@Override
public Iterator<? extends ProjectFacade> iterator(long first, long count) {
@@ -145,7 +146,7 @@ public class ProjectListPanel extends Panel {
}
@Override
- public long size() {
+ public long calcSize() {
return projectsModel.getObject().size();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 0b2c671442..690d044be9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -33,11 +33,6 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ComponentRenderer;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.link.FirstBuildQueryLink;
-import io.onedev.server.web.component.link.FirstCodeCommentQueryLink;
-import io.onedev.server.web.component.link.FirstCommitQueryLink;
-import io.onedev.server.web.component.link.FirstIssueQueryLink;
-import io.onedev.server.web.component.link.FirstPullRequestQueryLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.sidebar.SideBar;
import io.onedev.server.web.component.tabbable.PageTab;
@@ -152,7 +147,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstCommitQueryLink(linkId, getProject());
+ ProjectCommitsPage.State state = new ProjectCommitsPage.State();
+ state.query = "";
+ return new ViewStateAwarePageLink<Void>(linkId, ProjectCommitsPage.class,
+ ProjectCommitsPage.paramsOf(getProject(), state));
}
};
}
@@ -172,7 +170,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstPullRequestQueryLink(linkId, getProject());
+ return new ViewStateAwarePageLink<Void>(linkId, PullRequestListPage.class,
+ PullRequestListPage.paramsOf(getProject(), "", 0));
}
};
}
@@ -189,7 +188,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstIssueQueryLink(linkId, getProject());
+ return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,
+ IssueListPage.paramsOf(getProject(), "", 0));
}
};
}
@@ -204,7 +204,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstBuildQueryLink(linkId, getProject());
+ return new ViewStateAwarePageLink<Void>(linkId, BuildListPage.class, BuildListPage.paramsOf(getProject(), ""));
}
};
}
@@ -221,7 +221,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstCodeCommentQueryLink(linkId, getProject());
+ return new ViewStateAwarePageLink<Void>(linkId, ProjectCodeCommentsPage.class,
+ ProjectCodeCommentsPage.paramsOf(getProject(), ""));
}
};
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
index db7a3269c4..07ac447958 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project.builds;
import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Nullable;
@@ -19,6 +20,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
@@ -40,6 +42,25 @@ public class BuildListPage extends ProjectPage {
public BuildListPage(PageParameters params) {
super(params);
query = params.get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ List<String> queries = new ArrayList<>();
+ if (getProject().getBuildQuerySettingOfCurrentUser() != null) {
+ for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedBuildQuery namedQuery: getProject().getSavedBuildQueries())
+ queries.add(namedQuery.getQuery());
+ query = null;
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !BuildQuery.parse(getProject(), each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}
private BuildQuerySettingManager getBuildQuerySettingManager() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
index df9e6fc66e..3c874a8da5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project.comments;
import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Nullable;
@@ -37,11 +38,30 @@ public class ProjectCodeCommentsPage extends ProjectPage {
private static final String PARAM_QUERY = "query";
- private final String query;
+ private String query;
public ProjectCodeCommentsPage(PageParameters params) {
super(params);
query = params.get(PARAM_QUERY).toString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getCodeCommentQuerySettingOfCurrentUser() != null) {
+ for (NamedCodeCommentQuery namedQuery: getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCodeCommentQuery namedQuery: getProject().getSavedCodeCommentQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CodeCommentQuery.parse(getProject(), each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}
private CodeCommentQuerySettingManager getCodeCommentQuerySettingManager() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index e5762d609c..b7be62809e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -181,10 +181,31 @@ public class ProjectCommitsPage extends ProjectPage {
super(params);
state.compareWith = params.get(PARAM_COMPARE_WITH).toString();
- state.query = params.get(PARAM_COMMIT_QUERY).toString();
+
Integer page = params.get(PARAM_CURRENT_PAGE).toOptionalInteger();
if (page != null)
state.page = page.intValue();
+
+ state.query = params.get(PARAM_COMMIT_QUERY).toString();
+ if (state.query != null && state.query.length() == 0) {
+ state.query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getCommitQuerySettingOfCurrentUser() != null) {
+ for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedCommitQuery namedQuery: getProject().getSavedCommitQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !CommitQueryUtils.needsLogin(each)) {
+ state.query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}
@SuppressWarnings("deprecation")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
index 4e0014145f..84b1e70a9d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
@@ -15,7 +15,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.link.FirstIssueQueryLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -107,7 +106,8 @@ public abstract class IssuesPage extends ProjectPage {
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new FirstIssueQueryLink(linkId, getProject());
+ return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,
+ IssueListPage.paramsOf(getProject(), "", 0));
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
index 75b1b7a746..a347bc8251 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
@@ -167,6 +167,9 @@
border-radius: 2px;
padding: 0 2px;
}
+#issue-boards>.body>.column>.content>.body .loading-indicator {
+ margin-bottom: 16px;
+}
#issue-boards>.body .card .detail {
color: #666;
text-decoration: none;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index db9b0b131f..74f5190239 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -1,6 +1,7 @@
package io.onedev.server.web.page.project.issues.issuelist;
import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Nullable;
@@ -19,6 +20,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.issues.IssuesPage;
@@ -40,6 +42,25 @@ public class IssueListPage extends IssuesPage {
public IssueListPage(PageParameters params) {
super(params);
query = params.get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getIssueQuerySettingOfCurrentUser() != null) {
+ for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedIssueQuery namedQuery: getProject().getSavedIssueQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !IssueQuery.parse(getProject(), each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}
private IssueQuerySettingManager getIssueQuerySettingManager() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
index d6571b83bb..ec752ef807 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java
@@ -37,6 +37,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.MilestoneSort;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
@@ -215,7 +216,7 @@ public class MilestoneListPage extends IssuesPage {
});
}
- SortableDataProvider<Milestone, Void> dataProvider = new SortableDataProvider<Milestone, Void>() {
+ SortableDataProvider<Milestone, Void> dataProvider = new LoadableDetachableDataProvider<Milestone, Void>() {
@Override
public Iterator<? extends Milestone> iterator(long first, long count) {
@@ -225,7 +226,7 @@ public class MilestoneListPage extends IssuesPage {
}
@Override
- public long size() {
+ public long calcSize() {
return OneDev.getInstance(Dao.class).count(getCriteria(closed));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index f663eb840d..f7ea7e109e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -103,6 +103,25 @@ public class PullRequestListPage extends ProjectPage {
public PullRequestListPage(PageParameters params) {
super(params);
query = params.get(PARAM_QUERY).toOptionalString();
+ if (query != null && query.length() == 0) {
+ query = null;
+ List<String> queries = new ArrayList<>();
+ if (getProject().getPullRequestQuerySettingOfCurrentUser() != null) {
+ for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())
+ queries.add(namedQuery.getQuery());
+ }
+ for (NamedPullRequestQuery namedQuery: getProject().getSavedPullRequestQueries())
+ queries.add(namedQuery.getQuery());
+ for (String each: queries) {
+ try {
+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(getProject(), each, true).needsLogin()) {
+ query = each;
+ break;
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}
private PullRequestQuerySettingManager getPullRequestQuerySettingManager() {
@@ -386,8 +405,11 @@ public class PullRequestListPage extends ProjectPage {
SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {
+ private Integer count;
+
@Override
public void detach() {
+ count = null;
}
@Override
@@ -397,11 +419,14 @@ public class PullRequestListPage extends ProjectPage {
@Override
public long size() {
- PullRequestQuery parsedQuery = parsedQueryModel.getObject();
- if (parsedQuery != null)
- return getPullRequestManager().count(getProject(), getLoginUser(), parsedQuery.getCriteria());
- else
- return 0;
+ if (count == null) {
+ PullRequestQuery parsedQuery = parsedQueryModel.getObject();
+ if (parsedQuery != null)
+ count = getPullRequestManager().count(getProject(), getLoginUser(), parsedQuery.getCriteria());
+ else
+ count = 0;
+ }
+ return count;
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java
index 8d90603b79..1d1ab8ea54 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java
@@ -40,6 +40,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -165,7 +166,7 @@ public class ConfigurationListPage extends ProjectSettingPage {
}
});
- SortableDataProvider<Configuration, Void> dataProvider = new SortableDataProvider<Configuration, Void>() {
+ SortableDataProvider<Configuration, Void> dataProvider = new LoadableDetachableDataProvider<Configuration, Void>() {
@Override
public Iterator<? extends Configuration> iterator(long first, long count) {
@@ -175,7 +176,7 @@ public class ConfigurationListPage extends ProjectSettingPage {
}
@Override
- public long size() {
+ public long calcSize() {
return OneDev.getInstance(ConfigurationManager.class).count(getCriteria());
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java
index 7c0115437b..6bd023a44c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/team/TeamListPage.java
@@ -35,6 +35,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -151,7 +152,7 @@ public class TeamListPage extends ProjectSettingPage {
});
- SortableDataProvider<Team, Void> dataProvider = new SortableDataProvider<Team, Void>() {
+ SortableDataProvider<Team, Void> dataProvider = new LoadableDetachableDataProvider<Team, Void>() {
@Override
public Iterator<? extends Team> iterator(long first, long count) {
@@ -161,7 +162,7 @@ public class TeamListPage extends ProjectSettingPage {
}
@Override
- public long size() {
+ public long calcSize() {
return OneDev.getInstance(TeamManager.class).count(getCriteria());
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java
index 0ca9a16c7c..07dd4fd909 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java
@@ -19,6 +19,7 @@ import org.apache.wicket.model.Model;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
@SuppressWarnings("serial")
class ContributionListPanel extends Panel {
@@ -69,7 +70,7 @@ class ContributionListPanel extends Panel {
}
});
- SortableDataProvider<DayContribution, Void> dataProvider = new SortableDataProvider<DayContribution, Void>() {
+ SortableDataProvider<DayContribution, Void> dataProvider = new LoadableDetachableDataProvider<DayContribution, Void>() {
@Override
public Iterator<? extends DayContribution> iterator(long first, long count) {
@@ -80,7 +81,7 @@ class ContributionListPanel extends Panel {
}
@Override
- public long size() {
+ public long calcSize() {
return getContribution().size();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index 4f2034ec74..666392fa08 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -31,6 +31,7 @@ import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Day;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
@SuppressWarnings("serial")
public class SourceLinesPage extends ProjectStatsPage {
@@ -114,7 +115,7 @@ public class SourceLinesPage extends ProjectStatsPage {
});
- SortableDataProvider<Day, Void> dataProvider = new SortableDataProvider<Day, Void>() {
+ SortableDataProvider<Day, Void> dataProvider = new LoadableDetachableDataProvider<Day, Void>() {
private List<Day> getDays() {
List<Day> days = new ArrayList<>();
@@ -133,7 +134,7 @@ public class SourceLinesPage extends ProjectStatsPage {
}
@Override
- public long size() {
+ public long calcSize() {
return getDays().size();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index b47194918b..795b443f3a 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 98a163d2a9..1fb2d03962 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -18,7 +18,64 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
-
+ /*
+ for (int k=0; k<100; k++) {
+ UnitOfWork unitOfWork = OneDev.getInstance(UnitOfWork.class);
+ unitOfWork.begin();
+ Session session = unitOfWork.getSession();
+ session.beginTransaction();
+ Project project = OneDev.getInstance(ProjectManager.class).load(1L);
+ User user = OneDev.getInstance(UserManager.class).load(1L);
+ Milestone milestone = OneDev.getInstance(MilestoneManager.class).load(1L);
+ try {
+ for (int i=0; i<10000; i++) {
+ long j = k*10000 +i;
+ Issue issue = new Issue();
+ issue.setProject(project);
+ issue.setTitle("Issue " + j);
+ issue.setNumber(j+2);
+ if (j<10000)
+ issue.setState("Open");
+ else
+ issue.setState("Closed");
+ if (j<1000)
+ issue.setMilestone(milestone);
+ issue.setSubmitDate(new Date());
+ issue.setSubmitter(user);
+ issue.setUUID(UUID.randomUUID().toString());
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setDescription("submitted");
+ lastActivity.setUser(issue.getSubmitter());
+ lastActivity.setDate(issue.getSubmitDate());
+ issue.setLastActivity(lastActivity);
+ session.save(issue);
+ IssueFieldUnary unary = new IssueFieldUnary();
+ unary.setIssue(issue);
+ unary.setName("Type");
+ unary.setType(InputSpec.ENUMERATION);
+ if (i%4 == 0) {
+ unary.setOrdinal(1L);
+ unary.setValue("Bug");
+ } else if (i%4 == 1) {
+ unary.setOrdinal(2L);
+ unary.setValue("Task");
+ } else if (i%4 == 2) {
+ unary.setOrdinal(3L);
+ unary.setValue("New Feature");
+ } else {
+ unary.setOrdinal(4L);
+ unary.setValue("Improvement");
+ }
+ session.save(unary);
+ }
+ session.flush();
+ session.getTransaction().commit();
+ } finally {
+ unitOfWork.end();
+ }
+ System.out.println(k);
+ }
+ */
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/test/test.css b/core/src/main/java/io/onedev/server/web/page/test/test.css
index e68ba6a656..e69de29bb2 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/test.css
+++ b/core/src/main/java/io/onedev/server/web/page/test/test.css
@@ -1,2 +0,0 @@
-a.test:before {
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java
index 0bea16a2c4..2ca67183d4 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/user/ParticipatedProjectsPage.java
@@ -45,6 +45,7 @@ import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.link.ProjectLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -295,7 +296,7 @@ public class ParticipatedProjectsPage extends UserPage {
}
});
- SortableDataProvider<Project, Void> dataProvider = new SortableDataProvider<Project, Void>() {
+ SortableDataProvider<Project, Void> dataProvider = new LoadableDetachableDataProvider<Project, Void>() {
@Override
public Iterator<? extends Project> iterator(long first, long count) {
@@ -312,7 +313,7 @@ public class ParticipatedProjectsPage extends UserPage {
}
@Override
- public long size() {
+ public long calcSize() {
return getJoinedProjects().size();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java
index fe83b75e26..410dc10fde 100644
--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.java
@@ -37,6 +37,7 @@ import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.layout.LayoutPage;
@@ -184,7 +185,7 @@ public class UserListPage extends LayoutPage {
}
});
- SortableDataProvider<User, Void> dataProvider = new SortableDataProvider<User, Void>() {
+ SortableDataProvider<User, Void> dataProvider = new LoadableDetachableDataProvider<User, Void>() {
@Override
public Iterator<? extends User> iterator(long first, long count) {
@@ -194,7 +195,7 @@ public class UserListPage extends LayoutPage {
}
@Override
- public long size() {
+ public long calcSize() {
return OneDev.getInstance(UserManager.class).count(getCriteria());
}