Skip to content

The Unified and Autonomous Development Platform

feat: Able to sort linked issues (OD-2642)

Robin Shen24bf65db9007
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 6583dd5f2e..550f39412e 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -8411,4 +8411,17 @@ public class DataMigrator {
}
}
+ private void migrate216(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("IssueLinks.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var id = element.elementTextTrim("id");
+ element.addElement("position").setText(id);
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 23ef420a48..3137a9eeef 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -21,6 +21,7 @@ import static io.onedev.server.model.IssueSchedule.NAME_ITERATION;
import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
import static java.util.Comparator.comparing;
import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.toList;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -40,7 +41,6 @@ import java.util.Stack;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
import javax.mail.internet.InternetAddress;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -62,6 +62,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
+import org.jspecify.annotations.Nullable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Lists;
@@ -74,11 +75,6 @@ import io.onedev.server.annotation.Editable;
import io.onedev.server.attachment.AttachmentStorageSupport;
import io.onedev.server.buildspecmodel.inputspec.Input;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
-import io.onedev.server.service.GroupService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.SettingService;
-import io.onedev.server.service.UrlService;
-import io.onedev.server.service.UserService;
import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.entityreference.IssueReference;
import io.onedev.server.model.support.EntityWatch;
@@ -89,9 +85,13 @@ import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.IssueSortField;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.GroupService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.service.UrlService;
+import io.onedev.server.service.UserService;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.facade.IssueFacade;
@@ -871,6 +871,18 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
return true;
}
}
+
+ public int getMaxLinkPosition(LinkSpec spec, boolean opposite) {
+ if (spec.getOpposite() != null) {
+ if (opposite) {
+ return getSourceLinks().stream().filter(it->it.getSpec().equals(spec)).mapToInt(IssueLink::getPosition).max().orElse(0);
+ } else {
+ return getTargetLinks().stream().filter(it->it.getSpec().equals(spec)).mapToInt(IssueLink::getPosition).max().orElse(0);
+ }
+ } else {
+ return getLinks().stream().filter(it->it.getSpec().equals(spec)).mapToInt(IssueLink::getPosition).max().orElse(0);
+ }
+ }
public Collection<String> getFieldNames() {
return getFields().stream().map(IssueField::getName).collect(Collectors.toSet());
@@ -1216,7 +1228,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
}
public Collection<Iteration> getIterations() {
- return getSchedules().stream().map(it->it.getIteration()).collect(Collectors.toList());
+ return getSchedules().stream().map(it->it.getIteration()).collect(toList());
}
@Nullable
@@ -1270,52 +1282,32 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
}
public List<Issue> findLinkedIssues(LinkSpec spec, boolean opposite) {
- class IssueComparator implements Comparator<Issue> {
-
- private final List<EntitySort> sorts;
-
- IssueComparator(List<EntitySort> sorts) {
- this.sorts = sorts;
- }
-
- @Override
- public int compare(Issue o1, Issue o2) {
- for (EntitySort sort : sorts) {
- int result = SORT_FIELDS.get(sort.getField()).getComparator().compare(o1, o2);
- if (sort.getDirection() == DESCENDING)
- result *= -1;
- if (result != 0)
- return result;
- }
- return 0;
- }
- }
+ return findIssueLinks(spec, opposite)
+ .stream()
+ .map(it->it.getLinked(this))
+ .collect(toList());
+ }
+ public List<IssueLink> findIssueLinks(LinkSpec spec, boolean opposite) {
if (spec.getOpposite() != null) {
if (opposite) {
return getSourceLinks().stream()
.filter(it->it.getSpec().equals(spec))
- .sorted()
- .map(it->it.getSource())
- .sorted(new IssueComparator(spec.getOpposite().getParsedIssueQuery(getProject()).getSorts()))
- .collect(Collectors.toList());
+ .sorted(comparingInt(IssueLink::getPosition))
+ .collect(toList());
} else {
return getTargetLinks().stream()
.filter(it->it.getSpec().equals(spec))
- .sorted()
- .map(it->it.getTarget())
- .sorted(new IssueComparator(spec.getParsedIssueQuery(getProject()).getSorts()))
- .collect(Collectors.toList());
+ .sorted(comparingInt(IssueLink::getPosition))
+ .collect(toList());
}
} else {
return getLinks().stream()
.filter(it->it.getSpec().equals(spec))
- .sorted()
- .map(it->it.getLinked(this))
- .sorted(new IssueComparator(spec.getParsedIssueQuery(getProject()).getSorts()))
- .collect(Collectors.toList());
+ .sorted(comparingInt(IssueLink::getPosition))
+ .collect(toList());
}
- }
+ }
public static String getSerialLockName(Long issueId) {
return "issue-" + issueId + "-serial";
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueLink.java b/server-core/src/main/java/io/onedev/server/model/IssueLink.java
index 5af2b9b468..35e0fa6336 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueLink.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueLink.java
@@ -1,5 +1,8 @@
package io.onedev.server.model;
+import static com.fasterxml.jackson.annotation.JsonProperty.Access.READ_ONLY;
+
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
@@ -9,6 +12,8 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.validation.ValidationException;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
@Entity
@Table(
indexes={@Index(columnList="o_source_id"), @Index(columnList="o_target_id"), @Index(columnList="o_spec_id")},
@@ -23,6 +28,8 @@ public class IssueLink extends AbstractEntity {
public static final String PROP_SPEC = "spec";
+ public static final String PROP_POSITION = "position";
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private Issue source;
@@ -35,6 +42,10 @@ public class IssueLink extends AbstractEntity {
@JoinColumn(nullable=false)
private LinkSpec spec;
+ @JsonProperty(access = READ_ONLY)
+ @Column(nullable=false)
+ private int position;
+
public Issue getSource() {
return source;
}
@@ -63,6 +74,14 @@ public class IssueLink extends AbstractEntity {
return issue.equals(source)?target:source;
}
+ public int getPosition() {
+ return position;
+ }
+
+ public void setPosition(int position) {
+ this.position = position;
+ }
+
public void validate() {
if (getSource().equals(getTarget()))
throw new ValidationException("Can not link to self");
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
index 697244e2c3..deb5860b51 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -73,7 +73,7 @@ public class LinkSpec extends AbstractEntity {
@Editable(order=160, name="Linkable Issues", placeholder="All issues",
description="Optionally specify criteria of issues which can be linked")
- @io.onedev.server.annotation.IssueQuery
+ @io.onedev.server.annotation.IssueQuery(withOrder = false)
public String getIssueQuery() {
return issueQuery;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
index ac3b18491c..e11d41df79 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
@@ -46,7 +46,7 @@ public class LinkSpecOpposite implements Serializable {
@Editable(order=300, name="Linkable Issues On the Other Side", placeholder="All issues",
description="Optionally specify criteria of issues which can be linked on the other side")
- @io.onedev.server.annotation.IssueQuery
+ @io.onedev.server.annotation.IssueQuery(withOrder = false)
public String getIssueQuery() {
return issueQuery;
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
index 5a2f3ea7ae..1259405e1a 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java
@@ -56,7 +56,7 @@ public class IssueLinkResource {
}
link.validate();
-
+
linkService.create(link);
return link.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java
index a07437256b..a31ca457bc 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueLinkService.java
@@ -1,22 +1,29 @@
package io.onedev.server.service.impl;
-import com.google.common.base.Preconditions;
-import io.onedev.server.service.IssueFieldService;
-import io.onedev.server.service.IssueLinkService;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueLink;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import org.hibernate.Hibernate;
-import org.hibernate.query.Query;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
-import java.util.*;
+
+import org.hibernate.Hibernate;
+import org.hibernate.query.Query;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.service.IssueFieldService;
+import io.onedev.server.service.IssueLinkService;
@Singleton
public class DefaultIssueLinkService extends BaseEntityService<IssueLink> implements IssueLinkService {
@@ -90,6 +97,10 @@ public class DefaultIssueLinkService extends BaseEntityService<IssueLink> implem
@Override
public void create(IssueLink link) {
Preconditions.checkState(link.isNew());
+ var maxPosition = Math.max(
+ link.getSource().getMaxLinkPosition(link.getSpec(), false),
+ link.getTarget().getMaxLinkPosition(link.getSpec(), true));
+ link.setPosition(maxPosition + 1);
dao.persist(link);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/LinkGroup.java b/server-core/src/main/java/io/onedev/server/util/LinkGroup.java
index 8ae62d7e2c..316b1df7b5 100644
--- a/server-core/src/main/java/io/onedev/server/util/LinkGroup.java
+++ b/server-core/src/main/java/io/onedev/server/util/LinkGroup.java
@@ -2,25 +2,25 @@ package io.onedev.server.util;
import java.util.List;
-import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
public class LinkGroup {
private final LinkDescriptor descriptor;
- private final List<Issue> issues;
+ private final List<IssueLink> issueLinks;
- public LinkGroup(LinkDescriptor descriptor, List<Issue> issues) {
+ public LinkGroup(LinkDescriptor descriptor, List<IssueLink> issueLinks) {
this.descriptor = descriptor;
- this.issues = issues;
+ this.issueLinks = issueLinks;
}
public LinkDescriptor getDescriptor() {
return descriptor;
}
- public List<Issue> getIssues() {
- return issues;
+ public List<IssueLink> getIssueLinks() {
+ return issueLinks;
}
}
\ No newline at end of file
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 5cb27f59ef..b2c5ffb4e1 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
@@ -45,6 +45,7 @@
</form>
</wicket:fragment>
<wicket:fragment wicket:id="linkedIssueFrag">
+ <svg wicket:id="dragIndicator" class="icon drag-indicator"></svg>
<a wicket:id="title"><span wicket:id="label"></span></a>
<a wicket:id="unlink" t:data-tippy-content="Unlink this issue" class="action ml-2"><wicket:svg href="unlink" class="icon icon-sm"/></a>
<a wicket:id="state" class="state ml-auto"><span wicket:id="badge"></span></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
index f8d8eb23a8..a338a67699 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.issue.primary;
import static io.onedev.server.security.SecurityUtils.canAccessIssue;
import static io.onedev.server.web.translation.Translation._T;
+import static java.util.stream.Collectors.toList;
import java.io.Serializable;
import java.text.MessageFormat;
@@ -9,9 +10,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
-import org.jspecify.annotations.Nullable;
+import javax.inject.Inject;
import javax.servlet.http.Cookie;
import org.apache.wicket.Component;
@@ -41,24 +41,27 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
+import org.jspecify.annotations.Nullable;
import org.unbescape.html.HtmlEscape;
-import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.service.IssueChangeService;
-import io.onedev.server.service.IssueService;
-import io.onedev.server.service.IssueReactionService;
-import io.onedev.server.service.LinkSpecService;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.CommentRevision;
import io.onedev.server.model.support.EntityReaction;
+import io.onedev.server.persistence.TransactionService;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.IssueChangeService;
+import io.onedev.server.service.IssueLinkService;
+import io.onedev.server.service.IssueReactionService;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.LinkSpecService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EmailAddressUtils;
import io.onedev.server.util.LinkDescriptor;
@@ -67,6 +70,8 @@ import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.comment.CommentHistoryLink;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.comment.ReactionSupport;
@@ -79,6 +84,7 @@ import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
@@ -92,10 +98,28 @@ public abstract class IssuePrimaryPanel extends Panel {
private static final String COOKIE_LINK_ISSUE_TAB = "linkIssue.tab";
+ @Inject
+ private IssueChangeService issueChangeService;
+
+ @Inject
+ private IssueReactionService issueReactionService;
+
+ @Inject
+ private LinkSpecService linkSpecService;
+
+ @Inject
+ private IssueService issueService;
+
+ @Inject
+ private IssueLinkService issueLinkService;
+
+ @Inject
+ private TransactionService transactionService;
+
private final IModel<List<LinkSpec>> linkSpecsModel = new LoadableDetachableModel<>() {
@Override
protected List<LinkSpec> load() {
- return getLinkSpecService().queryAndSort();
+ return linkSpecService.queryAndSort();
}
};
@@ -127,16 +151,16 @@ public abstract class IssuePrimaryPanel extends Panel {
List<LinkGroup> linkGroups = new ArrayList<>();
for (LinkSpec spec : linkSpecsModel.getObject()) {
if (spec.getOpposite() != null) {
- var targetIssues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
- if (!targetIssues.isEmpty())
- linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), targetIssues));
- var sourceIssues = getIssue().findLinkedIssues(spec, true).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
- if (!sourceIssues.isEmpty())
- linkGroups.add(new LinkGroup(new LinkDescriptor(spec, true), sourceIssues));
+ var targetIssueLinks = getIssue().findIssueLinks(spec, false).stream().filter(it->canAccessIssue(it.getTarget())).collect(toList());
+ if (!targetIssueLinks.isEmpty())
+ linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), targetIssueLinks));
+ var sourceIssueLinks = getIssue().findIssueLinks(spec, true).stream().filter(it->canAccessIssue(it.getSource())).collect(toList());
+ if (!sourceIssueLinks.isEmpty())
+ linkGroups.add(new LinkGroup(new LinkDescriptor(spec, true), sourceIssueLinks));
} else {
- var issues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
- if (!issues.isEmpty())
- linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), issues));
+ var issueLinks = getIssue().findIssueLinks(spec, false).stream().filter(it->canAccessIssue(it.getLinked(getIssue()))).collect(toList());
+ if (!issueLinks.isEmpty())
+ linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), issueLinks));
}
}
return linkGroups;
@@ -174,7 +198,7 @@ public abstract class IssuePrimaryPanel extends Panel {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
var user = SecurityUtils.getUser();
- OneDev.getInstance(IssueChangeService.class).changeDescription(user, getIssue(), comment);
+ issueChangeService.changeDescription(user, getIssue(), comment);
((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));
}
@@ -235,7 +259,7 @@ public abstract class IssuePrimaryPanel extends Panel {
@Override
public void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(IssueReactionService.class).toggleEmoji(
+ issueReactionService.toggleEmoji(
SecurityUtils.getUser(),
getIssue(),
emoji);
@@ -345,14 +369,14 @@ public abstract class IssuePrimaryPanel extends Panel {
item.add(new Label("name", linkName));
RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");
- for (Issue linkedIssue: group.getIssues()) {
+ for (IssueLink issueLink: group.getIssueLinks()) {
LinkDeleteListener deleteListener;
if (canEditIssueLink) {
deleteListener = new LinkDeleteListener() {
@Override
void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
- getIssueChangeService().removeLink(SecurityUtils.getUser(), getLinkSpecService().load(specId), getIssue(),
+ issueChangeService.removeLink(SecurityUtils.getUser(), linkSpecService.load(specId), getIssue(),
linkedIssue, opposite);
notifyIssueChange(target, getIssue());
}
@@ -362,9 +386,39 @@ public abstract class IssuePrimaryPanel extends Panel {
deleteListener = null;
}
linkedIssuesView.add(newLinkedIssueContainer(linkedIssuesView.newChildId(),
- linkedIssue, deleteListener));
+ issueLink, deleteListener));
}
item.add(linkedIssuesView);
+
+ if (canEditIssueLink) {
+ item.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ transactionService.run(() -> {
+ var fromIndex = from.getItemIndex();
+ var toIndex = to.getItemIndex();
+ List<IssueLink> issueLinks = new ArrayList<>();
+ for (var it = linkedIssuesView.iterator(); it.hasNext();) {
+ var issueLinkId = (Long) it.next().getDefaultModelObject();
+ issueLinks.add(issueLinkService.load(issueLinkId));
+ }
+
+ if (fromIndex != toIndex && fromIndex < issueLinks.size() && toIndex < issueLinks.size()) {
+ var movedIssueLink = issueLinks.remove(fromIndex);
+ issueLinks.add(toIndex, movedIssueLink);
+ }
+
+ int minPosition = issueLinks.stream().mapToInt(IssueLink::getPosition).min().getAsInt();
+ for (IssueLink issueLink : issueLinks) {
+ issueLink.setPosition(++minPosition);
+ }
+ notifyIssueChange(target, getIssue());
+ });
+ }
+
+ }.sortable("ul"));
+ }
boolean applicable;
if (spec.getOpposite() != null) {
@@ -388,7 +442,7 @@ public abstract class IssuePrimaryPanel extends Panel {
}
private void onLinkIssue(AjaxRequestTarget target, Long specId, boolean opposite, String linkName) {
- var spec = getLinkSpecService().load(specId);
+ var spec = linkSpecService.load(specId);
if (!opposite && !spec.isMultiple() && getIssue().findLinkedIssue(spec, false) != null
|| opposite && !spec.getOpposite().isMultiple() && getIssue().findLinkedIssue(spec, true) != null) {
Session.get().error(MessageFormat.format(_T("An issue already linked for {0}. Unlink it first"), spec.getName(opposite)));
@@ -400,7 +454,7 @@ public abstract class IssuePrimaryPanel extends Panel {
@Override
protected Criteria<Issue> getTemplate() {
String query;
- var spec = getLinkSpecService().load(specId);
+ var spec = linkSpecService.load(specId);
if (opposite)
query = spec.getOpposite().getIssueQuery();
else
@@ -426,7 +480,7 @@ public abstract class IssuePrimaryPanel extends Panel {
@Override
protected IssueQuery getBaseQuery() {
- LinkSpec spec = getLinkSpecService().load(specId);
+ LinkSpec spec = linkSpecService.load(specId);
if (opposite)
return spec.getOpposite().getParsedIssueQuery(getProject());
else
@@ -437,7 +491,7 @@ public abstract class IssuePrimaryPanel extends Panel {
}
private FormComponent<?> newLinkExistingPanel(String componentId) {
- LinkSpec spec = getLinkSpecService().load(specId);
+ LinkSpec spec = linkSpecService.load(specId);
if (!opposite && spec.isMultiple() || opposite && spec.getOpposite().isMultiple()) {
return new SelectIssuesPanel(componentId) {
@@ -533,7 +587,7 @@ public abstract class IssuePrimaryPanel extends Panel {
if (convertedInput instanceof Issue) {
var linkIssue = (Issue) convertedInput;
if (linkIssue.isNew()) {
- getIssueService().open(linkIssue);
+ issueService.open(linkIssue);
notifyIssueChange(target, linkIssue);
addLink(target, linkIssue);
close();
@@ -552,7 +606,7 @@ public abstract class IssuePrimaryPanel extends Panel {
}
private boolean checkLink(AjaxRequestTarget target, Issue linkIssue) {
- LinkSpec spec = getLinkSpecService().load(specId);
+ LinkSpec spec = linkSpecService.load(specId);
if (getIssue().getId().equals(linkIssue.getId())) {
form.error(_T("Can not link to self: " + linkIssue.getReference().toString(getProject())));
target.add(form);
@@ -567,8 +621,8 @@ public abstract class IssuePrimaryPanel extends Panel {
}
private void addLink(AjaxRequestTarget target, Issue linkIssue) {
- LinkSpec spec = getLinkSpecService().load(specId);
- getIssueChangeService().addLink(SecurityUtils.getUser(), spec, getIssue(), linkIssue, opposite);
+ LinkSpec spec = linkSpecService.load(specId);
+ issueChangeService.addLink(SecurityUtils.getUser(), spec, getIssue(), linkIssue, opposite);
notifyIssueChange(target, getIssue());
}
@@ -611,57 +665,55 @@ public abstract class IssuePrimaryPanel extends Panel {
}
}
- private Component newLinkedIssueContainer(String componentId, Issue linkedIssue,
+ private Component newLinkedIssueContainer(String componentId, IssueLink issueLink,
@Nullable LinkDeleteListener deleteListener) {
- if (canAccessIssue(linkedIssue)) {
- Long linkedIssueId = linkedIssue.getId();
- Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);
-
- var link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(linkedIssue));
- link.add(new Label("label", linkedIssue.getTitle() + " (" + linkedIssue.getReference().toString(getProject()) + ")"));
- fragment.add(link);
-
- fragment.add(new AjaxLink<Void>("unlink") {
+ var linkedIssue = issueLink.getLinked(getIssue());
+ Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);
+ fragment.setDefaultModel(Model.of(issueLink.getId()));
+ fragment.add(new SpriteImage("dragIndicator", "grip").setVisible(deleteListener != null));
+ var link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(linkedIssue));
+ link.add(new Label("label", linkedIssue.getTitle() + " (" + linkedIssue.getReference().toString(getProject()) + ")"));
+ fragment.add(link);
+
+ var linkedIssueId = linkedIssue.getId();
+ fragment.add(new AjaxLink<Void>("unlink") {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener(
- _T("Do you really want to remove this link?")));
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(
+ _T("Do you really want to remove this link?")));
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- Issue linkedIssue = getIssueService().load(linkedIssueId);
- deleteListener.onDelete(target, linkedIssue);
- notifyIssueChange(target, getIssue());
- }
-
- }.setVisible(deleteListener != null));
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Issue linkedIssue = issueService.load(linkedIssueId);
+ deleteListener.onDelete(target, linkedIssue);
+ notifyIssueChange(target, getIssue());
+ }
+
+ }.setVisible(deleteListener != null));
- AjaxLink<Void> stateLink = new TransitionMenuLink("state") {
+ AjaxLink<Void> stateLink = new TransitionMenuLink("state") {
- @Override
- protected Issue getIssue() {
- return getIssueService().load(linkedIssueId);
- }
+ @Override
+ protected Issue getIssue() {
+ return issueService.load(linkedIssueId);
+ }
- };
+ };
- stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<>() {
- @Override
- protected Issue load() {
- return getIssueService().load(linkedIssueId);
- }
- }, true).add(AttributeAppender.append("class", "badge-sm")));
-
- fragment.add(stateLink);
-
- return fragment;
- } else {
- return new WebMarkupContainer(componentId).setVisible(false);
- }
+ stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<>() {
+ @Override
+ protected Issue load() {
+ return issueService.load(linkedIssueId);
+ }
+ }, true).add(AttributeAppender.append("class", "badge-sm")));
+
+ fragment.add(stateLink);
+
+ return fragment;
}
private Project getProject() {
@@ -681,23 +733,11 @@ public abstract class IssuePrimaryPanel extends Panel {
linkGroupsModel.detach();
super.onDetach();
}
-
- private LinkSpecService getLinkSpecService() {
- return OneDev.getInstance(LinkSpecService.class);
- }
-
- private IssueService getIssueService() {
- return OneDev.getInstance(IssueService.class);
- }
-
- private IssueChangeService getIssueChangeService() {
- return OneDev.getInstance(IssueChangeService.class);
- }
private void notifyIssueChange(IPartialPageRequestHandler handler, Issue issue) {
((BasePage)getPage()).notifyObservablesChange(handler, issue.getChangeObservables(true));
}
-
+
protected abstract Issue getIssue();
private static abstract class LinkDeleteListener implements Serializable {