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 2019/08/14 16:14:18 UTC
[ignite-teamcity-bot] branch master updated: Board: Fixed UI error
for screen display: error is not hidden;
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new a203849 Board: Fixed UI error for screen display: error is not hidden;
a203849 is described below
commit a2038491f3cfa3cbb1f2af7460da9d51c8c3b01c
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Aug 14 19:13:57 2019 +0300
Board: Fixed UI error for screen display: error is not hidden;
PRs, Current: too often update from server made less frequent
---
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
ignite-tc-helper-web/src/main/webapp/board/index.html | 2 +-
ignite-tc-helper-web/src/main/webapp/current.html | 4 ++--
ignite-tc-helper-web/src/main/webapp/pr.html | 4 ++--
.../java/org/apache/ignite/tcbot/engine/defect/DefectCompacted.java | 4 ++++
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 86cc2ed..2f2bb49 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190813";
+ public static final String VERSION = "20190814";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/main/webapp/board/index.html b/ignite-tc-helper-web/src/main/webapp/board/index.html
index 4f8774b..ff74043 100644
--- a/ignite-tc-helper-web/src/main/webapp/board/index.html
+++ b/ignite-tc-helper-web/src/main/webapp/board/index.html
@@ -102,7 +102,7 @@
$.ajax({
url: curFailuresUrl,
success: function (result) {
- if (!silent) $("#loadStatus").html("");
+ $("#loadStatus").html("");
showData(result);
g_shownDataHashCodeHex = isDefinedAndFilled(result.hashCodeHex) ? result.hashCodeHex : "";
diff --git a/ignite-tc-helper-web/src/main/webapp/current.html b/ignite-tc-helper-web/src/main/webapp/current.html
index c475284..53fdb66 100644
--- a/ignite-tc-helper-web/src/main/webapp/current.html
+++ b/ignite-tc-helper-web/src/main/webapp/current.html
@@ -223,7 +223,7 @@ function checkForUpdate() {
if (!g_checkForUpdateSched) {
g_checkForUpdateSched = true;
- setTimeout(checkForUpdate, 10000);
+ setTimeout(checkForUpdate, 60000);
}
$("#loadStatus").html("");
@@ -253,7 +253,7 @@ function loadData() {
if (!g_checkForUpdateSched) {
g_checkForUpdateSched = true;
- setTimeout(checkForUpdate, 10000);
+ setTimeout(checkForUpdate, 20000);
}
},
error: showErrInLoadStatus
diff --git a/ignite-tc-helper-web/src/main/webapp/pr.html b/ignite-tc-helper-web/src/main/webapp/pr.html
index dab893e..5e535cd 100644
--- a/ignite-tc-helper-web/src/main/webapp/pr.html
+++ b/ignite-tc-helper-web/src/main/webapp/pr.html
@@ -138,7 +138,7 @@ function checkForUpdate() {
if (!g_checkForUpdateSched) {
g_checkForUpdateSched = true;
- setTimeout(checkForUpdate, 10000);
+ setTimeout(checkForUpdate, 60000);
}
$("#loadStatus").html("");
@@ -168,7 +168,7 @@ function checkForUpdate() {
if (!g_checkForUpdateSched) {
g_checkForUpdateSched = true;
- setTimeout(checkForUpdate, 10000);
+ setTimeout(checkForUpdate, 20000);
}
},
error: showErrInLoadStatus
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectCompacted.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectCompacted.java
index c9cf35b..f4e9cd4 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectCompacted.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectCompacted.java
@@ -43,6 +43,9 @@ public class DefectCompacted {
/** Resolved by username id : Compactor ID of user login (principal ID). */
private int resolvedByUsernameId = -1;
+ /** Resolved timestamp. */
+ private long resolvedTs = -1;
+
/** Commits hashes involved. */
private List<CommitCompacted> commits = new ArrayList<>();
@@ -165,5 +168,6 @@ public class DefectCompacted {
public void resolvedByUsernameId(int stringId) {
this.resolvedByUsernameId = stringId;
+ this.resolvedTs = System.currentTimeMillis();
}
}