Skip to content

The Unified and Autonomous Development Platform

feat: Stop displaying linked issues infinitely (parent->child->parent->...) (OD-2305)

Robin Shenb50eb9a8692e
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index a65ead3697..707611de4e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -206,7 +206,7 @@ public class GlobalIssueSetting implements Serializable {
board.setIdentifyField(Issue.NAME_STATE);
board.setColumns(Lists.newArrayList("Open", "Closed"));
board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignee", IssueSchedule.NAME_ITERATION));
- board.setDisplayLinks(Lists.newArrayList("Child Issue", "Blocked By"));
+ board.setDisplayLinks(Lists.newArrayList("Child Issue", "Parent Issue", "Blocked By", "Blocks", "Related"));
boardSpecs.add(board);
listFields.add(Issue.NAME_STATE);
@@ -216,7 +216,10 @@ public class GlobalIssueSetting implements Serializable {
listFields.add(IssueSchedule.NAME_ITERATION);
listLinks.add("Child Issue");
+ listLinks.add("Parent Issue");
listLinks.add("Blocked By");
+ listLinks.add("Blocks");
+ listLinks.add("Related");
namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));
namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignee\" is me and \"State\" is \"Open\""));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
index cbde1ea1f0..3e4c597bef 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
@@ -24,15 +24,15 @@ public class HasLinkCriteria extends Criteria<Issue> {
private String linkName;
- private transient LinkDescriptor linkSide;
+ private transient LinkDescriptor linkDescriptor;
public HasLinkCriteria(String linkName) {
this.linkName = linkName;
}
- public HasLinkCriteria(LinkDescriptor linkSide) {
- linkName = linkSide.getName();
- this.linkSide = linkSide;
+ public HasLinkCriteria(LinkDescriptor linkDescriptor) {
+ linkName = linkDescriptor.getName();
+ this.linkDescriptor = linkDescriptor;
}
@Override
@@ -42,11 +42,11 @@ public class HasLinkCriteria extends Criteria<Issue> {
linkQuery.select(linkRoot);
List<Predicate> predicates = new ArrayList<>();
- predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SPEC), getLinkSide().getSpec()));
+ predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SPEC), getLinkDescriptor().getSpec()));
- if (getLinkSide().isOpposite()) {
+ if (getLinkDescriptor().isOpposite()) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
- } else if (getLinkSide().getSpec().getOpposite() != null) {
+ } else if (getLinkDescriptor().getSpec().getOpposite() != null) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SOURCE), from));
} else {
predicates.add(builder.or(
@@ -58,16 +58,16 @@ public class HasLinkCriteria extends Criteria<Issue> {
return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));
}
- private LinkDescriptor getLinkSide() {
- if (linkSide == null)
- linkSide = new LinkDescriptor(linkName);
- return linkSide;
+ private LinkDescriptor getLinkDescriptor() {
+ if (linkDescriptor == null)
+ linkDescriptor = new LinkDescriptor(linkName);
+ return linkDescriptor;
}
@Override
public boolean matches(Issue issue) {
- LinkSpec spec = getLinkSide().getSpec();
- if (getLinkSide().isOpposite())
+ LinkSpec spec = getLinkDescriptor().getSpec();
+ if (getLinkDescriptor().isOpposite())
return issue.getSourceLinks().stream().anyMatch(it->it.getSpec().equals(spec));
else if (spec.getOpposite() != null)
return issue.getTargetLinks().stream().anyMatch(it->it.getSpec().equals(spec));
@@ -79,7 +79,7 @@ public class HasLinkCriteria extends Criteria<Issue> {
public void onRenameLink(String oldName, String newName) {
if (linkName.equals(oldName)) {
linkName = newName;
- linkSide = null;
+ linkDescriptor = null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
index b2edbe3c65..916a1a612f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
@@ -44,7 +44,7 @@ public class LinkMatchCriteria extends Criteria<Issue> {
private final boolean allMatch;
- private transient LinkDescriptor linkSide;
+ private transient LinkDescriptor linkDescriptor;
public LinkMatchCriteria(String linkName, Criteria<Issue> criteria, boolean allMatch) {
this.linkName = linkName;
@@ -58,8 +58,8 @@ public class LinkMatchCriteria extends Criteria<Issue> {
Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
linkQuery.select(linkRoot);
- LinkSpec spec = getLinkSide().getSpec();
- boolean opposite = getLinkSide().isOpposite();
+ LinkSpec spec = getLinkDescriptor().getSpec();
+ boolean opposite = getLinkDescriptor().isOpposite();
List<Predicate> predicates = new ArrayList<>();
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_SPEC), spec));
@@ -88,7 +88,7 @@ public class LinkMatchCriteria extends Criteria<Issue> {
return builder.and(
builder.not(builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))))),
- new HasLinkCriteria(getLinkSide()).getPredicate(projectScope, query, from, builder));
+ new HasLinkCriteria(getLinkDescriptor()).getPredicate(projectScope, query, from, builder));
} else {
if (opposite) {
predicates.add(builder.equal(linkRoot.get(IssueLink.PROP_TARGET), from));
@@ -115,18 +115,18 @@ public class LinkMatchCriteria extends Criteria<Issue> {
}
}
- private LinkDescriptor getLinkSide() {
- if (linkSide == null)
- linkSide = new LinkDescriptor(linkName);
- return linkSide;
+ private LinkDescriptor getLinkDescriptor() {
+ if (linkDescriptor == null)
+ linkDescriptor = new LinkDescriptor(linkName);
+ return linkDescriptor;
}
@Override
public boolean matches(Issue issue) {
if (!Hibernate.isInitialized(issue.getSourceLinks()) || !Hibernate.isInitialized(issue.getTargetLinks()))
OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
- LinkSpec spec = getLinkSide().getSpec();
- boolean opposite = getLinkSide().isOpposite();
+ LinkSpec spec = getLinkDescriptor().getSpec();
+ boolean opposite = getLinkDescriptor().isOpposite();
if (allMatch) {
if (opposite) {
boolean hasLink = false;
@@ -186,7 +186,7 @@ public class LinkMatchCriteria extends Criteria<Issue> {
public void onRenameLink(String oldName, String newName) {
if (linkName.equals(oldName)) {
linkName = newName;
- linkSide = null;
+ linkDescriptor = null;
}
criteria.onRenameLink(oldName, newName);
}
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.java
index d839f560aa..eabc1af44a 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
@@ -1587,11 +1587,11 @@ public abstract class IssueListPanel extends Panel {
Item<?> row = cellItem.findParent(Item.class);
Cursor cursor = new Cursor(queryModel.getObject().toString(), (int) issuesTable.getItemCount(),
(int) issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProjectScope());
- cellItem.add(newIssueDetail(componentId, rowModel.getObject().getId(), cursor));
+ cellItem.add(newIssueDetail(componentId, rowModel.getObject().getId(), cursor, new HashSet<>()));
}
@SuppressWarnings("unchecked")
- private Component newIssueDetail(String componentId, Long issueId, @Nullable Cursor cursor) {
+ private Component newIssueDetail(String componentId, Long issueId, @Nullable Cursor cursor, Set<Long> displayedIssueIds) {
Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);
fragment.setDefaultModel(new LoadableDetachableModel<Issue>() {
@@ -1675,7 +1675,10 @@ public abstract class IssueListPanel extends Panel {
@Override
protected List<String> getDisplayLinks() {
- return getListLinks();
+ if (displayedIssueIds.contains(issueId))
+ return Collections.emptyList();
+ else
+ return getListLinks();
}
@Override
@@ -1757,8 +1760,8 @@ public abstract class IssueListPanel extends Panel {
protected List<Issue> load() {
Issue issue = (Issue) fragment.getDefaultModelObject();
getIssueLinkManager().loadDeepLinks(issue);
- LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());
- return issue.findLinkedIssues(side.getSpec(), side.isOpposite()).stream().filter(SecurityUtils::canAccessIssue).collect(toList());
+ LinkDescriptor descriptor = new LinkDescriptor(linksPanel.getExpandedLink());
+ return issue.findLinkedIssues(descriptor.getSpec(), descriptor.isOpposite()).stream().filter(SecurityUtils::canAccessIssue).collect(toList());
}
}) {
@@ -1766,7 +1769,9 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void populateItem(ListItem<Issue> item) {
Issue issue = item.getModelObject();
- item.add(newIssueDetail("content", issue.getId(), null));
+ var copyOfDisplayedIssueIds = new HashSet<>(displayedIssueIds);
+ copyOfDisplayedIssueIds.add(issueId);
+ item.add(newIssueDetail("content", issue.getId(), null, copyOfDisplayedIssueIds));
}
@Override
@@ -1781,7 +1786,7 @@ public abstract class IssueListPanel extends Panel {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {
- Component detail = newIssueDetail(componentId, issueId, cursor);
+ Component detail = newIssueDetail(componentId, issueId, cursor, new HashSet<>());
fragment.replaceWith(detail);
handler.add(detail);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html
index 961197dbb0..5621864303 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html
@@ -6,8 +6,8 @@
</div>
<div wicket:id="description"></div>
</div>
- <ul wicket:id="links" class="links list-unstyled mb-0">
- <li wicket:id="links" class="mt-4">
+ <ul wicket:id="links" class="links list-unstyled mt-5 mb-0">
+ <li wicket:id="links" class="mb-4 mb-last-child-0">
<div class="head d-flex align-items-center h6 dropdown-aware">
<span wicket:id="name" class="flex-shrink-0 mr-2"></span>
<a wicket:id="createNew" title="Create new issue" class="mr-1"><wicket:svg href="plus" class="icon icon-sm"/></a>
diff --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.java
index 2cec59ac3b..aa0faf94a2 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
@@ -1,10 +1,14 @@
package io.onedev.server.web.page.project.issues.boards;
+import static io.onedev.server.security.SecurityUtils.canAccessIssue;
import static io.onedev.server.security.SecurityUtils.canManageIssues;
import static io.onedev.server.security.SecurityUtils.getAuthUser;
import static java.util.stream.Collectors.toList;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
@@ -35,7 +39,6 @@ import io.onedev.server.model.Iteration;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.LinkDescriptor;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
@@ -80,7 +83,7 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {
return getModelObject();
}
- private Component newContent(String componentId, IModel<Issue> issueModel) {
+ private Component newContent(String componentId, IModel<Issue> issueModel, Set<Long> displayedIssueIds) {
Issue issue = issueModel.getObject();
Fragment fragment = new Fragment(componentId, "contentFrag", this);
@@ -264,18 +267,21 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {
});
fragment.add(new CopyToClipboardLink("copy",
- Model.of(getIssue().getTitle() + " (" + getIssue().getReference().toString(getProject()) + ")")));
+ Model.of(issue.getTitle() + " (" + issue.getReference().toString(getProject()) + ")")));
var linksPanel = new IssueLinksPanel("links") {
@Override
protected Issue getIssue() {
- return BoardCardPanel.this.getIssue();
+ return issueModel.getObject();
}
@Override
protected List<String> getDisplayLinks() {
- return board.getDisplayLinks();
+ if (displayedIssueIds.contains(getIssue().getId()))
+ return Collections.emptyList();
+ else
+ return board.getDisplayLinks();
}
@Override
@@ -292,15 +298,17 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {
protected List<Issue> load() {
Issue issue = issueModel.getObject();
OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
- LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());
- return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite()).stream().filter(it->SecurityUtils.canAccessIssue(it)).collect(toList());
+ LinkDescriptor descriptor = new LinkDescriptor(linksPanel.getExpandedLink());
+ return issue.findLinkedIssues(descriptor.getSpec(), descriptor.isOpposite()).stream().filter(it->canAccessIssue(it)).collect(toList());
}
}) {
@Override
protected void populateItem(ListItem<Issue> item) {
- item.add(newContent("content", item.getModel()));
+ var copyOfDisplayedIssueIds = new HashSet<>(displayedIssueIds);
+ copyOfDisplayedIssueIds.add(issueModel.getObject().getId());
+ item.add(newContent("content", item.getModel(), copyOfDisplayedIssueIds));
}
@Override
@@ -320,7 +328,7 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {
protected void onInitialize() {
super.onInitialize();
- add(newContent("content", getModel()));
+ add(newContent("content", getModel(), new HashSet<>()));
add(AttributeAppender.append("data-issue", getIssue().getId()));
@@ -362,7 +370,7 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onBeforeRender() {
- replace(newContent("content", getModel()));
+ replace(newContent("content", getModel(), new HashSet<>()));
super.onBeforeRender();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index 2d4b6000a5..49607b4f26 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -1,6 +1,39 @@
package io.onedev.server.web.page.project.issues.list;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
@@ -43,33 +76,6 @@ import io.onedev.server.web.util.NamedIssueQueriesBean;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
public class ProjectIssueListPage extends ProjectIssuesPage {
@@ -119,10 +125,10 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
protected void populateItem(ListItem<Issue> item) {
- item.add(newContent("content", item.getModel().getObject().getId()));
+ item.add(newContent("content", item.getModel().getObject().getId(), new HashSet<>()));
}
- private Component newContent(String componentId, Long issueId) {
+ private Component newContent(String componentId, Long issueId, Set<Long> displayedIssueIds) {
Issue issue = getIssueManager().load(issueId);
Fragment fragment = new Fragment(componentId, "pinnedIssueFrag", ProjectIssueListPage.this);
@@ -231,7 +237,10 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
protected List<String> getDisplayLinks() {
- return issueList.getListLinks();
+ if (displayedIssueIds.contains(issueId))
+ return Collections.emptyList();
+ else
+ return issueList.getListLinks();
}
@Override
@@ -263,15 +272,17 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
protected List<Issue> load() {
Issue issue = getIssueManager().load(issueId);
OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
- LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());
- return issue.findLinkedIssues(side.getSpec(), side.isOpposite());
+ LinkDescriptor descriptor = new LinkDescriptor(linksPanel.getExpandedLink());
+ return issue.findLinkedIssues(descriptor.getSpec(), descriptor.isOpposite());
}
}) {
@Override
protected void populateItem(ListItem<Issue> item) {
- item.add(newContent("content", item.getModel().getObject().getId()));
+ var copyOfDisplayedIssueIds = new HashSet<>(displayedIssueIds);
+ copyOfDisplayedIssueIds.add(issueId);
+ item.add(newContent("content", item.getModel().getObject().getId(), copyOfDisplayedIssueIds));
}
@Override
@@ -286,7 +297,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
public void onObservableChanged(IPartialPageRequestHandler handler, Collection<String> changedObservables) {
- Component content = newContent(componentId, issueId);
+ Component content = newContent(componentId, issueId, new HashSet<>());
fragment.replaceWith(content);
handler.add(content);
}