Skip to content

The Unified and Autonomous Development Platform

Fix issue #704 - Retain issue linking when importing from YouTrack

Robin Shen8d8499a79340
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.html b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.html
index 7df986fcf4..746da03274 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.html
@@ -1,5 +1,8 @@
<wicket:panel>
<form wicket:id="form">
+ <div wicket:id="retainNumbersNote" class="alert alert-notice alert-light mb-5">Importing issues
+ into currrent project. Please note that issue numbers will only be retained if the whole
+ project fork graph does not have any issues to avoid duplicate issue numbers</div>
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
<input wicket:id="back" type="button" class="btn btn-light-primary mr-1" value="Back">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
index e806ebb60a..b4e2237d38 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
@@ -10,6 +10,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.slf4j.Logger;
@@ -22,6 +23,7 @@ import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
public abstract class ImportPanel<Where extends Serializable, What extends Serializable, How extends Serializable>
@@ -50,6 +52,8 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
}
Form<?> form = new Form<Void>("form");
+ form.add(new WebMarkupContainer("retainNumbersNote")
+ .setVisible(getPage() instanceof ProjectPage));
form.add(new FencedFeedbackPanel("feedback", form));
form.add(BeanContext.edit("editor", where));
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.java
index 32faa7b19f..c01b8b839d 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportOption.java
@@ -17,6 +17,8 @@ public class ImportOption implements Serializable {
private List<IssueTagMapping> issueTagMappings = new ArrayList<>();
+ private List<IssueLinkMapping> issueLinkMappings = new ArrayList<>();
+
@Editable(order=200, description="Specify how to map YouTrack issue state to OneDev issue state. "
+ "Unmapped states will use the initial state in OneDev.<br>"
+ "<b>NOTE: </b> You may customize OneDev issue states in case there is no appropriate option here")
@@ -55,4 +57,14 @@ public class ImportOption implements Serializable {
this.issueTagMappings = issueTagMappings;
}
+ @Editable(order=400, description="Specify how to map YouTrack issue links to OneDev issue links.<br>"
+ + "<b>NOTE: </b> You may customize OneDev issue links in case there is no appropriate option here")
+ public List<IssueLinkMapping> getIssueLinkMappings() {
+ return issueLinkMappings;
+ }
+
+ public void setIssueLinkMappings(List<IssueLinkMapping> issueLinkMappings) {
+ this.issueLinkMappings = issueLinkMappings;
+ }
+
}
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.java
index cdde89990d..8044111bdc 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportResult.java
@@ -20,6 +20,8 @@ public class ImportResult {
Set<String> unmappedIssueFields = new LinkedHashSet<>();
+ Set<String> unmappedIssueLinks = new LinkedHashSet<>();
+
Set<String> unmappedIssueStates = new LinkedHashSet<>();
Map<String, String> mismatchedIssueFields = new LinkedHashMap<>();
@@ -43,6 +45,7 @@ public class ImportResult {
|| !unmappedIssueFields.isEmpty()
|| !mismatchedIssueFields.isEmpty()
|| !unmappedIssueTags.isEmpty()
+ || !unmappedIssueLinks.isEmpty()
|| !nonExistentLogins.isEmpty()
|| !tooLargeAttachments.isEmpty();
@@ -55,6 +58,8 @@ public class ImportResult {
}
if (!unmappedIssueFields.isEmpty())
feedback.append(getEntryFeedback("Unmapped YouTrack issue fields", unmappedIssueFields));
+ if (!unmappedIssueLinks.isEmpty())
+ feedback.append(getEntryFeedback("Unmapped YouTrack issue links", unmappedIssueLinks));
if (!mismatchedIssueFields.isEmpty()) {
feedback.append("<li> YouTrack issue fields mapped to wrong type of OneDev issue field: ");
feedback.append("<ul>");
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
index d499f1551a..3da9e1eb2e 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
@@ -27,18 +27,23 @@ import org.apache.http.client.utils.URIBuilder;
import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
+import io.onedev.server.model.IssueLink;
import io.onedev.server.model.IssueSchedule;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastUpdate;
@@ -114,6 +119,13 @@ public class ImportUtils {
importOption.getIssueTagMappings().add(mapping);
}
+ apiEndpoint = server.getApiEndpoint("/issueLinkTypes?fields=name");
+ for (JsonNode tagNode: list(client, apiEndpoint, logger)) {
+ IssueLinkMapping mapping = new IssueLinkMapping();
+ mapping.setYouTrackIssueLink(tagNode.get("name").asText());
+ importOption.getIssueLinkMappings().add(mapping);
+ }
+
} finally {
client.close();
}
@@ -130,8 +142,10 @@ public class ImportUtils {
Map<String, String> stateMappings = new HashMap<>();
Map<String, Pair<FieldSpec, String>> fieldMappings = new HashMap<>();
Map<String, Pair<FieldSpec, String>> tagMappings = new HashMap<>();
+ Map<String, LinkSpec> linkMappings = new HashMap<>();
Map<Long, Long> issueNumberMappings = new HashMap<>();
+ Map<Long, Issue> issueMappings = new HashMap<>();
for (IssueStateMapping mapping: importOption.getIssueStateMappings())
stateMappings.put(mapping.getYouTrackIssueState(), mapping.getOneDevIssueState());
@@ -159,10 +173,17 @@ public class ImportUtils {
throw new ExplicitException("No field spec found: " + oneDevFieldName);
tagMappings.put(mapping.getYouTrackIssueTag(), new Pair<>(fieldSpec, oneDevFieldValue));
}
+ for (IssueLinkMapping mapping: importOption.getIssueLinkMappings()) {
+ LinkSpec linkSpec = OneDev.getInstance(LinkSpecManager.class).find(mapping.getOneDevIssueLink());
+ if (linkSpec == null)
+ throw new ExplicitException("No link spec found: " + mapping.getOneDevIssueLink());
+ linkMappings.put(mapping.getYouTrackIssueLink(), linkSpec);
+ }
Set<String> nonExistentLogins = new LinkedHashSet<>();
Set<String> unmappedIssueTags = new LinkedHashSet<>();
Set<String> unmappedIssueFields = new LinkedHashSet<>();
+ Set<String> unmappedIssueLinks = new LinkedHashSet<>();
Set<String> unmappedIssueStates = new LinkedHashSet<>();
Map<String, String> mismatchedIssueFields = new LinkedHashMap<>();
Set<String> tooLargeAttachments = new LinkedHashSet<>();
@@ -170,6 +191,8 @@ public class ImportUtils {
AtomicInteger numOfImportedIssues = new AtomicInteger(0);
List<Issue> issues = new ArrayList<>();
+ Map<Long, Pair<LinkSpec, List<Long>>> issueLinkInfo = new HashMap<>();
+ Map<Long, Set<Set<Long>>> processedSymmetricLinks = new HashMap<>();
String fields = ""
+ "idReadable,"
@@ -182,7 +205,7 @@ public class ImportUtils {
+ "reporter(login,name,email),"
+ "tags(name),"
+ "customFields(name,value(name,login,email,presentation,text),projectCustomField(field(fieldType(id)))),"
- + "links(direction,linkType(sourceToTarget,targetToSource),issues(numberInProject))";
+ + "links(direction,linkType(name,sourceToTarget,targetToSource),issues(numberInProject))";
PageDataConsumer pageDataConsumer = new PageDataConsumer() {
@Nullable
@@ -277,6 +300,7 @@ public class ImportUtils {
newNumber = getIssueManager().getNextNumber(oneDevProject);
issue.setNumber(newNumber);
issueNumberMappings.put(oldNumber, newNumber);
+ issueMappings.put(oldNumber, issue);
issue.setTitle(issueNode.get("summary").asText());
issue.setDescription(issueNode.get("description").asText(null));
issue.setSubmitDate(new Date(issueNode.get("created").asLong(System.currentTimeMillis())));
@@ -666,24 +690,52 @@ public class ImportUtils {
issue.setState(initialState.getName());
for (JsonNode linkNode: issueNode.get("links")) {
- List<String> linkedIssueLinks = new ArrayList<>();
+ List<Long> linkedIssueNumbers = new ArrayList<>();
for (JsonNode linkedIssueNode: linkNode.get("issues"))
- linkedIssueLinks.add(youTrackProjectShortName + "-" + linkedIssueNode.get("numberInProject").asLong());
+ linkedIssueNumbers.add(linkedIssueNode.get("numberInProject").asLong());
- if (!linkedIssueLinks.isEmpty() && linkNode.hasNonNull("linkType")) {
+ if (!linkedIssueNumbers.isEmpty() && linkNode.hasNonNull("linkType")) {
JsonNode linkTypeNode = linkNode.get("linkType");
- switch (linkNode.get("direction").asText()) {
- case "BOTH":
- case "OUTWARD":
- String linkName = linkTypeNode.get("sourceToTarget").asText(null);
- if (linkName != null)
- extraIssueInfo.put(linkName, joinAsMultilineHtml(linkedIssueLinks));
- break;
- case "INWARD":
- linkName = linkTypeNode.get("targetToSource").asText(null);
- if (linkName != null)
- extraIssueInfo.put(linkName, joinAsMultilineHtml(linkedIssueLinks));
- break;
+ String direction = linkNode.get("direction").asText();
+ String linkName = linkTypeNode.get("name").asText(null);
+ if (linkName != null) {
+ LinkSpec linkSpec = linkMappings.get(linkName);
+ if (linkSpec == null) {
+ List<String> linkedIssueLinks = new ArrayList<>();
+ for (Long issueNumber: linkedIssueNumbers)
+ linkedIssueLinks.add(youTrackProjectShortName + "-" + issueNumber);
+
+ unmappedIssueLinks.add(linkName);
+ switch (direction) {
+ case "BOTH":
+ case "OUTWARD":
+ linkName = linkTypeNode.get("sourceToTarget").asText(null);
+ if (linkName != null)
+ extraIssueInfo.put(linkName, joinAsMultilineHtml(linkedIssueLinks));
+ break;
+ case "INWARD":
+ linkName = linkTypeNode.get("targetToSource").asText(null);
+ if (linkName != null)
+ extraIssueInfo.put(linkName, joinAsMultilineHtml(linkedIssueLinks));
+ break;
+ }
+ } else if ("OUTWARD".equals(direction)) {
+ issueLinkInfo.put(oldNumber, new Pair<>(linkSpec, linkedIssueNumbers));
+ } else if ("BOTH".equals(direction)) {
+ Set<Set<Long>> value = processedSymmetricLinks.get(linkSpec.getId());
+ if (value == null) {
+ value = new HashSet<>();
+ processedSymmetricLinks.put(linkSpec.getId(), value);
+ }
+ List<Long> filteredIssueNumbers = new ArrayList<>();
+ for (Long issueNumber: linkedIssueNumbers) {
+ Set<Long> linkSides = Sets.newHashSet(oldNumber, issueNumber);
+ if (value.add(linkSides))
+ filteredIssueNumbers.add(issueNumber);
+ }
+ if (!filteredIssueNumbers.isEmpty())
+ issueLinkInfo.put(oldNumber, new Pair<>(linkSpec, filteredIssueNumbers));
+ }
}
}
}
@@ -799,6 +851,22 @@ public class ImportUtils {
dao.persist(comment);
}
}
+
+ for (Map.Entry<Long, Pair<LinkSpec, List<Long>>> entry: issueLinkInfo.entrySet()) {
+ Issue source = issueMappings.get(entry.getKey());
+ if (source != null) {
+ for (Long targetNumber: entry.getValue().getSecond()) {
+ Issue target = issueMappings.get(targetNumber);
+ if (target != null) {
+ IssueLink link = new IssueLink();
+ link.setSource(source);
+ link.setTarget(target);
+ link.setSpec(entry.getValue().getFirst());
+ OneDev.getInstance(IssueLinkManager.class).save(link);
+ }
+ }
+ }
+ }
}
ImportResult result = new ImportResult();
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java
new file mode 100644
index 0000000000..e9837edfe0
--- /dev/null
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueLinkMapping.java
@@ -0,0 +1,64 @@
+package io.onedev.server.plugin.imports.youtrack;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class IssueLinkMapping implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String youTrackIssueLink;
+
+ private String oneDevIssueLink;
+
+ @Editable(order=100, name="YouTrack Issue Link")
+ @NotEmpty
+ public String getYouTrackIssueLink() {
+ return youTrackIssueLink;
+ }
+
+ public void setYouTrackIssueLink(String youTrackIssueLink) {
+ this.youTrackIssueLink = youTrackIssueLink;
+ }
+
+ @Editable(order=200, name="OneDev Issue Link")
+ @ChoiceProvider("getOneDevIssueLinkChoices")
+ @NotEmpty
+ public String getOneDevIssueLink() {
+ return oneDevIssueLink;
+ }
+
+ public void setOneDevIssueLink(String oneDevIssueLink) {
+ this.oneDevIssueLink = oneDevIssueLink;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getOneDevIssueLinkChoices() {
+ List<String> choices = new ArrayList<>();
+ List<LinkSpec> linkSpecs = OneDev.getInstance(LinkSpecManager.class).query();
+ Collections.sort(linkSpecs, new Comparator<LinkSpec>() {
+
+ @Override
+ public int compare(LinkSpec o1, LinkSpec o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ });
+ for (LinkSpec linkSpec: linkSpecs)
+ choices.add(linkSpec.getName());
+ return choices;
+ }
+
+}