From 7410a593b30d635010c6344a812889074e68ac98 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Tue, 13 Oct 2015 21:47:47 +0200 Subject: [PATCH 1/3] [FIX JENKINS-30899] Do not rely on Run.queueId for builds widget --- core/src/main/java/jenkins/widgets/HistoryPageEntry.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java index 97451f93b7..8a1078ef5f 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java @@ -59,14 +59,7 @@ public class HistoryPageEntry { return ((Queue.Item) entry).getId(); } else if (entry instanceof Run) { Run run = (Run) entry; - long queueId = run.getQueueId(); - if (queueId == Run.QUEUE_ID_UNKNOWN) { - // Backward compatibility. This is a run from before the Queue.Item IDs - // were mapped onto their resulting Run instance. - return (Integer.MIN_VALUE + run.getNumber()); - } else { - return queueId; - } + return (Integer.MIN_VALUE + run.getNumber()); } else { return Run.QUEUE_ID_UNKNOWN; } From fe44f3eef04cd6fddbccb9d8c88755c8d0fb5801 Mon Sep 17 00:00:00 2001 From: tfennelly Date: Thu, 15 Oct 2015 09:35:02 +0100 Subject: [PATCH 2/3] Fixed build history pagination/search issues Fix HistoryPageFileTest tests Fix int parsing in JavaScript Fix some JS glitches --- .../jenkins/widgets/HistoryPageEntry.java | 5 ++- .../jenkins/widgets/HistoryPageFilter.java | 16 ++++--- .../widgets/HistoryPageFilterTest.java | 43 +++++++++++-------- .../main/webapp/scripts/hudson-behavior.js | 18 +++++--- 4 files changed, 48 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java index 8a1078ef5f..b3aeaecedb 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageEntry.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageEntry.java @@ -59,7 +59,10 @@ public class HistoryPageEntry { return ((Queue.Item) entry).getId(); } else if (entry instanceof Run) { Run run = (Run) entry; - return (Integer.MIN_VALUE + run.getNumber()); + return (Long.MIN_VALUE + run.getNumber()); + } else if (entry instanceof Number) { + // Used for testing purposes because of JENKINS-30899 and JENKINS-30909 + return (Long.MIN_VALUE + ((Number) entry).longValue()); } else { return Run.QUEUE_ID_UNKNOWN; } diff --git a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java index b86e4f53e7..6101916958 100644 --- a/core/src/main/java/jenkins/widgets/HistoryPageFilter.java +++ b/core/src/main/java/jenkins/widgets/HistoryPageFilter.java @@ -227,18 +227,20 @@ public class HistoryPageFilter { } private void addQueueItem(Queue.Item item) { - updateNewestOldest(item.getId()); - queueItems.add(new HistoryPageEntry(item)); + HistoryPageEntry entry = new HistoryPageEntry(item); + queueItems.add(entry); + updateNewestOldest(entry.getEntryId()); } private void addRun(Run run) { - updateNewestOldest(run.getQueueId()); - runs.add(new HistoryPageEntry(run)); + HistoryPageEntry entry = new HistoryPageEntry(run); + runs.add(entry); + updateNewestOldest(entry.getEntryId()); } - private void updateNewestOldest(long queueId) { - newestOnPage = Math.max(newestOnPage, queueId); - oldestOnPage = Math.min(oldestOnPage, queueId); + private void updateNewestOldest(long entryId) { + newestOnPage = Math.max(newestOnPage, entryId); + oldestOnPage = Math.min(oldestOnPage, entryId); } private boolean add(T entry) { diff --git a/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java b/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java index 61d89f9da3..239a606bd5 100644 --- a/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java +++ b/core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java @@ -70,7 +70,7 @@ public class HistoryPageFilterTest { itemList.addAll(newQueueItems(3, 4)); // want to make sure the list items are ordered by id in descending order - Assert.assertEquals(1, HistoryPageEntry.getEntryId(itemList.get(0))); + Assert.assertEquals(HistoryPageEntry.getEntryId(1), HistoryPageEntry.getEntryId(itemList.get(0))); historyPageFilter.add(itemList); Assert.assertEquals(4, HistoryPageEntry.getEntryId(itemList.get(0))); @@ -82,9 +82,9 @@ public class HistoryPageFilterTest { Assert.assertEquals(4, historyPageFilter.queueItems.get(0).getEntryId()); Assert.assertEquals(4, historyPageFilter.newestOnPage); Assert.assertEquals(3, historyPageFilter.queueItems.get(1).getEntryId()); - Assert.assertEquals(2, historyPageFilter.runs.get(0).getEntryId()); - Assert.assertEquals(1, historyPageFilter.runs.get(1).getEntryId()); - Assert.assertEquals(1, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(2), historyPageFilter.runs.get(0).getEntryId()); + Assert.assertEquals(HistoryPageEntry.getEntryId(1), historyPageFilter.runs.get(1).getEntryId()); + Assert.assertEquals(HistoryPageEntry.getEntryId(1), historyPageFilter.oldestOnPage); } /** @@ -107,7 +107,7 @@ public class HistoryPageFilterTest { Assert.assertEquals(12, historyPageFilter.queueItems.get(0).getEntryId()); Assert.assertEquals(12, historyPageFilter.newestOnPage); - Assert.assertEquals(10, historyPageFilter.runs.get(0).getEntryId()); + Assert.assertEquals(HistoryPageEntry.getEntryId(10), historyPageFilter.runs.get(0).getEntryId()); } /** @@ -126,8 +126,8 @@ public class HistoryPageFilterTest { Assert.assertEquals(true, historyPageFilter.hasDownPage); Assert.assertEquals(5, historyPageFilter.runs.size()); - Assert.assertEquals(10, historyPageFilter.newestOnPage); - Assert.assertEquals(6, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(10), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(6), historyPageFilter.oldestOnPage); } /** @@ -165,8 +165,8 @@ public class HistoryPageFilterTest { // Should only be 3 runs on the page (oldest 3) Assert.assertEquals(3, historyPageFilter.runs.size()); - Assert.assertEquals(3, historyPageFilter.newestOnPage); - Assert.assertEquals(1, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(3), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(1), historyPageFilter.oldestOnPage); } /** @@ -184,8 +184,8 @@ public class HistoryPageFilterTest { Assert.assertEquals(true, historyPageFilter.hasDownPage); Assert.assertEquals(5, historyPageFilter.runs.size()); - Assert.assertEquals(7, historyPageFilter.newestOnPage); - Assert.assertEquals(3, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(7), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(3), historyPageFilter.oldestOnPage); } /** @@ -220,8 +220,8 @@ public class HistoryPageFilterTest { Assert.assertEquals(false, historyPageFilter.hasDownPage); Assert.assertEquals(5, historyPageFilter.runs.size()); - Assert.assertEquals(5, historyPageFilter.newestOnPage); - Assert.assertEquals(1, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(5), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(1), historyPageFilter.oldestOnPage); } /** @@ -239,8 +239,8 @@ public class HistoryPageFilterTest { Assert.assertEquals(true, historyPageFilter.hasDownPage); Assert.assertEquals(5, historyPageFilter.runs.size()); - Assert.assertEquals(8, historyPageFilter.newestOnPage); - Assert.assertEquals(4, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(8), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(4), historyPageFilter.oldestOnPage); } /** @@ -260,8 +260,8 @@ public class HistoryPageFilterTest { Assert.assertEquals(true, historyPageFilter.hasDownPage); Assert.assertEquals(5, historyPageFilter.runs.size()); - Assert.assertEquals(10, historyPageFilter.newestOnPage); - Assert.assertEquals(6, historyPageFilter.oldestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(10), historyPageFilter.newestOnPage); + Assert.assertEquals(HistoryPageEntry.getEntryId(6), historyPageFilter.oldestOnPage); } private List newQueueItems(long startId, long endId) { @@ -283,9 +283,9 @@ public class HistoryPageFilterTest { private HistoryPageFilter newPage(int maxEntries, Long newerThan, Long olderThan) { HistoryPageFilter pageFilter = new HistoryPageFilter(maxEntries); if (newerThan != null) { - pageFilter.setNewerThan(newerThan); + pageFilter.setNewerThan(HistoryPageEntry.getEntryId(newerThan)); } else if (olderThan != null) { - pageFilter.setOlderThan(olderThan); + pageFilter.setOlderThan(HistoryPageEntry.getEntryId(olderThan)); } return pageFilter; } @@ -318,5 +318,10 @@ public class HistoryPageFilterTest { public long getQueueId() { return queueId; } + + @Override + public int getNumber() { + return (int) queueId; + } } } diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 62e4884099..04aa378231 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1897,6 +1897,7 @@ function updateBuildHistory(ajaxUrl,nBuild) { } } + var updateBuildsRefreshInterval = 5000; function updateBuilds() { if(isPageVisible()){ if (bh.headers == null) { @@ -1947,13 +1948,12 @@ function updateBuildHistory(ajaxUrl,nBuild) { createRefreshTimeout(); } }); - } else { + } else { // Reschedule again createRefreshTimeout(); } } - var updateBuildsRefreshInterval = 5000; var buildRefreshTimeout; function createRefreshTimeout() { cancelRefreshTimeout(); @@ -1968,7 +1968,6 @@ function updateBuildHistory(ajaxUrl,nBuild) { createRefreshTimeout(); checkAllRowCellOverflows(); - window.setTimeout(updateBuilds, updateBuildsRefreshInterval); onBuildHistoryChange(function() { checkAllRowCellOverflows(); @@ -2005,10 +2004,10 @@ function updateBuildHistory(ajaxUrl,nBuild) { return buildHistoryPage.getAttribute('page-has-down') === 'true'; } function getNewestEntryId() { - return parseInt(buildHistoryPage.getAttribute('page-entry-newest')); + return buildHistoryPage.getAttribute('page-entry-newest'); } function getOldestEntryId() { - return parseInt(buildHistoryPage.getAttribute('page-entry-oldest')); + return buildHistoryPage.getAttribute('page-entry-oldest'); } function updatePageParams(dataTable) { buildHistoryPage.setAttribute('page-has-up', dataTable.getAttribute('page-has-up')); @@ -2106,8 +2105,13 @@ function updateBuildHistory(ajaxUrl,nBuild) { loadPage({'newer-than': getNewestEntryId()}); }); pageDown.observe('click', function() { - cancelRefreshTimeout(); - loadPage({'older-than': getOldestEntryId()}); + if (hasPageDown()) { + cancelRefreshTimeout(); + loadPage({'older-than': getOldestEntryId()}); + } else { + // wrap back around to the top + loadPage(); + } }); togglePageUpDown(); From e55788028745beb22677422bbd5cc245c7d3fd45 Mon Sep 17 00:00:00 2001 From: tfennelly Date: Mon, 12 Oct 2015 14:28:54 +0100 Subject: [PATCH 3/3] Fix Build History icons --- war/images/go-down.svg | 519 +++++++++++++++++ war/images/go-top.svg | 523 ++++++++++++++++++ war/images/go-up.svg | 513 +++++++++++++++++ war/src/main/webapp/css/style.css | 2 +- war/src/main/webapp/images/16x16/bullseye.png | Bin 2615 -> 0 bytes war/src/main/webapp/images/16x16/go_down.png | Bin 567 -> 406 bytes war/src/main/webapp/images/16x16/go_top.png | Bin 0 -> 406 bytes war/src/main/webapp/images/16x16/go_up.png | Bin 537 -> 390 bytes 8 files changed, 1556 insertions(+), 1 deletion(-) create mode 100644 war/images/go-down.svg create mode 100644 war/images/go-top.svg create mode 100644 war/images/go-up.svg delete mode 100644 war/src/main/webapp/images/16x16/bullseye.png create mode 100644 war/src/main/webapp/images/16x16/go_top.png diff --git a/war/images/go-down.svg b/war/images/go-down.svg new file mode 100644 index 0000000000..2b768b69ba --- /dev/null +++ b/war/images/go-down.svg @@ -0,0 +1,519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Rodney Dawes + + + + + Jakub Steiner, Garrett LeSage + + + + + + + + + + + + + + + + + + + + + + + diff --git a/war/images/go-top.svg b/war/images/go-top.svg new file mode 100644 index 0000000000..bd3a6f2946 --- /dev/null +++ b/war/images/go-top.svg @@ -0,0 +1,523 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Rodney Dawes + + + + + Jakub Steiner, Garrett LeSage + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/war/images/go-up.svg b/war/images/go-up.svg new file mode 100644 index 0000000000..bb6dc8c268 --- /dev/null +++ b/war/images/go-up.svg @@ -0,0 +1,513 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Rodney Dawes + + + + + Jakub Steiner, Garrett LeSage + + + + + + + + + + + + + + + + + + + + + + + diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css index c7a449913e..dd3d1489ac 100644 --- a/war/src/main/webapp/css/style.css +++ b/war/src/main/webapp/css/style.css @@ -1041,7 +1041,7 @@ table.parameters > tbody:hover { } #buildHistoryPageNav .pageOne { - background-image: url(../images/16x16/bullseye.png); + background-image: url(../images/16x16/go_top.png); } #buildHistoryPageNav .pageUp { background-image: url(../images/16x16/go_up.png); diff --git a/war/src/main/webapp/images/16x16/bullseye.png b/war/src/main/webapp/images/16x16/bullseye.png deleted file mode 100644 index 442ccf26ddb0e67eb5082451737d70658916d99d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2615 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 P3;_mDS3j3^P6T<;; zmv5#$|NngU-BhuEu^urOW++(+2PF3XS-+~rpi7Cn)A+OY_Qay%9rj(fJRSDkJFN0u zcKc+89S_R_(;2iH6e=c~ce%~mmoO!N1IwCO2a5W94_uwjAjrJo&F6G(yLe}XXn~tj z7U?`f3>mj9b!96h&s2LKdmVGT^dqxkYQ?_0E39@@94lJgcbDUIa&vIv`v*IMIi_B^ zeOL7Rvll^X3SQgqo%U<`chhsPySdd%4u(hKv$xhUT={i$S>;?!27`55PCMJ|`Ly9u zn#^|L{h}te7B}yx_|x2>u z=YlX}jY;-GprB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt;kJMUJH< z8TmyFLHQ|psg(*YiRG!qd^hT3fzn?*T^vI!dhbr!=yk+F#P$4b&m_U^0$-Tld}0<; z%w*kvph3Y*Y~^R}X-=<9nv%9oC_8Ah_wTirTQ?XmN~WwSJ9+M0Uf7$Os|A+ddGaNG zJU;O$AoOZ$N6h|b}>XS_&Wz=*D^f#{crlyh@3SE z{jyU^9^d+YR-$;4%1K*;*tT=-I;TGw@*JL>c&+rVbD+p}GwY4b_s`i2RICfg tUfam8{kv@A?R}pVAKZ?6aG9;1!MZ<8ZxPQGZ=nAfJYD@<);T3K0RUEnr5gYM literal 0 HcmV?d00001 diff --git a/war/src/main/webapp/images/16x16/go_up.png b/war/src/main/webapp/images/16x16/go_up.png index 242309a6316b056a99302eebefb0540d064d3329..9dc1c738ee4ef29c112bb77f223d2911bea0cd3f 100644 GIT binary patch delta 362 zcmbQq(#Gu88Q|y6%O%Cdz`(%k>ERLtqy<2jgAGW^fBv5cq*#ibJVQ8upoSx*1IXtr z@Q5r13eN>$#u}6Cg_B<}YSastxJHyXmX>7X7cm6or{twpD!3$;rxx?wsFMZidgAHg z7-G?zoFI{LpvT`xMdgU2v$ONNUteGI7p_b^s46HZn7DM^x_xsdPMkP%?p)iFpP!zx zca}N2xU{U@wd?<{(%=*PTZ)^#HzBd-P0XHJ|rp{t|wrZta4c#>3HT3XuX@9*#H|M>m= zePjvqzdt{VpFKX_&uw90kpncW;vriycXL-)7pshn%*PW+_xIP&zkT!O%%*kIIAa?^ z40w1B%o4i4r?NQG!y|)r(~aBP^VdrSWl82TFq~_1=)Wk<4hm2PPgg&ebxsLQ09c}k A;{X5v literal 537 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877lwZyI{s(^d7K3vkw8)2 zYaq-xA-{4CNU*HHF&#*Q^)giWEM3OHz^Lfy;uvCa`s!pu|3d)+$LrHMx3IB44q`Wd z%#o-j;I@y0vorQDi%QFpt0&(de8--!xU+L{cVUKA!Yw=HdEA%6qeRX3Zom8g-QD;1 z?l%8V($c!x71CbJ9oBj8`Khue*DE@kS?v#mA zZwp^dp0up4+UIdQOX;$`PbWw;E5`9H-y6He$y3yC@9Z}dz8-tH!&B-*%Kos8O}C{| zeTB|EQ;FPcdgw2c=Uh+wH$u6GdD}GJ`28}QcEjTMb^Y~g?(6K_b}aMSQH(J!i(a})sl6BM_4e6JcdG1G8I@Zq? zc>Q^svFfd<-lweNhoV92SKxJHzuB$lLFB^RXvDF!10Ljzp{ z3tdBl5JOWd14Aog6Kw+{D+2@X&}dLRAT;FWr(~v8;?`ir@pvjwgCxj?;QX|b^2DN4 lhVt@qz0ADq;^f4FRK5J7^x5xhq=1STJYD@<);T3K0RW-7&}IMt