Skip to content

The Unified and Autonomous Development Platform

add the reference to the side panel

Michael Weimannd2d27e14dff7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index c2c2376f57..1f29848c4d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -84,10 +84,11 @@
<a wicket:id="dependents"><span wicket:id="label"></span></a> depends on me
</wicket:enclosure>
</div>
+ <div wicket:id="reference"></div>
<wicket:enclosure child="delete">
- <div class="actions">
- <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
- </div>
+ <div class="actions">
+ <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
+ </div>
</wicket:enclosure>
</div>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 90e44c5034..da7ad7be79 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import io.onedev.server.web.component.entity.reference.ReferencePanel;
import org.apache.wicket.Component;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
@@ -280,6 +281,8 @@ public abstract class BuildSidePanel extends Panel {
else
add(new WebMarkupContainer("delete").setVisible(false));
+ addOrReplace(new ReferencePanel("reference", getBuild()));
+
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html
new file mode 100644
index 0000000000..d5eba81f01
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.html
@@ -0,0 +1,8 @@
+<wicket:panel>
+ <div class="d-flex align-items-center">
+ <div class="mr-3 text-nowrap text-truncate">Reference: <span wicket:id="reference"></span></div>
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary flex-shrink-0 ml-auto">
+ <wicket:svg href="copy" class="icon"></wicket:svg>
+ </a>
+ </div>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java
new file mode 100644
index 0000000000..d4e1c3f369
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java
@@ -0,0 +1,28 @@
+package io.onedev.server.web.component.entity.reference;
+
+import io.onedev.server.util.Referenceable;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+public class ReferencePanel extends Panel {
+
+ private Referenceable entity;
+
+ public ReferencePanel(String id, Referenceable entity) {
+ super(id);
+ this.entity = entity;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ String displayReference = String.format("%s#%d", entity.getProject(), entity.getNumber());
+ String reference = entity.getPrefix() + " " + displayReference;
+
+ add(new Label("reference", displayReference));
+ add(new CopyToClipboardLink("copy", Model.of(reference)));
+ }
+}
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.html
index d9dd55787e..959ac26683 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
@@ -19,10 +19,11 @@
</div>
</div>
<div wicket:id="watches" class="watches"></div>
+ <div wicket:id="reference"></div>
<wicket:enclosure child="delete">
- <div>
- <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
- </div>
+ <div>
+ <a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
+ </div>
</wicket:enclosure>
</div>
<wicket:fragment wicket:id="userFrag">
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.java
index fec6f2e61c..0b440b69c6 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
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import io.onedev.server.web.component.entity.reference.ReferencePanel;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -111,6 +112,8 @@ public abstract class IssueSidePanel extends Panel {
else
addOrReplace(new WebMarkupContainer("delete").setVisible(false));
+ addOrReplace(new ReferencePanel("reference", getIssue()));
+
super.onBeforeRender();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index d45244b74e..3fce1cf93e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -134,6 +134,7 @@
</div>
</div>
<div wicket:id="watches" class="watches"></div>
+ <div wicket:id="reference"></div>
<div wicket:id="actions" class="d-flex align-items-center justify-content-between">
<wicket:enclosure child="synchronize">
<div class="synchronize d-flex align-items-center mr-3">
@@ -145,10 +146,11 @@
</wicket:enclosure>
<a wicket:id="delete" class="delete btn btn-light-danger">Delete</a>
</div>
+
</wicket:fragment>
<wicket:fragment wicket:id="projectTitleFrag">
<a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>
<span class="dot"></span>
<span wicket:id="pullRequestNumber"></span>
</wicket:fragment>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 7be7ed7f26..cf1bd98668 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -14,6 +14,7 @@ import java.util.stream.Stream;
import javax.persistence.EntityNotFoundException;
+import io.onedev.server.web.component.entity.reference.ReferencePanel;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -729,6 +730,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
});
+ fragment.add(new ReferencePanel("reference", getPullRequest()));
+
fragment.add(new EntityWatchesPanel("watches") {
@Override
@@ -1467,4 +1470,4 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return fragment;
}
-}
\ No newline at end of file
+}