Skip to content

The Unified and Autonomous Development Platform

Add issue prev/next navigation when issue is opened from issue query page

Robin Shen6ef1a50ac3de
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 9be70be758..2acfa9693c 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -29,7 +29,7 @@ public interface IssueManager extends EntityManager<Issue> {
List<Issue> query(IssueQuery issueQuery, int firstResult, int maxResults);
- long count(@Nullable IssueCriteria issueCriteria);
+ int count(@Nullable IssueCriteria issueCriteria);
List<Issue> query(Project project, @Nullable String term, int count);
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 2229c494e5..d713c5fdee 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
@@ -210,7 +210,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
- public long count(IssueCriteria issueCriteria) {
+ public int count(IssueCriteria issueCriteria) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
Root<Issue> root = criteriaQuery.from(Issue.class);
@@ -218,7 +218,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
if (issueCriteria != null)
criteriaQuery.where(issueCriteria.getPredicate(new QueryBuildContext(root, builder)));
criteriaQuery.select(builder.count(root));
- return getSession().createQuery(criteriaQuery).uniqueResult();
+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
@Sessional
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 9f67f78c42..53095a43f4 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -53,8 +53,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 60d241ecd9..46f91faf47 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -197,7 +197,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));
add(new OnePageMapper("projects/${project}/issues", IssueListPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/overview", IssueActivitiesPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
index ab11692b26..1b8fb6460d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
@@ -64,7 +64,7 @@ public class FieldValuesPanel extends GenericPanel<PromptedField> implements Edi
Issue issue = issueManager.find(project, Long.valueOf(value));
if (issue != null) {
Fragment issueFrag = new Fragment("value", "issueFrag", this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
link.add(new Label("label", "#" + issue.getNumber()));
issueFrag.add(link);
issueFrag.add(new IssueStateLabel("state", Model.of(issue)));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
index 20732d25a9..03d32fca40 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
@@ -18,6 +18,7 @@
<wicket:child></wicket:child>
</div>
<div class="side">
+ <div wicket:id="nav" class="nav"></div>
<div wicket:id="fields" class="fields">
<table>
<tr wicket:id="fields">
@@ -56,6 +57,11 @@
<span wicket:id="title"></span>
<a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="navFrag">
+ <a wicket:id="prev" title="Previous issue" class="prev"><i class="fa fa-arrow-left"></i></a>
+ <span wicket:id="current"></span>
+ <a wicket:id="next" title="Next issue" class="next"><i class="fa fa-arrow-right"></i></a>
+ </wicket:fragment>
<wicket:fragment wicket:id="userFrag">
<a wicket:id="avatar"></a> <a wicket:id="name"></a>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
index 6e557e931e..cc66855a22 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
@@ -18,6 +18,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -36,6 +37,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.IRequestCycleListener;
@@ -53,6 +55,7 @@ import io.onedev.server.manager.VisitManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.PromptedField;
+import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.StateTransition;
import io.onedev.server.security.SecurityUtils;
@@ -78,6 +81,7 @@ import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActi
import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
import io.onedev.server.web.util.ConfirmOnClick;
+import io.onedev.server.web.util.QueryPosition;
@SuppressWarnings("serial")
public abstract class IssueDetailPage extends ProjectPage implements InputContext {
@@ -88,8 +92,12 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
private static final String TITLE_ID = "title";
+ private static final String NAV_ID = "nav";
+
private final IModel<Issue> issueModel;
+ private final QueryPosition position;
+
public IssueDetailPage(PageParameters params) {
super(params);
@@ -105,6 +113,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
};
+
+ position = QueryPosition.from(params);
}
protected Issue getIssue() {
@@ -293,7 +303,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevState, prevFields, promptedFields);
- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue()));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));
}
});
@@ -382,7 +392,104 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
});
-
+
+ if (position != null) {
+ /*
+ * When calculating previous or next issues, we consider the case that we may edit current
+ * issue to cause it no longer matches the query. We will also decrease issue count
+ * matching the query in this case
+ */
+ Fragment fragment = new Fragment(NAV_ID, "navFrag", this);
+ fragment.add(new Link<Void>("prev") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(position.getOffset()>0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (position.getOffset() <= 0)
+ tag.put("disabled", "disabled");
+ }
+
+ @Override
+ public void onClick() {
+ IssueQuery query = IssueQuery.parse(getProject(), position.getQuery());
+ List<Issue> issues = getIssueManager().query(query, position.getOffset()-1, 2);
+ if (issues.size() == 2) {
+ if (issues.get(1).equals(getIssue())) {
+ QueryPosition prevPosition = new QueryPosition(position.getQuery(),
+ position.getCount(), position.getOffset()-1);
+ PageParameters params = IssueDetailPage.paramsOf(issues.get(0), prevPosition);
+ setResponsePage(getPageClass(), params);
+ } else {
+ QueryPosition prevPosition = new QueryPosition(position.getQuery(),
+ position.getCount()-1, position.getOffset()-1);
+ PageParameters params = IssueDetailPage.paramsOf(issues.get(0), prevPosition);
+ setResponsePage(getPageClass(), params);
+ }
+ } else if (issues.size() == 1) {
+ QueryPosition prevPosition = new QueryPosition(position.getQuery(),
+ position.getCount()-1, position.getOffset()-1);
+ PageParameters params = IssueDetailPage.paramsOf(issues.get(0), prevPosition);
+ setResponsePage(getPageClass(), params);
+ } else {
+ WebSession.get().warn("No more issues");
+ }
+ }
+
+ });
+ fragment.add(new Link<Void>("next") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(position.getOffset()<position.getCount()-1);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (position.getOffset() >= position.getCount()-1)
+ tag.put("disabled", "disabled");
+ }
+
+ @Override
+ public void onClick() {
+ IssueQuery query = IssueQuery.parse(getProject(), position.getQuery());
+ List<Issue> issues = getIssueManager().query(query, position.getOffset(), 2);
+ if (!issues.isEmpty()) {
+ if (issues.get(0).equals(getIssue())) {
+ if (issues.size() == 2) {
+ QueryPosition nextPosition = new QueryPosition(position.getQuery(),
+ position.getCount(), position.getOffset()+1);
+ PageParameters params = IssueDetailPage.paramsOf(issues.get(1), nextPosition);
+ setResponsePage(getPageClass(), params);
+ } else {
+ WebSession.get().warn("No more issues");
+ }
+ } else {
+ QueryPosition nextPosition = new QueryPosition(position.getQuery(),
+ position.getCount()-1, position.getOffset());
+ PageParameters params = IssueDetailPage.paramsOf(issues.get(0), nextPosition);
+ setResponsePage(getPageClass(), params);
+ }
+ } else {
+ WebSession.get().warn("No more issues");
+ }
+ }
+
+ });
+
+ fragment.add(new Label("current", "issue " + (position.getOffset()+1) + " of " + position.getCount()));
+
+ add(fragment);
+ } else {
+ add(new WebMarkupContainer(NAV_ID).setVisible(false));
+ }
WebMarkupContainer fieldsContainer = new WebMarkupContainer("fields") {
@@ -519,6 +626,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
return OneDev.getInstance(IssueFieldManager.class);
}
+ private IssueManager getIssueManager() {
+ return OneDev.getInstance(IssueManager.class);
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -532,9 +643,11 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
super.onDetach();
}
- public static PageParameters paramsOf(Issue issue) {
+ public static PageParameters paramsOf(Issue issue, @Nullable QueryPosition position) {
PageParameters params = ProjectPage.paramsOf(issue.getProject());
- params.set(PARAM_ISSUE, issue.getNumber());
+ params.add(PARAM_ISSUE, issue.getNumber());
+ if (position != null)
+ position.fill(params);
return params;
}
@@ -565,7 +678,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getIssue()));
+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getIssue(), position));
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
index 4f498d2bd4..179e58e85e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
@@ -30,6 +30,31 @@
margin-right: 20px;
}
+#issue-detail>.side>.nav {
+ font-size: 16px;
+ position: relative;
+}
+#issue-detail>.side>.nav {
+ text-align: center;
+}
+#issue-detail>.side>.nav a {
+ position: absolute;
+ color: #666;
+ top: 0;
+}
+#issue-detail>.side>.nav a[disabled] {
+ color: #BBB;
+ cursor: default;
+}
+
+#issue-detail>.side>.nav .prev {
+ left: 0;
+}
+#issue-detail>.side>.nav .next {
+ right: 0;
+}
+
+
#issue-detail>.side {
position: fixed;
top: 48px;
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 5a230fb23a..093a7098cf 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
@@ -80,6 +80,7 @@ import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActi
import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.WorkflowReconcilePanel;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.QueryPosition;
import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
@@ -120,6 +121,10 @@ public class IssueListPage extends ProjectPage {
}
+ private IssueManager getIssueManager() {
+ return OneDev.getInstance(IssueManager.class);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -563,12 +568,14 @@ public class IssueListPage extends ProjectPage {
form.error("Malformed issue query");
}
+ int count;
+ if (parsedQuery.get() != null)
+ count = getIssueManager().count(parsedQuery.get().getCriteria());
+ else
+ count = 0;
+
IDataProvider<Issue> dataProvider = new IDataProvider<Issue>() {
- private IssueManager getIssueManager() {
- return OneDev.getInstance(IssueManager.class);
- }
-
@Override
public void detach() {
}
@@ -580,7 +587,7 @@ public class IssueListPage extends ProjectPage {
@Override
public long size() {
- return getIssueManager().count(parsedQuery.get().getCriteria());
+ return count;
}
@Override
@@ -666,7 +673,9 @@ public class IssueListPage extends ProjectPage {
Issue issue = item.getModelObject();
item.add(new Label("number", "#" + issue.getNumber()));
Fragment titleFrag = new Fragment("title", "titleFrag", IssueListPage.this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
+ QueryPosition position = new QueryPosition(query, count, (int)getCurrentPage() * WebConstants.PAGE_SIZE + item.getIndex());
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue, position));
link.add(new Label("label", issue.getTitle()));
titleFrag.add(link);
item.add(titleFrag);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
index 17d8bfb404..46dd1a7d00 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
@@ -53,7 +53,7 @@
font-weight: bold;
color: #444;
}
-#issue-list .issue .primary .submitter {
+#issue-list .issue .primary .last-activity {
text-align: right;
width: 300px;
padding-right: 0;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
index 0d8824ef76..e541ec0756 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
@@ -64,7 +64,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {
super.onSubmit();
StateSpec stateSpec = Preconditions.checkNotNull(getProject().getIssueWorkflow().getState(issue.getState()));
getIssueManager().open(issue, fieldBean, stateSpec.getFields());
- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
}
};
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 ae0f6a2a70..2b8d23e309 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
@@ -10,7 +10,7 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
+
add(new Link<Void>("test") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/util/QueryPosition.java b/core/src/main/java/io/onedev/server/web/util/QueryPosition.java
new file mode 100644
index 0000000000..dad177ea41
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/util/QueryPosition.java
@@ -0,0 +1,57 @@
+package io.onedev.server.web.util;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class QueryPosition implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static String PAGE_PARAM = "query-position";
+
+ private final String query;
+
+ private final int count;
+
+ private final int offset;
+
+ public QueryPosition(String query, int count, int offset) {
+ this.query = query;
+ this.count = count;
+ this.offset = offset;
+ }
+
+ public String getQuery() {
+ return query;
+ }
+
+ public int getOffset() {
+ return offset;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ public void fill(PageParameters params) {
+ params.add(PAGE_PARAM, query + ":" + count + ":" + offset);
+ }
+
+ @Nullable
+ public static QueryPosition from(PageParameters params) {
+ String positionStr = params.get(PAGE_PARAM).toOptionalString();
+ if (positionStr != null) {
+ String tempStr = StringUtils.substringBeforeLast(positionStr, ":");
+ int offset = Integer.parseInt(StringUtils.substringAfterLast(positionStr, ":"));
+ int count = Integer.parseInt(StringUtils.substringAfterLast(tempStr, ":"));
+ String query = StringUtils.substringBeforeLast(tempStr, ":");
+ return new QueryPosition(query, count, offset);
+ } else {
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
index df0cd46a1e..22a3b06deb 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
@@ -19,7 +19,7 @@ public class IssueProcessor extends IssueParser implements MarkdownProcessor {
@Override
protected String toHtml(Issue issue) {
CharSequence url = RequestCycle.get().urlFor(
- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
return String.format("<a href='%s' class='issue'>#%d</a>", url, issue.getNumber());
}