You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/10/05 19:45:39 UTC
[ignite-teamcity-bot] branch ignite-9800 updated: IGNITE-9800: PR
link implemented
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9800
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9800 by this push:
new 60497f7 IGNITE-9800: PR link implemented
60497f7 is described below
commit 60497f7b044408378d0e6f7ab58428fbdf42f1e1
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Oct 5 22:45:35 2018 +0300
IGNITE-9800: PR link implemented
---
.../main/java/org/apache/ignite/ci/github/PullRequest.java | 9 +++++++++
.../java/org/apache/ignite/ci/visa/ContributionToCheck.java | 1 +
.../apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java | 1 +
ignite-tc-helper-web/src/main/webapp/index.html | 2 +-
ignite-tc-helper-web/src/main/webapp/prs.html | 11 +++++++++--
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
index 02e69c8..50d1e7e 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/github/PullRequest.java
@@ -33,6 +33,8 @@ public class PullRequest {
/** Pull Request title. */
private String title;
+ @SerializedName("html_url") private String htmlUrl;
+
/** Pull Request statuses URL. */
@SerializedName("statuses_url") private String statusesUrl;
@@ -74,6 +76,13 @@ public class PullRequest {
return gitHubUser;
}
+ /**
+ * @return Html url.
+ */
+ public String htmlUrl() {
+ return htmlUrl;
+ }
+
@Override public String toString() {
return MoreObjects.toStringHelper(this)
.add("num", num)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/ContributionToCheck.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/ContributionToCheck.java
index 16d759b..8781cef 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/ContributionToCheck.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/ContributionToCheck.java
@@ -23,4 +23,5 @@ public class ContributionToCheck {
public Integer prNumber;
public String prTitle;
public String prAuthor;
+ public String prHtmlUrl;
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
index 08390b2..ae12e03 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/visa/TcBotTriggerAndSignOffService.java
@@ -186,6 +186,7 @@ public class TcBotTriggerAndSignOffService {
ContributionToCheck check = new ContributionToCheck();
check.prNumber = pr.getNumber();
check.prTitle = pr.getTitle();
+ check.prHtmlUrl = pr.htmlUrl();
GitHubUser user = pr.gitHubUser();
if (user != null)
diff --git a/ignite-tc-helper-web/src/main/webapp/index.html b/ignite-tc-helper-web/src/main/webapp/index.html
index 731b77b..3e4909b 100644
--- a/ignite-tc-helper-web/src/main/webapp/index.html
+++ b/ignite-tc-helper-web/src/main/webapp/index.html
@@ -44,7 +44,7 @@ function loadData() {
</head>
<body>
<div class="formgroup" style="text-align: center">
- <div style="text-align: center">You need to</div>
+ <div style="text-align: center">I need to:</div>
<a href="prs.html"><button class="idxpgbutton"><font size="30px">🔍</font><br>Inspect Contribution</button></a>
<a href="guard.html"><button class="idxpgbutton"><font size="30px">🛡️</font><br>Monitor TC state</button></a>
<a href="comparison.html"><button class="idxpgbutton"><font size="30px">📉</font><br>See test progres</button></a>
diff --git a/ignite-tc-helper-web/src/main/webapp/prs.html b/ignite-tc-helper-web/src/main/webapp/prs.html
index 95bc579..2bce451 100644
--- a/ignite-tc-helper-web/src/main/webapp/prs.html
+++ b/ignite-tc-helper-web/src/main/webapp/prs.html
@@ -97,8 +97,15 @@
//"dom": '<"wrapper"flipt>',
columns: [
{
- "data": "prNumber",
- title: "PR Number"
+ "data": "prHtmlUrl",
+ title: "PR Number",
+ "render": function(data, type, row, meta){
+ if(type === 'display'){
+ data = "<a href='"+data+"'>"+row.prNumber+"</a>";
+ }
+
+ return data;
+ }
}
, {
"data": "prTitle",