The Unified and Autonomous Development Platform
Build/issue/pull request prev/next navigation improvement
Robin Shena40eb12a8e00
diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.javaindex 08ea452c6c..a1dfb85711 100644--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java@@ -1,8 +1,5 @@package io.onedev.server.web;-import java.util.Map;-import java.util.concurrent.ConcurrentHashMap;-import javax.annotation.Nullable;import javax.servlet.http.HttpSession;@@ -13,18 +10,17 @@ import org.apache.wicket.protocol.http.WicketServlet;import org.apache.wicket.request.Request;import io.onedev.server.OneDev;-import io.onedev.server.model.Project;import io.onedev.server.web.util.Cursor;public class WebSession extends org.apache.wicket.protocol.http.WebSession {private static final long serialVersionUID = 1L;- private final Map<Long, Cursor> issueCursors = new ConcurrentHashMap<>();+ private volatile Cursor issueCursor;- private final Map<Long, Cursor> buildCursors = new ConcurrentHashMap<>();+ private volatile Cursor buildCursor;- private final Map<Long, Cursor> pullRequestCursors = new ConcurrentHashMap<>();+ private volatile Cursor pullRequestCursor;public WebSession(Request request) {super(request);@@ -56,39 +52,30 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {}@Nullable- public Cursor getIssueCursor(Project project) {- return issueCursors.get(project.getId());+ public Cursor getIssueCursor() {+ return issueCursor;}@Nullable- public Cursor getBuildCursor(Project project) {- return buildCursors.get(project.getId());+ public Cursor getBuildCursor() {+ return buildCursor;}@Nullable- public Cursor getPullRequestCursor(Project project) {- return pullRequestCursors.get(project.getId());+ public Cursor getPullRequestCursor() {+ return pullRequestCursor;}- public void setIssueCursor(Project project, @Nullable Cursor cursor) {- if (cursor != null)- issueCursors.put(project.getId(), cursor);- else- issueCursors.remove(project.getId());+ public void setIssueCursor(@Nullable Cursor issueCursor) {+ this.issueCursor = issueCursor;}- public void setBuildCursor(Project project, @Nullable Cursor cursor) {- if (cursor != null)- buildCursors.put(project.getId(), cursor);- else- buildCursors.remove(project.getId());+ public void setBuildCursor(@Nullable Cursor buildCursor) {+ this.buildCursor = buildCursor;}- public void setPullRequestCursor(Project project, @Nullable Cursor cursor) {- if (cursor != null)- pullRequestCursors.put(project.getId(), cursor);- else- pullRequestCursors.remove(project.getId());+ public void setPullRequestCursor(@Nullable Cursor pullRequestCursor) {+ this.pullRequestCursor = pullRequestCursor;}public static WebSession from(HttpSession session) {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 d9ecfab660..8755b709ee 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@@ -161,17 +161,6 @@ public abstract class BuildListPanel extends Panel {return null;}- @Nullable- private Cursor getCursor(Item<ICellPopulator<Build>> cellItem) {- if (getProject() != null) {- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);- return new Cursor(parsedQueryModel.getObject().toString(), (int)buildsTable.getItemCount(),- (int)buildsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());- } else {- return null;- }- }-private GlobalBuildSetting getGlobalBuildSetting() {return OneDev.getInstance(SettingManager.class).getBuildSetting();}@@ -433,7 +422,10 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setBuildCursor(rowModel.getObject().getProject(), getCursor(cellItem));+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ Cursor cursor = new Cursor(parsedQueryModel.getObject().toString(), (int)buildsTable.getItemCount(),+ (int)buildsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProject() != null);+ WebSession.get().setBuildCursor(cursor);}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 75956d5d42..0cb7a09e96 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -65,8 +65,8 @@ public abstract class BuildSidePanel extends Panel {add(new EntityNavPanel<Build>("buildNav") {@Override- protected EntityQuery<Build> parse(String queryString) {- return BuildQuery.parse(getProject(), queryString, true, true);+ protected EntityQuery<Build> parse(String queryString, boolean inProject) {+ return BuildQuery.parse(inProject?getProject():null, queryString, true, true);}@Override@@ -75,8 +75,8 @@ public abstract class BuildSidePanel extends Panel {}@Override- protected List<Build> query(EntityQuery<Build> query, int offset, int count) {- return getBuildManager().query(getProject(), query, offset, count);+ protected List<Build> query(EntityQuery<Build> query, int offset, int count, boolean inProject) {+ return getBuildManager().query(inProject?getProject():null, query, offset, count);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.javaindex e32707f8f6..3eeba9c81d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/nav/EntityNavPanel.java@@ -67,14 +67,14 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- EntityQuery<T> query = parse(getCursor().getQuery());+ EntityQuery<T> query = parse(getCursor().getQuery(), getCursor().isInProject());int count = getCursor().getCount();int offset = getCursor().getOffset() - 1;- List<T> entities = query(query, offset, 1);+ List<T> entities = query(query, offset, 1, getCursor().isInProject());if (!entities.isEmpty()) {if (!query.matches(getEntity()))count--;- Cursor prevCursor = new Cursor(getCursor().getQuery(), count, offset);+ Cursor prevCursor = new Cursor(getCursor().getQuery(), count, offset, getCursor().isInProject());getCursorSupport().navTo(target, entities.get(0), prevCursor);} else {WebSession.get().warn("No more " + entityName + "s");@@ -100,7 +100,7 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {- EntityQuery<T> query = parse(getCursor().getQuery());+ EntityQuery<T> query = parse(getCursor().getQuery(), getCursor().isInProject());int offset = getCursor().getOffset();int count = getCursor().getCount();if (query.matches(getEntity()))@@ -108,9 +108,9 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {elsecount--;- List<T> entities = query(query, offset, 1);+ List<T> entities = query(query, offset, 1, getCursor().isInProject());if (!entities.isEmpty()) {- Cursor nextCursor = new Cursor(getCursor().getQuery(), count, offset);+ Cursor nextCursor = new Cursor(getCursor().getQuery(), count, offset, getCursor().isInProject());getCursorSupport().navTo(target, entities.get(0), nextCursor);} else {WebSession.get().warn("No more " + entityName + "s");@@ -135,13 +135,13 @@ public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {response.render(CssHeaderItem.forReference(new EntityNavCssResourceReference()));}- protected abstract EntityQuery<T> parse(String queryString);+ protected abstract EntityQuery<T> parse(String queryString, boolean inProject);protected abstract T getEntity();@Nullableprotected abstract CursorSupport<T> getCursorSupport();- protected abstract List<T> query(EntityQuery<T> query, int offset, int count);+ protected abstract List<T> query(EntityQuery<T> query, int offset, int count, boolean inProject);}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 5a92e2888a..5bffc42203 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@@ -142,7 +142,6 @@ public abstract class IssueListPanel extends Panel {super.onDetach();}- @Nullableprotected abstract Project getProject();protected IssueQuery getBaseQuery() {@@ -578,13 +577,9 @@ public abstract class IssueListPanel extends Panel {Issue issue = rowModel.getObject();Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);Item<?> row = cellItem.findParent(Item.class);- Cursor cursor;- if (getProject() != null) {- cursor = new Cursor(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),- (int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());- } else {- cursor = null;- }++ Cursor cursor = new Cursor(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),+ (int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProject() != null);String label;if (getProject() == null)@@ -603,7 +598,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setIssueCursor(rowModel.getObject().getProject(), cursor);+ WebSession.get().setIssueCursor(cursor);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex c4a3a12c3d..8921527b1c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -92,8 +92,8 @@ public abstract class IssueSidePanel extends Panel {addOrReplace(new EntityNavPanel<Issue>("issueNav") {@Override- protected EntityQuery<Issue> parse(String queryString) {- return IssueQuery.parse(getProject(), queryString, true, true, false, false, false);+ protected EntityQuery<Issue> parse(String queryString, boolean inProject) {+ return IssueQuery.parse(inProject?getProject():null, queryString, true, true, false, false, false);}@Override@@ -102,8 +102,8 @@ public abstract class IssueSidePanel extends Panel {}@Override- protected List<Issue> query(EntityQuery<Issue> query, int offset, int count) {- return getIssueManager().query(getProject(), query, offset, count);+ protected List<Issue> query(EntityQuery<Issue> query, int offset, int count, boolean inProject) {+ return getIssueManager().query(inProject?getProject():null, query, offset, count);}@Overridediff --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 c0d49b6611..78ff4272ab 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@@ -293,14 +293,9 @@ public abstract class PullRequestListPanel extends Panel {PullRequest request = rowModel.getObject();Fragment fragment = new Fragment(componentId, "contentFrag", PullRequestListPanel.this);- Cursor cursor;- if (getProject() != null) {- Item<?> row = cellItem.findParent(Item.class);- cursor = new Cursor(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),- (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());- } else {- cursor = null;- }+ Item<?> row = cellItem.findParent(Item.class);+ Cursor cursor = new Cursor(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProject() != null);String label;if (getProject() == null)@@ -319,7 +314,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setPullRequestCursor(rowModel.getObject().getTargetProject(), cursor);+ WebSession.get().setPullRequestCursor(cursor);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 2bc2d56775..9fc934d1da 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -384,12 +384,12 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic Cursor getCursor() {- return WebSession.get().getBuildCursor(getProject());+ return WebSession.get().getBuildCursor();}@Overridepublic void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {- WebSession.get().setBuildCursor(getProject(), cursor);+ WebSession.get().setBuildCursor(cursor);PageParameters params = getPageParameters();params.set(PARAM_BUILD, entity.getNumber());setResponsePage(getPageClass(), params);@@ -405,7 +405,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic void onClick() {OneDev.getInstance(BuildManager.class).delete(getBuild());- Cursor cursor = WebSession.get().getBuildCursor(getProject());+ Cursor cursor = WebSession.get().getBuildCursor();PageParameters params = ProjectBuildsPage.paramsOf(getProject(), Cursor.getQuery(cursor),Cursor.getPage(cursor) + 1);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 8702a5e95e..c664a077de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -12,7 +12,7 @@</div></div><div class="body">- <span wicket:id="number"></span>+ <a wicket:id="number"></a><span wicket:id="title"></span></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 80fc597872..84c14fec5c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -199,7 +199,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setIssueCursor(getIssue().getProject(), getCursor());+ WebSession.get().setIssueCursor(getCursor());}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 40cd25573b..9c02e08726 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -61,7 +61,7 @@ abstract class CardListPanel extends Panel {protected Cursor getCursor() {IssueQuery query = getQuery();if (query != null)- return new Cursor(query.toString(), getCardCount(), cardOffset);+ return new Cursor(query.toString(), getCardCount(), cardOffset, true);elsereturn null;}@@ -102,7 +102,7 @@ abstract class CardListPanel extends Panel {protected Cursor getCursor() {IssueQuery query = getQuery();if (query != null)- return new Cursor(query.toString(), getCardCount(), cardOffset);+ return new Cursor(query.toString(), getCardCount(), cardOffset, true);elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 475c48fd65..0ba0378126 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -157,12 +157,12 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic Cursor getCursor() {- return WebSession.get().getIssueCursor(getProject());+ return WebSession.get().getIssueCursor();}@Overridepublic void navTo(AjaxRequestTarget target, Issue entity, Cursor cursor) {- WebSession.get().setIssueCursor(getProject(), cursor);+ WebSession.get().setIssueCursor(cursor);setResponsePage(getPageClass(), paramsOf(entity));}@@ -176,7 +176,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onClick() {OneDev.getInstance(IssueManager.class).delete(getIssue());- Cursor cursor = WebSession.get().getIssueCursor(getProject());+ Cursor cursor = WebSession.get().getIssueCursor();PageParameters params = ProjectIssueListPage.paramsOf(getProject(),Cursor.getQuery(cursor),diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 249627b829..885208a79e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -466,8 +466,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRfragment.add(new EntityNavPanel<PullRequest>("requestNav") {@Override- protected EntityQuery<PullRequest> parse(String queryString) {- return PullRequestQuery.parse(getProject(), queryString);+ protected EntityQuery<PullRequest> parse(String queryString, boolean inProject) {+ return PullRequestQuery.parse(inProject?getProject():null, queryString);}@Override@@ -476,8 +476,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}@Override- protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count) {- return getPullRequestManager().query(getProject(), query, offset, count);+ protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count, boolean inProject) {+ return getPullRequestManager().query(inProject?getProject():null, query, offset, count);}@Override@@ -486,12 +486,12 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic Cursor getCursor() {- return WebSession.get().getPullRequestCursor(getProject());+ return WebSession.get().getPullRequestCursor();}@Overridepublic void navTo(AjaxRequestTarget target, PullRequest entity, Cursor cursor) {- WebSession.get().setPullRequestCursor(getProject(), cursor);+ WebSession.get().setPullRequestCursor(cursor);setResponsePage(getPageClass(), paramsOf(entity));}@@ -677,7 +677,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();getPullRequestManager().delete(request);Session.get().success("Pull request #" + request.getNumber() + " is deleted");- Cursor cursor = WebSession.get().getPullRequestCursor(getProject());+ Cursor cursor = WebSession.get().getPullRequestCursor();PageParameters params = ProjectPullRequestsPage.paramsOf(getProject(),Cursor.getQuery(cursor),diff --git a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java b/server-core/src/main/java/io/onedev/server/web/util/Cursor.javaindex 7034aa183b..8ec0df9ef8 100644--- a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java+++ b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java@@ -16,10 +16,13 @@ public class Cursor implements Serializable {private final int offset;- public Cursor(String query, int count, int offset) {+ private final boolean inProject;++ public Cursor(String query, int count, int offset, boolean inProject) {this.query = query;this.count = count;this.offset = offset;+ this.inProject = inProject;}public String getQuery() {@@ -34,6 +37,10 @@ public class Cursor implements Serializable {return count;}+ public boolean isInProject() {+ return inProject;+ }+@Nullablepublic static String getQuery(@Nullable Cursor cursor) {if (cursor != null)