The Unified and Autonomous Development Platform
feat: Move linked issues from side bar to main area (OD-2312)
Robin Shencabfd9e4e2cf
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex 764991e387..dca107c5b9 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -778,10 +778,16 @@ public class DefaultDataManager implements DataManager, Serializable {link.setName("Blocked By");link.setMultiple(true);link.setOpposite(new LinkSpecOpposite());- link.getOpposite().setName("Blocking");+ link.getOpposite().setName("Blocks");link.getOpposite().setMultiple(true);link.setOrder(2);linkSpecManager.create(link);++ link = new LinkSpec();+ link.setName("Related");+ link.setMultiple(true);+ link.setOrder(3);+ linkSpecManager.create(link);settingManager.saveIssueSetting(new GlobalIssueSetting());}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.javaindex d3e21a4769..ccae17696c 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@@ -7682,6 +7682,11 @@ public class DataMigrator {element.addElement("user").setText(String.valueOf(User.SYSTEM_ID));}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("LinkSpecs.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ element.element("showAlways").detach();+ dom.writeToFile(file, false);}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 0d739d3a44..2a28f8f618 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -1,10 +1,27 @@package io.onedev.server.entitymanager.impl;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.ReplicationMode;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import com.google.common.base.Preconditions;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.LinkAuthorizationManager;+import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;@@ -16,7 +33,14 @@ import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Project;import io.onedev.server.model.Role;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.role.*;+import io.onedev.server.model.support.role.AllIssueFields;+import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.ExcludeIssueFields;+import io.onedev.server.model.support.role.IncludeIssueFields;+import io.onedev.server.model.support.role.IssueFieldSet;+import io.onedev.server.model.support.role.JobPrivilege;+import io.onedev.server.model.support.role.NoneIssueFields;+import io.onedev.server.model.support.role.PackPrivilege;import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -29,15 +53,6 @@ import io.onedev.server.util.facade.RoleFacade;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;-import org.hibernate.ReplicationMode;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.*;@Singletonpublic class DefaultRoleManager extends BaseEntityManager<Role> implements RoleManager {@@ -45,6 +60,8 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMprivate final SettingManager settingManager;private final IdManager idManager;++ private final LinkSpecManager linkSpecManager;private final LinkAuthorizationManager linkAuthorizationManager;@@ -60,7 +77,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMpublic DefaultRoleManager(Dao dao, SettingManager settingManager, IdManager idManager,LinkAuthorizationManager linkAuthorizationManager,ProjectManager projectManager, ClusterManager clusterManager,- TransactionManager transactionManager) {+ TransactionManager transactionManager, LinkSpecManager linkSpecManager) {super(dao);this.settingManager = settingManager;this.idManager = idManager;@@ -68,6 +85,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMthis.projectManager = projectManager;this.clusterManager = clusterManager;this.transactionManager = transactionManager;+ this.linkSpecManager = linkSpecManager;}@Transactional@@ -167,7 +185,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setRunJob(true);codeWriter.getJobPrivileges().add(jobPrivilege);- create(codeWriter, new ArrayList<>());+ create(codeWriter, linkSpecManager.query());Role codeReader = new Role();codeReader.setName("Code Reader");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.javaindex 0c7891547b..b0cb958d4c 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@@ -9,18 +9,18 @@ import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Lob;import javax.persistence.OneToMany;+import javax.validation.constraints.NotEmpty;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.validation.constraints.NotEmpty;+import io.onedev.server.annotation.Editable;import io.onedev.server.model.support.issue.LinkSpecOpposite;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.util.facade.LinkSpecFacade;import io.onedev.server.util.usage.Usage;-import io.onedev.server.annotation.Editable;@Editable@Entity@@ -41,9 +41,7 @@ public class LinkSpec extends AbstractEntity {@Lob@Column(length=65535)private LinkSpecOpposite opposite;-- private boolean showAlways;-+private int order;@OneToMany(mappedBy=IssueLink.PROP_SPEC, cascade=CascadeType.REMOVE)@@ -98,15 +96,6 @@ public class LinkSpec extends AbstractEntity {return opposite?getOpposite().getName():getName();}- @Editable(order=200, description = "Whether or not to show this link always even if no issues are linked")- public boolean isShowAlways() {- return showAlways;- }-- public void setShowAlways(boolean showAlways) {- this.showAlways = showAlways;- }-public int getOrder() {return order;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 0864d8a193..1f423b71b9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -30,6 +30,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaprivate static final Pattern INSIDE_QUOTE = Pattern.compile("\"([^\"\\\\]|\\\\.)*");+ @Nullablepublic abstract Criteria<T> getCriteria();public abstract List<EntitySort> getSorts();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.javaindex 94dcd41651..cbde1ea1f0 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@@ -14,7 +14,7 @@ import javax.persistence.criteria.Subquery;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueLink;import io.onedev.server.model.LinkSpec;-import io.onedev.server.util.LinkSide;+import io.onedev.server.util.LinkDescriptor;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;@@ -24,13 +24,13 @@ public class HasLinkCriteria extends Criteria<Issue> {private String linkName;- private transient LinkSide linkSide;+ private transient LinkDescriptor linkSide;public HasLinkCriteria(String linkName) {this.linkName = linkName;}- public HasLinkCriteria(LinkSide linkSide) {+ public HasLinkCriteria(LinkDescriptor linkSide) {linkName = linkSide.getName();this.linkSide = linkSide;}@@ -58,9 +58,9 @@ public class HasLinkCriteria extends Criteria<Issue> {return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));}- private LinkSide getLinkSide() {+ private LinkDescriptor getLinkSide() {if (linkSide == null)- linkSide = new LinkSide(linkName);+ linkSide = new LinkDescriptor(linkName);return linkSide;}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.javaindex 76335f4632..b2edbe3c65 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@@ -26,7 +26,7 @@ import io.onedev.server.entitymanager.IssueLinkManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueLink;import io.onedev.server.model.LinkSpec;-import io.onedev.server.util.LinkSide;+import io.onedev.server.util.LinkDescriptor;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -44,7 +44,7 @@ public class LinkMatchCriteria extends Criteria<Issue> {private final boolean allMatch;- private transient LinkSide linkSide;+ private transient LinkDescriptor linkSide;public LinkMatchCriteria(String linkName, Criteria<Issue> criteria, boolean allMatch) {this.linkName = linkName;@@ -115,9 +115,9 @@ public class LinkMatchCriteria extends Criteria<Issue> {}}- private LinkSide getLinkSide() {+ private LinkDescriptor getLinkSide() {if (linkSide == null)- linkSide = new LinkSide(linkName);+ linkSide = new LinkDescriptor(linkName);return linkSide;}diff --git a/server-core/src/main/java/io/onedev/server/util/LinkSide.java b/server-core/src/main/java/io/onedev/server/util/LinkDescriptor.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/util/LinkSide.javarename to server-core/src/main/java/io/onedev/server/util/LinkDescriptor.javaindex 3d580902ec..852b1e26e6 100644--- a/server-core/src/main/java/io/onedev/server/util/LinkSide.java+++ b/server-core/src/main/java/io/onedev/server/util/LinkDescriptor.java@@ -5,18 +5,18 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.model.LinkSpec;-public class LinkSide {+public class LinkDescriptor {private final LinkSpec spec;private final boolean opposite;- public LinkSide(LinkSpec spec, boolean opposite) {+ public LinkDescriptor(LinkSpec spec, boolean opposite) {this.spec = spec;this.opposite = opposite;}- public LinkSide(String linkName) {+ public LinkDescriptor(String linkName) {spec = OneDev.getInstance(LinkSpecManager.class).find(linkName);if (spec == null)throw new ExplicitException("Link spec not found: " + linkName);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.javanew file mode 100644index 0000000000..8ae62d7e2c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/LinkGroup.java@@ -0,0 +1,26 @@+package io.onedev.server.util;++import java.util.List;++import io.onedev.server.model.Issue;++public class LinkGroup {++ private final LinkDescriptor descriptor;++ private final List<Issue> issues;++ public LinkGroup(LinkDescriptor descriptor, List<Issue> issues) {+ this.descriptor = descriptor;+ this.issues = issues;+ }++ public LinkDescriptor getDescriptor() {+ return descriptor;+ }++ public List<Issue> getIssues() {+ return issues;+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.javaindex 8593faedec..366e495d42 100644--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java@@ -156,6 +156,12 @@ public class OrCriteria<T> extends Criteria<T> {return !criterias.isEmpty();}+ @Override+ public void fill(T object) {+ if (criterias.size() == 1)+ criterias.iterator().next().fill(object);+ }+@Overridepublic String toString(boolean addParensIfNecessary) {if (!withParens() && criterias.size() > 1)diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/unlink.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/unlink.svgnew file mode 100644index 0000000000..9204073258--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/unlink.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1741741606230" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7532" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M448.129996 632.108247c-11.807631 0-23.583263-3.935877-31.455017-13.791569-72.733727-72.861723-72.733727-192.985969 0-267.799632l194.585919-194.937908c35.390894-35.454892 82.55742-55.134277 133.659823-55.134277s98.268929 19.679385 133.659823 55.134277c72.733727 72.861723 72.733727 192.985969 0 267.799631L790.135308 511.984c-17.695447 17.727446-45.214587 17.727446-62.878035 0s-17.695447-45.278585 0-63.006031l88.445236-88.605231c18.207431-18.111434 29.471079-43.19865 29.471079-70.877785s-11.263648-52.766351-29.471079-70.877785c-19.647386-19.679385-43.230649-29.535077-70.749789-29.535077s-51.102403 9.855692-70.749789 29.535077l-194.585919 196.921846c-18.207431 18.111434-29.471079 43.19865-29.471079 70.877785s11.263648 52.766351 29.471079 70.877786a44.030624 44.030624 0 0 1 0 63.006031 52.254367 52.254367 0 0 1-31.455017 11.807631z" p-id="7533"></path><path d="M288.934971 927.491016c-51.102403 0-98.268929-19.679385-133.659823-55.134277s-55.03828-82.717415-55.03828-133.915815 19.647386-98.460923 55.03828-133.915815l100.220868-100.444862c17.695447-17.727446 45.214587-17.727446 62.878035 0s17.695447 45.310584 0 63.006032l-100.220868 100.444861c-19.647386 19.679385-29.471079 43.326646-29.471079 70.877785s9.823693 51.1984 29.471079 70.877785a99.51689 99.51689 0 0 0 141.499578 0l194.585919-194.937908c19.647386-19.679385 29.471079-43.326646 29.471079-70.877785s-9.823693-51.1984-29.471079-70.877786c-17.695447-17.727446-17.695447-45.278585 0-63.006031s45.214587-17.727446 62.878035 0c35.390894 35.454892 55.03828 82.717415 55.03828 133.915816s-19.647386 98.460923-55.03828 133.915815l-194.585919 194.937908a186.970157 186.970157 0 0 1-133.659823 55.134277zM196.553858 484.400862H45.230587C21.647324 484.400862 0.016 464.721477 0.016 439.122277c0-23.647261 19.647386-45.278585 45.214587-45.278585h151.323271c23.583263 0 45.214587 19.679385 45.214587 45.278585 0 23.615262-19.647386 45.278585-45.214587 45.278585z m243.704384-244.15237c-23.583263 0-45.214587-19.679385-45.214587-45.278585V45.310584c0-23.615262 19.647386-45.278585 45.214587-45.278585 23.583263 0 45.214587 19.679385 45.214587 45.278585v151.643261c-1.983938 23.615262-21.631324 43.326646-45.214587 43.326646z m-115.964376 116.15637c-11.807631 0-21.631324-3.935877-31.455017-11.807631L184.746227 238.264554c-17.695447-17.727446-17.695447-45.278585 0-63.006031s45.214587-17.727446 62.878035 0L355.716884 281.5912a44.030624 44.030624 0 0 1 0 63.006031c-9.823693 7.871754-19.647386 11.807631-31.455017 11.807631z m654.475547 273.719447h-151.323271c-23.583263 0-45.214587-19.679385-45.214587-45.278585 0-23.615262 19.647386-45.278585 45.214587-45.278585h151.323271c23.583263 0 45.214587 19.679385 45.214587 45.278585s-19.647386 45.278585-45.214587 45.278585zM585.693697 1023.968001c-23.583263 0-45.214587-19.679385-45.214587-45.278585v-151.611262c0-23.615262 19.647386-45.278585 45.214587-45.278585 23.583263 0 45.214587 19.679385 45.214587 45.278585v151.643261c-1.983938 25.5992-21.631324 45.278585-45.214587 45.278585z m224.056998-161.466954c-11.807631 0-21.631324-3.935877-31.455017-11.807631l-108.092622-106.332677c-17.695447-17.727446-17.695447-45.278585 0-63.006031s45.214587-17.727446 62.878035 0l108.092622 106.332677a44.030624 44.030624 0 0 1 0 63.006031c-7.871754 7.871754-19.647386 11.807631-31.455017 11.807631z" p-id="7534"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 658912ba5e..8dccbbb950 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -157,7 +157,7 @@ public abstract class CodeCommentPanel extends Panel {protected SuggestionSupport getSuggestionSupport() {return CodeCommentPanel.this.getSuggestionSupport();}-+});viewFragment.add(new WebMarkupContainer("anchor").setVisible(false));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 8103feb92d..b7fc2d542c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -197,10 +197,10 @@ public abstract class IssueActivitiesPanel extends Panel {String script;if (prevActivityRow != null) {- script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ script = String.format("$(\"<li id='%s'></li>\").insertAfter('#%s');",newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());} else {- script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s').find('tbody'));",+ script = String.format("$(\"<li id='%s'></li>\").prependTo($('#%s>ul'));",newActivityRow.getMarkupId(), IssueActivitiesPanel.this.getMarkupId());}handler.prependJavaScript(script);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.javaindex 65819fd09b..df0fd01fb4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.issue.choice;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -16,11 +17,13 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.issue.FuzzyCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.ProjectScopedQuery;+import io.onedev.server.util.criteria.AndCriteria;+import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.WebConstants;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.component.select2.ChoiceProvider;@@ -55,7 +58,7 @@ public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {}@Nullable- protected EntityQuery<Issue> getScope() {+ protected IssueQuery getBaseQuery() {return null;}@@ -65,7 +68,14 @@ public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');if (scopedQuery != null) {var projectScope = new ProjectScope(scopedQuery.getProject(), false, false);- var issueQuery = new IssueQuery(new FuzzyCriteria(scopedQuery.getQuery()));+ List<Criteria<Issue>> criterias = Lists.newArrayList(new FuzzyCriteria(scopedQuery.getQuery()));+ var sorts = new ArrayList<EntitySort>();+ if (getBaseQuery() != null) {+ if (getBaseQuery().getCriteria() != null)+ criterias.add(getBaseQuery().getCriteria());+ sorts.addAll(getBaseQuery().getSorts());+ }+ var issueQuery = new IssueQuery(new AndCriteria<>(criterias), sorts);var issues = OneDev.getInstance(IssueManager.class).query(projectScope, issueQuery, false, 0, count);new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.htmldeleted file mode 100644index 2dd8be0b23..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="border border-dashed border-primary rounded p-4">- <div class="mb-3">- <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span> <span wicket:id="submitOnBehalfOf"></span>- </div>- <div wicket:id="description"></div>- </div>- <wicket:fragment wicket:id="linkIssuesFrag">- <span class="d-first-child-none dot mr-2"></span>- <a wicket:id="linkIssues" class="text-muted text-hover-primary mr-2">Link Issues</a>- </wicket:fragment>-</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.javadeleted file mode 100644index cb7109159f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/issue/description/IssueDescriptionPanel.java+++ /dev/null@@ -1,146 +0,0 @@-package io.onedev.server.web.component.issue.description;--import java.util.Collection;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-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.entitymanager.IssueChangeManager;-import io.onedev.server.entitymanager.IssueReactionManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.EntityReaction;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;-import io.onedev.server.util.EmailAddressUtils;-import io.onedev.server.web.component.comment.CommentPanel;-import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.util.DeleteCallback;--public abstract class IssueDescriptionPanel extends Panel {-- public IssueDescriptionPanel(String id) {- super(id);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Issue issue = getIssue();- add(new UserIdentPanel("submitterAvatar", issue.getSubmitter(), Mode.AVATAR));- add(new Label("submitterName", issue.getSubmitter().getDisplayName()));- add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(issue.getSubmitDate()))));-- if (issue.getOnBehalfOf() != null)- add(new Label("submitOnBehalfOf", " on behalf of <b>" + HtmlEscape.escapeHtml5(EmailAddressUtils.describe(issue.getOnBehalfOf(), SecurityUtils.canManageIssues(getIssue().getProject()))) + "</b>").setEscapeModelStrings(false));- else- add(new WebMarkupContainer("submitOnBehalfOf").setVisible(false));-- add(new CommentPanel("description") {-- @Override- protected String getComment() {- return getIssue().getDescription();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, String comment) {- OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment);- ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));- }-- @Override- protected List<User> getParticipants() {- return getIssue().getParticipants();- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getIssue().getUUID(),- SecurityUtils.canManageIssues(getProject()));- }-- @Override- protected boolean canManageComment() {- return SecurityUtils.canModifyIssue(getIssue());- }-- @Override- protected String getRequiredLabel() {- return null;- }-- @Override- protected String getEmptyDescription() {- return "No description";- }-- @Override- protected ContentVersionSupport getContentVersionSupport() {- return () -> 0;- }-- @Override- protected DeleteCallback getDeleteCallback() {- return null;- }-- @Override- protected String getAutosaveKey() {- return "issue:" + getIssue().getId() + ":description";- }-- @Override- protected Collection<? extends EntityReaction> getReactions() {- return getIssue().getReactions();- }-- @Override- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {- OneDev.getInstance(IssueReactionManager.class).toggleEmoji(- SecurityUtils.getUser(),- getIssue(),- emoji);- }-- @Override- protected Component newMoreActions(String componentId) {- var fragment = new Fragment(componentId, "linkIssuesFrag", IssueDescriptionPanel.this);- fragment.add(new AjaxLink<Void>("linkIssues") {-- @Override- public void onClick(AjaxRequestTarget target) {-- }- });- return fragment;- }-- });-- }-- protected abstract Issue getIssue();-}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 71cf4ad654..d839f560aa 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@@ -26,7 +26,7 @@ import io.onedev.server.security.permission.AccessProject;import io.onedev.server.timetracking.TimeTrackingManager;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.LinkSide;+import io.onedev.server.util.LinkDescriptor;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.watch.WatchStatus;@@ -1757,7 +1757,7 @@ public abstract class IssueListPanel extends Panel {protected List<Issue> load() {Issue issue = (Issue) fragment.getDefaultModelObject();getIssueLinkManager().loadDeepLinks(issue);- LinkSide side = new LinkSide(linksPanel.getExpandedLink());+ LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());return issue.findLinkedIssues(side.getSpec(), side.isOpposite()).stream().filter(SecurityUtils::canAccessIssue).collect(toList());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryCssResourceReference.javanew file mode 100644index 0000000000..016d4365ad--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryCssResourceReference.java@@ -0,0 +1,11 @@+package io.onedev.server.web.component.issue.primary;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssuePrimaryCssResourceReference extends BaseDependentCssResourceReference {++ public IssuePrimaryCssResourceReference() {+ super(IssuePrimaryCssResourceReference.class, "issue-primary.css");+ }++}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.htmlnew file mode 100644index 0000000000..961197dbb0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.html@@ -0,0 +1,36 @@+<wicket:panel>+ <div class="issue-primary">+ <div class="border border-dashed border-primary rounded p-4">+ <div class="mb-3">+ <span wicket:id="submitterAvatar" class="mr-1"></span> <span wicket:id="submitterName" class="user"></span> opened <span wicket:id="submitDate"></span> <span wicket:id="submitOnBehalfOf"></span>+ </div>+ <div wicket:id="description"></div>+ </div>+ <ul wicket:id="links" class="links list-unstyled mb-0">+ <li wicket:id="links" class="mt-4">+ <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>+ <a wicket:id="linkExisting" title="Link existing issue" class="mr-1"><wicket:svg href="link" class="icon icon-sm"/></a>+ </div>+ <ul class="body linked-issues list-unstyled mb-0">+ <li wicket:id="linkedIssues" class="py-2 border-top d-flex align-items-center"></li>+ </ul>+ </li>+ </ul>+ </div>+ <wicket:fragment wicket:id="linkIssuesActionFrag">+ <span class="d-first-child-none dot mr-2"></span>+ <a wicket:id="linkIssues" class="text-muted text-hover-primary mr-2">Link Issues</a>+ </wicket:fragment>+ <wicket:fragment wicket:id="selectIssueFrag">+ <form wicket:id="form">+ <input wicket:id="choice" type="hidden" class="form-control"/>+ </form>+ </wicket:fragment>+ <wicket:fragment wicket:id="linkedIssueFrag">+ <a wicket:id="title"><span wicket:id="label"></span></a>+ <a wicket:id="unlink" class="action ml-2" title="Unlink this issue"><wicket:svg href="unlink" class="icon icon-sm"/></a>+ <a wicket:id="state" class="state ml-auto"><span wicket:id="badge"></span></a>+ </wicket:fragment>+</wicket:panel>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.javanew file mode 100644index 0000000000..0531f9b3e3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java@@ -0,0 +1,581 @@+package io.onedev.server.web.component.issue.primary;++import static io.onedev.server.security.SecurityUtils.canAccessIssue;+import static io.onedev.server.security.SecurityUtils.canEditIssueLink;+import static java.util.stream.Collectors.toList;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+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.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+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.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+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.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueReactionManager;+import io.onedev.server.entitymanager.LinkSpecManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.LinkSpec;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.EntityReaction;+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.util.DateUtils;+import io.onedev.server.util.EmailAddressUtils;+import io.onedev.server.util.LinkDescriptor;+import io.onedev.server.util.LinkGroup;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.comment.CommentPanel;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.issue.IssueStateBadge;+import io.onedev.server.web.component.issue.choice.IssueAddChoice;+import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;+import io.onedev.server.web.component.issue.create.CreateIssuePanel;+import io.onedev.server.web.component.issue.operation.TransitionMenuLink;+import io.onedev.server.web.component.link.DropdownLink;+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.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.util.DeleteCallback;++public abstract class IssuePrimaryPanel extends Panel {++ private final IModel<List<LinkSpec>> linkSpecsModel = new LoadableDetachableModel<>() {+ @Override+ protected List<LinkSpec> load() {+ return getLinkSpecManager().queryAndSort();+ }++ };++ private final IModel<List<LinkDescriptor>> addibleLinkDescriptorsModel = new LoadableDetachableModel<>() {+ @Override+ protected List<LinkDescriptor> load() {+ var linkDescriptors = new ArrayList<LinkDescriptor>();+ for (LinkSpec spec: linkSpecsModel.getObject()) {+ if (canEditIssueLink(getProject(), spec)) {+ if (spec.getOpposite() != null) {+ if (spec.getOpposite().getParsedIssueQuery(getProject()).matches(getIssue()))+ linkDescriptors.add(new LinkDescriptor(spec, false));+ if (spec.getParsedIssueQuery(getProject()).matches(getIssue()))+ linkDescriptors.add(new LinkDescriptor(spec, true));+ } else if (spec.getParsedIssueQuery(getProject()).matches(getIssue())) {+ linkDescriptors.add(new LinkDescriptor(spec, false));+ }+ }+ }+ return linkDescriptors;+ }+ };++ private final IModel<List<LinkGroup>> linkGroupsModel = new LoadableDetachableModel<>() {++ @Override+ protected List<LinkGroup> load() {+ 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(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(toList());+ if (!sourceIssues.isEmpty())+ linkGroups.add(new LinkGroup(new LinkDescriptor(spec, true), sourceIssues));+ } else {+ var issues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(toList());+ if (!issues.isEmpty())+ linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), issues));+ }+ }+ return linkGroups;+ }++ };++ public IssuePrimaryPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Issue issue = getIssue();+ add(new UserIdentPanel("submitterAvatar", issue.getSubmitter(), Mode.AVATAR));+ add(new Label("submitterName", issue.getSubmitter().getDisplayName()));+ add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate()))+ .add(new AttributeAppender("title", DateUtils.formatDateTime(issue.getSubmitDate()))));++ if (issue.getOnBehalfOf() != null)+ add(new Label("submitOnBehalfOf", " on behalf of <b>" + HtmlEscape.escapeHtml5(EmailAddressUtils.describe(issue.getOnBehalfOf(), SecurityUtils.canManageIssues(getProject()))) + "</b>").setEscapeModelStrings(false));+ else+ add(new WebMarkupContainer("submitOnBehalfOf").setVisible(false));++ add(new CommentPanel("description") {++ @Override+ protected String getComment() {+ return getIssue().getDescription();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, String comment) {+ OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment);+ ((BasePage)getPage()).notifyObservablesChange(target, getIssue().getChangeObservables(false));+ }++ @Override+ protected List<User> getParticipants() {+ return getIssue().getParticipants();+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getIssue().getUUID(),+ SecurityUtils.canManageIssues(getProject()));+ }++ @Override+ protected boolean canManageComment() {+ return SecurityUtils.canModifyIssue(getIssue());+ }++ @Override+ protected String getRequiredLabel() {+ return null;+ }++ @Override+ protected String getEmptyDescription() {+ return "No description";+ }++ @Override+ protected ContentVersionSupport getContentVersionSupport() {+ return () -> 0;+ }++ @Override+ protected DeleteCallback getDeleteCallback() {+ return null;+ }++ @Override+ protected String getAutosaveKey() {+ return "issue:" + getIssue().getId() + ":description";+ }++ @Override+ protected Collection<? extends EntityReaction> getReactions() {+ return getIssue().getReactions();+ }++ @Override+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {+ OneDev.getInstance(IssueReactionManager.class).toggleEmoji(+ SecurityUtils.getUser(),+ getIssue(),+ emoji);+ }++ @Override+ protected Component newMoreActions(String componentId) {+ var fragment = new Fragment(componentId, "linkIssuesActionFrag", IssuePrimaryPanel.this) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!addibleLinkDescriptorsModel.getObject().isEmpty());+ }+ };+ fragment.add(new MenuLink("linkIssues") {+++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();+ Long lastSpecId = null;+ for (LinkDescriptor side: addibleLinkDescriptorsModel.getObject()) {+ var spec = side.getSpec();+ var specId = spec.getId();+ var opposite = side.isOpposite();+ if (lastSpecId != null && lastSpecId != specId)+ menuItems.add(null);+ lastSpecId = specId;+ var linkName = side.getName();+ menuItems.add(new MenuItem() {+ @Override+ public String getLabel() {+ return linkName + " (create new)";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return newLinkNewIssueLink(id, specId, opposite, dropdown);+ }+ });++ menuItems.add(new MenuItem() {+ @Override+ public String getLabel() {+ return linkName + " (link existing)";+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return newLinkExistingIssueLink(id, specId, opposite, dropdown);+ }++ });+ }+ return menuItems;+ }+ });+ return fragment;+ }++ });++ var linksContainer = new WebMarkupContainer("links") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!linkGroupsModel.getObject().isEmpty());+ }++ };+ linksContainer.add(new ChangeObserver() {++ @Override+ protected Collection<String> findObservables() {+ return Collections.singleton(Issue.getDetailChangeObservable(getIssue().getId()));+ }++ });+ linksContainer.setOutputMarkupPlaceholderTag(true);+ add(linksContainer);+ linksContainer.add(new ListView<LinkGroup>("links", linkGroupsModel) {++ @Override+ protected void populateItem(ListItem<LinkGroup> item) {+ var group = item.getModelObject();+ var descriptor = group.getDescriptor();+ var spec = descriptor.getSpec();+ var specId = spec.getId();+ var opposite = descriptor.isOpposite();++ boolean canEditIssueLink = canEditIssueLink(getProject(), spec);++ String name = spec.getName(opposite);+ item.add(new Label("name", name));++ RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");+ for (Issue linkedIssue: group.getIssues()) {+ LinkDeleteListener deleteListener;+ if (canEditIssueLink) {+ deleteListener = new LinkDeleteListener() {++ @Override+ void onDelete(AjaxRequestTarget target, Issue linkedIssue) {+ getIssueChangeManager().removeLink(getLinkSpecManager().load(specId), getIssue(),+ linkedIssue, opposite);+ notifyIssueChange(target, getIssue());+ }++ };+ } else {+ deleteListener = null;+ }+ linkedIssuesView.add(newLinkedIssueContainer(linkedIssuesView.newChildId(),+ linkedIssue, deleteListener));+ }+ item.add(linkedIssuesView);++ boolean applicable;+ if (spec.getOpposite() != null) {+ if (opposite)+ applicable = spec.getParsedIssueQuery(getProject()).matches(getIssue());+ else+ applicable = spec.getOpposite().getParsedIssueQuery(getProject()).matches(getIssue());+ } else {+ applicable = spec.getParsedIssueQuery(getProject()).matches(getIssue());+ }++ item.add(newLinkNewIssueLink("createNew", specId, opposite, null)+ .setVisible(applicable && canEditIssueLink));+ item.add(newLinkExistingIssueLink("linkExisting", specId, opposite, null)+ .setVisible(applicable && canEditIssueLink));+ }++ });+ }++ private Component newLinkedIssueContainer(String componentId, Issue linkedIssue,+ @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") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(+ "Do you really want to remove this link?"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ Issue linkedIssue = getIssueManager().load(linkedIssueId);+ deleteListener.onDelete(target, linkedIssue);+ notifyIssueChange(target, getIssue());+ }++ }.setVisible(deleteListener != null));++ AjaxLink<Void> stateLink = new TransitionMenuLink("state") {++ @Override+ protected Issue getIssue() {+ return getIssueManager().load(linkedIssueId);+ }++ };++ stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<>() {+ @Override+ protected Issue load() {+ return getIssueManager().load(linkedIssueId);+ }+ }, true).add(AttributeAppender.append("class", "badge-sm")));++ fragment.add(stateLink);++ return fragment;+ } else {+ return new WebMarkupContainer(componentId).setVisible(false);+ }+ }++ private boolean checkLinkSingular(Long specId, boolean opposite) {+ var spec = getLinkSpecManager().load(specId);+ if (!opposite && !spec.isMultiple() && getIssue().findLinkedIssue(spec, false) != null+ || opposite && !spec.getOpposite().isMultiple() && getIssue().findLinkedIssue(spec, true) != null) {+ Session.get().error("An issue already linked for " + spec.getName(opposite) + ". Unlink it first");+ return false;+ } else {+ return true;+ }+ }++ private WebMarkupContainer newLinkNewIssueLink(String componentId, Long specId, boolean opposite, @Nullable FloatingPanel dropdown) {+ return new AjaxLink<Void>(componentId) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (dropdown != null)+ dropdown.close();+ if (checkLinkSingular(specId, opposite)) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new CreateIssuePanel(id) {++ @Override+ protected Criteria<Issue> getTemplate() {+ String query;+ var spec = getLinkSpecManager().load(specId);+ if (opposite)+ query = spec.getOpposite().getIssueQuery();+ else+ query = spec.getIssueQuery();+ return IssueQuery.parse(getProject(), query, new IssueQueryParseOption(), false).getCriteria();+ }++ @Override+ protected void onSave(AjaxRequestTarget target, Issue issue) {+ getIssueManager().open(issue);+ notifyIssueChange(target, issue);+ var spec = getLinkSpecManager().load(specId);+ getIssueChangeManager().addLink(spec, getIssue(), issue, opposite);+ notifyIssueChange(target, getIssue());+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ };+ }+ };+ }+ }+ };++ }++ private WebMarkupContainer newLinkExistingIssueLink(String componentId, Long specId, boolean opposite, @Nullable FloatingPanel dropdown) {+ return new DropdownLink(componentId) {++ @Override+ protected void onInitialize(FloatingPanel dropdown) {+ super.onInitialize(dropdown);+ dropdown.add(AttributeModifier.append("class", "inplace-edit issue-link-choice"));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (checkLinkSingular(specId, opposite))+ super.onClick(target);+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown2) {+ var fragment = new Fragment(id, "selectIssueFrag", IssuePrimaryPanel.this);+ var form = new Form<Void>("form");+ fragment.add(form);+ form.add(new IssueAddChoice("choice", new IssueChoiceProvider() {++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ @Override+ protected IssueQuery getBaseQuery() {+ LinkSpec spec = getLinkSpecManager().load(specId);+ if (opposite)+ return spec.getOpposite().getParsedIssueQuery(getProject());+ else+ return spec.getParsedIssueQuery(getProject());+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Issue selection) {+ if (dropdown != null)+ dropdown.close();+ dropdown2.close();++ LinkSpec spec = getLinkSpecManager().load(specId);+ if (getIssue().equals(selection)) {+ getSession().warn("Can not link to self");+ } else if (getIssue().findLinkedIssues(spec, opposite).contains(selection)) {+ getSession().warn("Issue already linked");+ } else {+ getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);+ notifyIssueChange(target, getIssue());+ }+ }++ @Override+ protected String getPlaceholder() {+ return "Select issue...";+ }++ });+ return fragment;+ }+ };+ }++ private Project getProject() {+ return getIssue().getProject();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssuePrimaryCssResourceReference()));+ }++ @Override+ protected void onDetach() {+ linkSpecsModel.detach();+ addibleLinkDescriptorsModel.detach();+ linkGroupsModel.detach();+ super.onDetach();+ }++ private LinkSpecManager getLinkSpecManager() {+ return OneDev.getInstance(LinkSpecManager.class);+ }++ private IssueManager getIssueManager() {+ return OneDev.getInstance(IssueManager.class);+ }++ private IssueChangeManager getIssueChangeManager() {+ return OneDev.getInstance(IssueChangeManager.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 {++ abstract void onDelete(AjaxRequestTarget target, Issue linkedIssue);++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/issue-primary.css b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/issue-primary.cssnew file mode 100644index 0000000000..a0cf023748--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/issue-primary.css@@ -0,0 +1,17 @@+.issue-link-choice {+ width: 400px !important;+ border-radius: 0 !important;+ box-shadow: none !important;+}+.issue-primary>.links>li>.head:not(.dropdown-aware-open)>a {+ display: none;+}+.issue-primary>.links>li:hover>.head>a {+ display: inline-block;+}+.issue-primary>.links>li>.body>li>.action {+ display: none;+}+.issue-primary>.links>li>.body>li:hover>.action {+ display: inline-block;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 7cc2d1f4ef..70b353177b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -38,12 +38,6 @@</wicket:enclosure></ul></div>- <div wicket:id="links" class="links">- <wicket:container wicket:id="content"></wicket:container>- </div>- <wicket:enclosure child="showAllLinks">- <div><a wicket:id="showAllLinks"><span wicket:id="label"></span> <wicket:svg href="arrow" class="rotate-90 icon icon-sm"/></a></div>- </wicket:enclosure><div wicket:id="votes" class="votes"><div class="head">Issue Votes (<span wicket:id="count"></span>)@@ -86,35 +80,4 @@<wicket:fragment wicket:id="nonEmptyValuesFrag"><div wicket:id="values" class="value"><span wicket:id="value"></span></div></wicket:fragment>- <wicket:fragment wicket:id="singleLinkFrag">- <div class="head d-flex align-items-center">- <span wicket:id="name" class="flex-shrink-0 mr-2"></span>- <a wicket:id="edit" title="Edit" class="flex-grow-1 text-right"><wicket:svg href="gear" class="icon icon-sm"/></a>- </div>- <div wicket:id="body" class="body"></div>- </wicket:fragment>- <wicket:fragment wicket:id="linkedIssueFrag">- <div class="bg-light rounded p-3">- <div class="d-flex align-items-center number-and-state mb-2">- <a wicket:id="reference" class="mr-2"><span wicket:id="label"></span></a>- <a wicket:id="delete" class="mr-2 mb-1" title="Unlink this issue"><wicket:svg href="trash" class="icon icon-sm"/></a>- <a wicket:id="state" class="state ml-auto"><span wicket:id="badge"></span></a>- </div>- <div class="title d-flex text-nowrap">- <a wicket:id="title" class="text-truncate"><span wicket:id="label"></span></a>- </div>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="multipleLinksFrag">- <div wicket:id="name" class="head d-flex align-items-center"></div>- <ul class="body linked-issues list-unstyled mb-0">- <li wicket:id="linkedIssues"></li>- <wicket:enclosure child="linkNew">- <li class="new-link d-flex">- <input wicket:id="linkNew" type="hidden" placeholder="Add existing" class="form-control">- <a wicket:id="createNew" title="Create new" class="btn btn-icon btn-light ml-2"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </li>- </wicket:enclosure>- </ul>- </wicket:fragment></wicket:panel>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 92ca753f9e..4f1dacaf24 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@@ -1,109 +1,98 @@package io.onedev.server.web.component.issue.side;+import static io.onedev.server.security.SecurityUtils.canAccessIssue;+import static io.onedev.server.security.SecurityUtils.canManageIssues;+import static io.onedev.server.util.EmailAddressUtils.describe;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import javax.mail.internet.InternetAddress;++import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxCallListener;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;+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.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueVoteManager;+import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entityreference.EntityReference;-import io.onedev.server.model.*;+import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueVote;+import io.onedev.server.model.IssueWatch;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryLexer;-import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.LinkSide;import io.onedev.server.util.Similarities;-import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.entity.reference.EntityReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;-import io.onedev.server.web.component.floating.AlignPlacement;-import io.onedev.server.web.component.issue.IssueStateBadge;-import io.onedev.server.web.component.issue.choice.IssueAddChoice;-import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;-import io.onedev.server.web.component.issue.create.CreateIssuePanel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.component.issue.operation.TransitionMenuLink;import io.onedev.server.web.component.issue.statestats.StateStatsBar;import io.onedev.server.web.component.iteration.IterationStatusLabel;import io.onedev.server.web.component.iteration.choice.AbstractIterationChoiceProvider;import io.onedev.server.web.component.iteration.choice.IterationChoiceResourceReference;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.select2.Response;import io.onedev.server.web.component.select2.ResponseFiller;import io.onedev.server.web.component.select2.SelectToActChoice;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.list.SimpleUserListLink;-import io.onedev.server.web.editable.InplacePropertyEditLink;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;import io.onedev.server.web.page.simple.security.LoginPage;-import org.apache.wicket.Component;-import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxCallListener;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.CheckBox;-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.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import javax.annotation.Nullable;-import javax.mail.internet.InternetAddress;-import java.io.Serializable;-import java.util.*;-import java.util.stream.Collectors;--import static io.onedev.server.search.entity.issue.IssueQuery.parse;-import static io.onedev.server.security.SecurityUtils.*;-import static io.onedev.server.util.EmailAddressUtils.describe;public abstract class IssueSidePanel extends Panel {private static final int MAX_DISPLAY_AVATARS = 20;-- private final IModel<List<LinkSpec>> linkSpecsModel = new LoadableDetachableModel<>() {- @Override- protected List<LinkSpec> load() {- return getLinkSpecManager().queryAndSort();- }-- };-+private boolean confidential;private Component watchesContainer;- private boolean showAllLinks;-public IssueSidePanel(String id) {super(id);confidential = getIssue().isConfidential();@@ -114,7 +103,6 @@ public abstract class IssueSidePanel extends Panel {addOrReplace(newFieldsContainer());addOrReplace(newConfidentialContainer());addOrReplace(newIterationsContainer());- addOrReplace(newLinksContainer());addOrReplace(newVotesContainer());addOrReplace(watchesContainer = new EntityWatchesPanel("watches") {@@ -163,56 +151,6 @@ public abstract class IssueSidePanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new AjaxLink<Void>("showAllLinks") {- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- var hasVisibleLinks = false;- for (LinkSpec spec : linkSpecsModel.getObject()) {- if (canEditIssueLink(getProject(), spec) && spec.isShowAlways()- || getIssue().getLinks().stream().anyMatch(it -> it.getSpec().equals(spec))) {- hasVisibleLinks = true;- break;- }- }- if (hasVisibleLinks)- return "More Links";- else- return "Show Links";- }-- }));- }-- @Override- public void onClick(AjaxRequestTarget target) {- showAllLinks = true;- target.add(IssueSidePanel.this);- }-- @Override- protected void onConfigure() {- super.onConfigure();- if (showAllLinks) {- setVisible(false);- } else {- var hasLinksToShow = false;- for (LinkSpec spec : linkSpecsModel.getObject()) {- if (canEditIssueLink(getProject(), spec) && !spec.isShowAlways()- && getIssue().getLinks().stream().noneMatch(it -> it.getSpec().equals(spec))) {- hasLinksToShow = true;- break;- }- }- setVisible(hasLinksToShow);- }- }- });-add(new ChangeObserver() {@Override@@ -225,12 +163,6 @@ public abstract class IssueSidePanel extends Panel {setOutputMarkupId(true);}- @Override- protected void onDetach() {- linkSpecsModel.detach();- super.onDetach();- }-private Component newFieldsContainer() {IModel<List<Input>> fieldsModel = new LoadableDetachableModel<List<Input>>() {@@ -307,287 +239,7 @@ public abstract class IssueSidePanel extends Panel {return confidentialInput;}-- private Component newLinksContainer() {- return new ListView<LinkSide>("links", new LoadableDetachableModel<>() {-- @Override- protected List<LinkSide> load() {- List<LinkSide> links = new ArrayList<>();- for (LinkSpec spec : linkSpecsModel.getObject()) {- if (canEditIssueLink(getProject(), spec) && (spec.isShowAlways() || showAllLinks)- || getIssue().getLinks().stream().anyMatch(it -> it.getSpec().equals(spec) && (it.getSource().equals(getIssue()) || canAccessIssue(it.getSource())) && (it.getTarget().equals(getIssue()) || canAccessIssue(it.getTarget())))) {- if (spec.getOpposite() != null) {- IssueQuery query = spec.getOpposite().getParsedIssueQuery(getProject());- if (query.matches(getIssue()))- links.add(new LinkSide(spec, false));- query = spec.getParsedIssueQuery(getProject());- if (query.matches(getIssue()))- links.add(new LinkSide(spec, true));- } else {- IssueQuery query = spec.getParsedIssueQuery(getProject());- if (query.matches(getIssue()))- links.add(new LinkSide(spec, false));- }- }- }- return links;- }-- }) {-- @Override- protected void populateItem(ListItem<LinkSide> item) {- LinkSide side = item.getModelObject();-- if (side.isOpposite() && side.getSpec().getOpposite().isMultiple()- || !side.isOpposite() && side.getSpec().isMultiple()) {- item.add(newMultipleLinks(item.getModel()));- } else {- item.add(newSingleLink(item.getModel()));- }- }-- private Fragment newMultipleLinks(IModel<LinkSide> model) {- Fragment fragment = new Fragment("content", "multipleLinksFrag", IssueSidePanel.this);- LinkSide side = model.getObject();- LinkSpec spec = side.getSpec();- boolean opposite = side.isOpposite();-- boolean canEditIssueLink = canEditIssueLink(getProject(), spec);-- String name = spec.getName(opposite);- fragment.add(new Label("name", name));-- RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");- for (Issue linkedIssue: getIssue().findLinkedIssues(spec, opposite)) {- LinkDeleteListener deleteListener;- if (canEditIssueLink) {- deleteListener = new LinkDeleteListener() {-- @Override- void onDelete(AjaxRequestTarget target, Issue linkedIssue) {- getIssueChangeManager().removeLink(model.getObject().getSpec(), getIssue(),- linkedIssue, opposite);- notifyIssueChange(target, getIssue());- }-- };- } else {- deleteListener = null;- }- linkedIssuesView.add(newLinkedIssueContainer(linkedIssuesView.newChildId(),- linkedIssue, deleteListener));- }- fragment.add(linkedIssuesView);-- fragment.add(new IssueAddChoice("linkNew", new IssueChoiceProvider() {-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- @Override- protected EntityQuery<Issue> getScope() {- LinkSpec spec = model.getObject().getSpec();- if (opposite)- return spec.getOpposite().getParsedIssueQuery(getProject());- else- return spec.getParsedIssueQuery(getProject());- }-- }) {-- @Override- protected void onSelect(AjaxRequestTarget target, Issue selection) {- LinkSpec spec = model.getObject().getSpec();- if (getIssue().equals(selection)) {- getSession().warn("Can not link to self");- } else if (getIssue().findLinkedIssues(spec, opposite).contains(selection)) {- getSession().warn("Issue already added");- } else {- getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);- notifyIssueChange(target, getIssue());- }- }-- }.setVisible(canEditIssueLink));-- fragment.add(new ModalLink("createNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new CreateIssuePanel(id) {-- @Nullable- @Override- protected Criteria<Issue> getTemplate() {- String query;- var spec = model.getObject().getSpec();- if (opposite)- query = spec.getOpposite().getIssueQuery();- else- query = spec.getIssueQuery();- return parse(getProject(), query, new IssueQueryParseOption(), false).getCriteria();- }-- @Override- protected void onSave(AjaxRequestTarget target, Issue issue) {- getIssueManager().open(issue);- notifyIssueChange(target, issue);- getIssueChangeManager().addLink(model.getObject().getSpec(),- getIssue(), issue, opposite);- notifyIssueChange(target, getIssue());- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- };- }-- }.setVisible(canEditIssueLink));-- return fragment;- }-- private Fragment newSingleLink(IModel<LinkSide> model) {- Fragment fragment = new Fragment("content", "singleLinkFrag", IssueSidePanel.this);- LinkSide side = model.getObject();- fragment.add(new Label("name", side.getSpec().getName(side.isOpposite())));-- SingleLinkBean bean = new SingleLinkBean();-- Issue prevLinkedIssue = getIssue().findLinkedIssue(side.getSpec(), side.isOpposite());- if (prevLinkedIssue != null)- bean.setIssueId(prevLinkedIssue.getId());-- Long prevLinkedIssueId = bean.getIssueId();-- boolean authorized = canEditIssueLink(getProject(), side.getSpec());- fragment.add(new InplacePropertyEditLink("edit", new AlignPlacement(100, 0, 100, 0)) {-- @Override- protected Serializable getBean() {- return bean;- }-- @Override- protected String getPropertyName() {- return "issueId";- }-- @Override- protected Project getProject() {- return getIssue().getProject();- }-- @Override- protected IssueQuery getIssueQuery() {- LinkSide side = model.getObject();- if (side.isOpposite())- return side.getSpec().getOpposite().getParsedIssueQuery(getProject());- else- return side.getSpec().getParsedIssueQuery(getProject());- }-- @Override- protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean,- String propertyName) {- LinkSide side = model.getObject();- SingleLinkBean singleLinkBean = (SingleLinkBean) bean;- Issue linkedIssue = null;- if (singleLinkBean.getIssueId() != null)- linkedIssue = getIssueManager().load(singleLinkBean.getIssueId());- if (getIssue().equals(linkedIssue)) {- getSession().warn("Can not link to self");- singleLinkBean.setIssueId(prevLinkedIssueId);- } else {- Issue prevLinkedIssue = getIssue().findLinkedIssue(side.getSpec(), side.isOpposite());- getIssueChangeManager().changeLink(side.getSpec(), getIssue(), prevLinkedIssue, linkedIssue, side.isOpposite());- notifyIssueChange(handler, getIssue());- }- }-- }.setVisible(authorized));-- if (prevLinkedIssue != null)- fragment.add(newLinkedIssueContainer("body", prevLinkedIssue, null));- else- fragment.add(new WebMarkupContainer("body").setVisible(false));-- return fragment;- }-- };- }-- private Component newLinkedIssueContainer(String componentId, Issue linkedIssue,- @Nullable LinkDeleteListener deleteListener) {- if (canAccessIssue(linkedIssue)) {- Long linkedIssueId = linkedIssue.getId();- Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);- Link<Void> link = new BookmarkablePageLink<Void>("reference", IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(linkedIssue));- link.add(new Label("label", linkedIssue.getReference().toString(getProject())));- fragment.add(link);-- fragment.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmClickListener(- "Do you really want to remove this link?"));- }-- @Override- public void onClick(AjaxRequestTarget target) {- Issue linkedIssue = getIssueManager().load(linkedIssueId);- deleteListener.onDelete(target, linkedIssue);- notifyIssueChange(target, getIssue());- }-- }.setVisible(deleteListener != null));-- AjaxLink<Void> stateLink = new TransitionMenuLink("state") {-- @Override- protected Issue getIssue() {- return getIssueManager().load(linkedIssueId);- }-- };-- stateLink.add(new IssueStateBadge("badge", new LoadableDetachableModel<>() {- @Override- protected Issue load() {- return getIssueManager().load(linkedIssueId);- }- }, true).add(AttributeAppender.append("class", "badge-sm")));-- fragment.add(stateLink);-- link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(linkedIssue));- link.add(new Label("label", linkedIssue.getTitle()));- fragment.add(link);-- return fragment;- } else {- return new WebMarkupContainer(componentId).setVisible(false);- }- }-+private Component newIterationsContainer() {WebMarkupContainer container = new WebMarkupContainer("iterations") {@@ -919,14 +571,6 @@ public abstract class IssueSidePanel extends Panel {return OneDev.getInstance(IssueChangeManager.class);}- private IssueManager getIssueManager() {- return OneDev.getInstance(IssueManager.class);- }-- private LinkSpecManager getLinkSpecManager() {- return OneDev.getInstance(LinkSpecManager.class);- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -941,9 +585,4 @@ public abstract class IssueSidePanel extends Panel {((BasePage)getPage()).notifyObservablesChange(handler, issue.getChangeObservables(true));}- private static abstract class LinkDeleteListener implements Serializable {-- abstract void onDelete(AjaxRequestTarget target, Issue linkedIssue);-- }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.javaindex a1248eca93..714183b706 100644--- a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java@@ -98,8 +98,11 @@ public abstract class DropdownLink extends AjaxLink<Void> {AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);if (target != null) {- String script = String.format("$('#%s').removeClass('dropdown-open');",- DropdownLink.this.getMarkupId(true));+ var markupId = DropdownLink.this.getMarkupId(true);+ String script = String.format(""+ + "$('#%s').removeClass('dropdown-open');"+ + "$('#%s').closest('.dropdown-aware').removeClass('dropdown-aware-open');",+ markupId, markupId);target.appendJavaScript(script);}@@ -109,8 +112,9 @@ public abstract class DropdownLink extends AjaxLink<Void> {};String script = String.format(""+ "$('#%s').addClass('dropdown-open');"+ + "$('#%s').closest('.dropdown-aware').addClass('dropdown-aware-open');"+ "$('#%s').data('trigger', $('#%s'));",- getMarkupId(), dropdown.getMarkupId(), getMarkupId());+ getMarkupId(), getMarkupId(), dropdown.getMarkupId(), getMarkupId());target.appendJavaScript(script);} else {dropdown.close();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.javaindex 805d75b48d..8ce3094460 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java@@ -27,7 +27,7 @@ public abstract class InplacePropertyEditLink extends DropdownLink {@Overrideprotected void onInitialize(FloatingPanel dropdown) {super.onInitialize(dropdown);- dropdown.add(AttributeAppender.append("class", "inplace-property-edit"));+ dropdown.add(AttributeAppender.append("class", "inplace-edit inplace-property-edit"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javaindex 956462e0bf..bd214ce2ad 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java@@ -10,7 +10,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.component.issue.choice.IssueChoice;import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;import io.onedev.server.web.editable.PropertyDescriptor;@@ -53,7 +53,7 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {}@Override- protected EntityQuery<Issue> getScope() {+ protected IssueQuery getBaseQuery() {IssueQueryAware issueScopeAware = findParent(IssueQueryAware.class);if (issueScopeAware != null)return issueScopeAware.getIssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 7c040148b6..26d7483770 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -253,7 +253,7 @@ onedev.server = {$this[0].CodeMirror.focus();} else if ($this.attr("readonly") != "readonly" && $this.attr("disabled") != "disabled") {if ($this.closest(".select2-container").length != 0) {- if ($this.closest(".inplace-property-edit").length != 0) {+ if ($this.closest(".inplace-edit").length != 0) {$this.focus();$this.closest(".select2-container").next("input").select2("open");}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.javaindex 7d819865af..ed4c86b668 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,5 +1,30 @@package io.onedev.server.web.page.project.issues.boards;+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.List;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+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.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.cycle.RequestCycle;+import org.hibernate.Hibernate;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueLinkManager;import io.onedev.server.entitymanager.IssueManager;@@ -9,15 +34,16 @@ 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.LinkSide;+import io.onedev.server.util.LinkDescriptor;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.iteration.IterationCrumbPanel;+import io.onedev.server.web.component.issue.link.IssueLinksPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;import io.onedev.server.web.component.issue.progress.IssueProgressPanel;import io.onedev.server.web.component.issue.title.IssueTitlePanel;@@ -26,29 +52,6 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;-import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.CallbackParameter;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-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.html.panel.GenericPanel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.hibernate.Hibernate;--import java.util.List;--import static io.onedev.server.security.SecurityUtils.canManageIssues;-import static io.onedev.server.security.SecurityUtils.getAuthUser;public abstract class BoardCardPanel extends GenericPanel<Issue> {@@ -284,8 +287,8 @@ public abstract class BoardCardPanel extends GenericPanel<Issue> {protected List<Issue> load() {Issue issue = issueModel.getObject();OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);- LinkSide side = new LinkSide(linksPanel.getExpandedLink());- return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite());+ LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());+ return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite()).stream().filter(it->SecurityUtils.canAccessIssue(it)).collect(toList());}}) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.htmlindex 639a2cc387..666499991d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html@@ -8,7 +8,7 @@<div class="modal-body d-flex position-relative overflow-hidden"><div class="main flex-grow-1"><div wicket:id="operations" class="mb-5"></div>- <div wicket:id="description" class="mb-5"></div>+ <div wicket:id="primary" class="mb-5"></div><ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul><div wicket:id="tabContent"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 7f9934d75a..97d622e919 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -39,9 +39,9 @@ import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;-import io.onedev.server.web.component.issue.description.IssueDescriptionPanel;import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;+import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;@@ -108,7 +108,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});- add(new IssueDescriptionPanel("description") {+ add(new IssuePrimaryPanel("primary") {@Overrideprotected Issue getIssue() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex fb09391dbb..bb46f1acb0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -7,7 +7,7 @@<div class="card-body d-flex position-relative overflow-hidden"><div class="main flex-grow-1"><div wicket:id="operations" class="mb-5"></div>- <div wicket:id="description" class="mb-5"></div>+ <div wicket:id="primary" class="mb-5"></div><ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul><wicket:child></wicket:child></div>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 2c65096382..759fe74319 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@@ -46,9 +46,9 @@ import io.onedev.server.util.ProjectScope;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.entity.nav.EntityNavPanel;-import io.onedev.server.web.component.issue.description.IssueDescriptionPanel;import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;+import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sideinfo.SideInfoLink;@@ -143,7 +143,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input});- add(new IssueDescriptionPanel("description") {+ add(new IssuePrimaryPanel("primary") {@Overrideprotected Issue getIssue() {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.javaindex 6d32d70b2c..2d4b6000a5 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@@ -16,7 +16,7 @@ import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;-import io.onedev.server.util.LinkSide;+import io.onedev.server.util.LinkDescriptor;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.issue.IssueStateBadge;@@ -263,7 +263,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {protected List<Issue> load() {Issue issue = getIssueManager().load(issueId);OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);- LinkSide side = new LinkSide(linksPanel.getExpandedLink());+ LinkDescriptor side = new LinkDescriptor(linksPanel.getExpandedLink());return issue.findLinkedIssues(side.getSpec(), side.isOpposite());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex e7ac207838..b3185c5457 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -350,7 +350,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {script = String.format("$(\"<li id='%s'></li>\").insertAfter('#%s');",sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());} else {- script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s'));",+ script = String.format("$(\"<li id='%s'></li>\").prependTo($('#%s'));",sinceChangesRow.getMarkupId(), container.getMarkupId());}handler.prependJavaScript(script);@@ -370,7 +370,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {script = String.format("$(\"<li id='%s'></li>\").insertAfter('#%s');",newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());} else {- script = String.format("$(\"<tr id='%s'></tr>\").prependTo($('#%s'));",+ script = String.format("$(\"<li id='%s'></li>\").prependTo($('#%s'));",newActivityRow.getMarkupId(), container.getMarkupId());}handler.prependJavaScript(script);diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 3e45c0e8db..6c713d0fa2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -10,7 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.web.page.base.BasePage;public class TestPage extends BasePage {-+public TestPage(PageParameters params) {super(params);}@@ -26,7 +26,7 @@ public class TestPage extends BasePage {});}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);