The Unified and Autonomous Development Platform
feat: Hide unused/unset "Issue Links" to make UI clean (OD-1886)
Robin Shen477d49cdfc47
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 337a5efd07..d7effc13d5 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@@ -6435,6 +6435,11 @@ public class DataMigrator {element.addElement("boardPosition").setText(String.valueOf(number*-1));}dom.writeToFile(file, false);+ } else if (file.getName().startsWith("LinkSpecs.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ element.addElement("showAlways").setText("false");+ dom.writeToFile(file, false);}}}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 07f1410f53..0c7891547b 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@@ -31,8 +31,6 @@ public class LinkSpec extends AbstractEntity {public static final String PROP_NAME = "name";- public static final String PROP_OPPOSITE = "opposite";-@Column(nullable=false, unique=true)private String name;@@ -44,6 +42,8 @@ public class LinkSpec extends AbstractEntity {@Column(length=65535)private LinkSpecOpposite opposite;+ private boolean showAlways;+private int order;@OneToMany(mappedBy=IssueLink.PROP_SPEC, cascade=CascadeType.REMOVE)@@ -98,6 +98,15 @@ 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/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex a157f55320..eed5e28b1b 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@@ -41,6 +41,9 @@<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>)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 ac308e2fc1..7cbe3254d7 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@@ -81,16 +81,27 @@ 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.canEditIssueLink;@SuppressWarnings("serial")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();@@ -151,7 +162,57 @@ public abstract class IssueSidePanel extends Panel {@Overrideprotected 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@@ -164,6 +225,12 @@ 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>>() {@@ -242,16 +309,14 @@ public abstract class IssueSidePanel extends Panel {}private Component newLinksContainer() {- return new ListView<LinkSide>("links", new LoadableDetachableModel<List<LinkSide>>() {+ return new ListView<LinkSide>("links", new LoadableDetachableModel<>() {@Overrideprotected List<LinkSide> load() {List<LinkSide> links = new ArrayList<>();- List<LinkSpec> specs = new ArrayList<>(OneDev.getInstance(LinkSpecManager.class).queryAndSort());-- for (LinkSpec spec: specs) {- if (SecurityUtils.canEditIssueLink(getProject(), spec)- || getIssue().getLinks().stream().anyMatch(it->it.getSpec().equals(spec))) {+ for (LinkSpec spec : linkSpecsModel.getObject()) {+ if (canEditIssueLink(getProject(), spec) && (spec.isShowAlways() || showAllLinks)+ || getIssue().getLinks().stream().anyMatch(it -> it.getSpec().equals(spec))) {if (spec.getOpposite() != null) {IssueQuery query = spec.getOpposite().getParsedIssueQuery(getProject());if (query.matches(getIssue()))@@ -268,7 +333,7 @@ public abstract class IssueSidePanel extends Panel {}return links;}-+}) {@Override@@ -289,7 +354,7 @@ public abstract class IssueSidePanel extends Panel {LinkSpec spec = side.getSpec();boolean opposite = side.isOpposite();- boolean canEditIssueLink = SecurityUtils.canEditIssueLink(getProject(), spec);+ boolean canEditIssueLink = canEditIssueLink(getProject(), spec);String name = spec.getName(opposite);fragment.add(new Label("name", name));@@ -408,7 +473,7 @@ public abstract class IssueSidePanel extends Panel {Long prevLinkedIssueId = bean.getIssueId();- boolean authorized = SecurityUtils.canEditIssueLink(getProject(), side.getSpec());+ boolean authorized = canEditIssueLink(getProject(), side.getSpec());fragment.add(new InplacePropertyEditLink("edit", new AlignPlacement(100, 0, 100, 0)) {@Override@@ -809,6 +874,10 @@ public abstract class IssueSidePanel extends Panel {return OneDev.getInstance(IssueManager.class);}+ private LinkSpecManager getLinkSpecManager() {+ return OneDev.getInstance(LinkSpecManager.class);+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);