From a1536b62ca5caecd6b11a67e2ed08610d73d2104 Mon Sep 17 00:00:00 2001
From: Aleksandr Gekht <aleks@aagproservices.com>
Date: Thu, 14 Dec 2017 09:05:55 +0000
Subject: [PATCH 1/4] Updates to allow column selection in the display

---
 pom.xml                                       |  2 +-
 .../PipelineAggregator.java                   | 50 ++++++++++++++++++-
 .../configure-entries.jelly                   | 17 +++++++
 .../PipelineAggregator/index.jelly            | 49 ++++++++++++------
 src/main/webapp/css/pipeline-aggregator.css   |  2 +
 src/main/webapp/js/pipeline-aggregator.js     | 18 +++++--
 6 files changed, 119 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index da59efd..291dbdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
    <groupId>com.paul8620.jenkins.plugins</groupId>
    <artifactId>pipeline-aggregator-view</artifactId>
-   <version>1.9-SNAPSHOT</version>
+   <version>1.9.1-SNAPSHOT</version>
    <packaging>hpi</packaging>
 
    <properties>
diff --git a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
index 2cb514d..a4124a6 100644
--- a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
+++ b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
@@ -47,6 +47,11 @@ public class PipelineAggregator extends View {
 
    private String filterRegex;
 
+   private boolean showCommitInfo;
+   private boolean showBuildNumber;
+   private boolean showBuildTime;
+   private boolean showBuildDuration;
+
    @DataBoundConstructor
    public PipelineAggregator(String name, String viewName) {
       super(name);
@@ -56,6 +61,11 @@ public PipelineAggregator(String name, String viewName) {
       this.useCondensedTables = false;
 	  this.onlyLastBuild = false;
       this.filterRegex = null;
+
+      this.showCommitInfo = true;
+      this.showBuildNumber = true;
+      this.showBuildTime = true;
+      this.showBuildDuration = true;
    }
 
    protected Object readResolve() {
@@ -83,6 +93,38 @@ public boolean isUseCondensedTables() {
       return useCondensedTables;
    }
 
+    public boolean isShowCommitInfo() {
+        return showCommitInfo;
+    }
+
+    public void setShowCommitInfo(boolean showCommitInfo) {
+        this.showCommitInfo = showCommitInfo;
+    }
+
+    public boolean isShowBuildNumber() {
+        return showBuildNumber;
+    }
+
+    public void setShowBuildNumber(boolean showBuildNumber) {
+        this.showBuildNumber = showBuildNumber;
+    }
+
+    public boolean isShowBuildTime() {
+        return showBuildTime;
+    }
+
+    public void setShowBuildTime(boolean showBuildTime) {
+        this.showBuildTime = showBuildTime;
+    }
+
+    public boolean isShowBuildDuration() {
+        return showBuildDuration;
+    }
+
+    public void setShowBuildDuration(boolean showBuildDuration) {
+        this.showBuildDuration = showBuildDuration;
+    }
+
 	public boolean isUseScrollingCommits() {
 		return useScrollingCommits;
 	}
@@ -114,7 +156,13 @@ protected void submit(StaplerRequest req) throws ServletException, IOException {
       this.buildHistorySize = json.getInt("buildHistorySize");
       this.useCondensedTables = json.getBoolean("useCondensedTables");
       this.useScrollingCommits = json.getBoolean("useScrollingCommits");
-		this.onlyLastBuild = json.getBoolean("onlyLastBuild");
+      this.onlyLastBuild = json.getBoolean("onlyLastBuild");
+
+      this.showCommitInfo = json.getBoolean("showCommitInfo");
+      this.showBuildNumber = json.getBoolean("showBuildNumber");
+      this.showBuildTime = json.getBoolean("showBuildTime");
+      this.showBuildDuration = json.getBoolean("showBuildDuration");
+
       if (json.get("useRegexFilter") != null) {
          String regexToTest = req.getParameter("filterRegex");
          try {
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
index 8e15bb3..ddd1a0d 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
@@ -17,6 +17,9 @@
         <f:entry title="${%Use condensed tables}">
             <f:checkbox name="useCondensedTables" field="useCondensedTables" />
         </f:entry>
+        <f:entry title="${%Hide build information}">
+            <f:checkbox name="hideBuildInfo" field="hideBuildInfo" />
+        </f:entry>
         <f:entry title="${%Use auto-rolling commits}">
             <f:checkbox name="useScrollingCommits" field="useScrollingCommits" />
         </f:entry>
@@ -24,4 +27,18 @@
             <f:checkbox name="onlyLastBuild" field="onlyLastBuild" />
         </f:entry>
     </f:section>
+    <f:section title="${%Field selection}">
+        <f:entry title="${%Show commit info}">
+            <f:checkbox name="showCommitInfo" field="showCommitInfo" />
+        </f:entry>
+        <f:entry title="${%Show build number}">
+            <f:checkbox name="showBuildNumber" field="showBuildNumber" />
+        </f:entry>
+        <f:entry title="${%Show build time}">
+            <f:checkbox name="showBuildTime" field="showBuildTime" />
+        </f:entry>
+        <f:entry title="${%Show build duration}">
+            <f:checkbox name="showBuildDuration" field="showBuildDuration" />
+        </f:entry>
+    </f:section>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
index 1ac46b0..b766edb 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
@@ -20,6 +20,24 @@
             </style>
         </head>
         <body class="height100perc">
+            <script type="text/javascript">
+                var jenkinsUrl = '${rootURL}';
+                var refreshInterval = 15*1000;
+                var nodeStatuses = [];
+                var buildHistorySize = ${it.buildHistorySize};
+                var useScrollingCommits= ${it.useScrollingCommits};
+                var onlyLastBuild= ${it.onlyLastBuild};
+                var showCommitInfo = ${it.showCommitInfo};
+                var showBuildNumber = ${it.showBuildNumber};
+                var showBuildTime = ${it.showBuildTime};
+                var showBuildDuration = ${it.showBuildDuration};
+                var rollingCommits = false;
+                function reload_info (interval) {
+                    reload_jenkins_build_history('#jenkinsBuildHistory', jenkinsUrl + '/${it.url}', buildHistorySize, useScrollingCommits, onlyLastBuild, showCommitInfo, showBuildNumber, showBuildTime, showBuildDuration);
+                    setTimeout(function(){ reload_info(interval); }, interval);
+                }
+            </script>
+
             <a href="${rootURL}/${it.url}configure" alt="Configure view">
                 <div class="abs-top-right">
                     <span class="glyphicon glyphicon-cog"></span>
@@ -33,8 +51,22 @@
                         <!-- VIEW_URL/api/json -->
                         <table id="jenkinsBuildHistory" class="table table-striped table-bordered ${it.tableStyle}">
                             <thead>
-                                <tr><th class="text-left">${%Job}</th><th>Stages</th><th>${%Commits}</th><th>${%Build}</th><th>${%Finished}</th><th>${%Duration
-                                }</th></tr>
+                                <tr><th class="text-left">${%Job}</th><th class="text-left">Stages</th>
+                                <script type="text/javascript">
+                                    if(showCommitInfo) {
+                                        document.write("<th>${%Commits}</th>");
+                                    }
+                                    if(showCommitInfo) {
+                                        document.write("<th>${%Build}</th>");
+                                    }
+                                    if(showBuildTime) {
+                                        document.write("<th>${%Finished}</th>");
+                                    }
+                                    if(showBuildDuration) {
+                                        document.write("<th>${%Duration}</th>");
+                                    }
+                                </script>
+                                </tr>
                             </thead>
                             <tbody></tbody>
                         </table>
@@ -45,18 +77,7 @@
             <script src="${rootURL}/plugin/pipeline-aggregator-view/lib/bootstrap.min.js"></script>
             <script src="${rootURL}/plugin/pipeline-aggregator-view/js/pipeline-aggregator.js"></script>
             <script type="text/javascript">
-                var jenkinsUrl = '${rootURL}';
-                var refreshInterval = 15*1000;
-                var nodeStatuses = [];
-                var buildHistorySize = ${it.buildHistorySize};
-                var useScrollingCommits= ${it.useScrollingCommits};
-                var onlyLastBuild= ${it.onlyLastBuild};
-                var rollingCommits = false;
-                function reload_info (interval) {
-                    reload_jenkins_build_history('#jenkinsBuildHistory', jenkinsUrl + '/${it.url}', buildHistorySize, useScrollingCommits, onlyLastBuild);
-                    setTimeout(function(){ reload_info(interval); }, interval);
-                }
-
+                var $$ = jQuery;
                 $$(document).ready(function(){
                     $$.ajaxSetup({ cache: false });
                     reload_info(refreshInterval);
diff --git a/src/main/webapp/css/pipeline-aggregator.css b/src/main/webapp/css/pipeline-aggregator.css
index 62b1c7d..2a810b7 100755
--- a/src/main/webapp/css/pipeline-aggregator.css
+++ b/src/main/webapp/css/pipeline-aggregator.css
@@ -31,6 +31,8 @@ a {
 .btn {
   font-size: 14px;
   background-color: transparent;
+  border-radius: 3px !important;
+  margin: 1px 1px 1px 0 !important;
 }
 
 .btn-success {
diff --git a/src/main/webapp/js/pipeline-aggregator.js b/src/main/webapp/js/pipeline-aggregator.js
index 8d12b61..c6d546a 100755
--- a/src/main/webapp/js/pipeline-aggregator.js
+++ b/src/main/webapp/js/pipeline-aggregator.js
@@ -30,7 +30,7 @@ function format_interval(iv) {
    return ivStr;
 }
 
-function reload_jenkins_build_history(tableSelector, viewUrl, buildHistorySize, useScrollingCommits, onlyLastBuild) {
+function reload_jenkins_build_history(tableSelector, viewUrl, buildHistorySize, useScrollingCommits, onlyLastBuild, showCommitInfo, showBuildNumber, showBuildTime, showBuildDuration) {
    $.getJSON(viewUrl + 'api/json', function (data) {
       // Remove all existing rows
       $(tableSelector + ' tbody').find('tr').remove();
@@ -98,11 +98,23 @@ function reload_jenkins_build_history(tableSelector, viewUrl, buildHistorySize,
             }
             stages += '</div>'
 
-            newRow = '<tr><td class="job-wrap text-left">' + bame + '</td><td class="text-left">' + stages + '</td><td>' + authors + '</td><td>' + val.number + '</td><td>' + format_date(dt) + '</td><td>' + format_interval(val.duration) + '</td></trcla>';
+            newRow = '<tr><td class="job-wrap text-left">' + bame + '</td><td class="text-left">' + stages + '</td>';
+            if(showCommitInfo) {
+                newRow += '<td>' + authors + '</td>';
+            }
+            if(showBuildNumber) {
+                newRow += '<td>' + val.number + '</td>';
+            }
+            if(showBuildTime) {
+                newRow += '<td>' + format_date(dt) + '</td>';
+            }
+            if(showBuildDuration) {
+                newRow += '<td>' + format_interval(val.duration) + '</td>';
+            }
+            newRow += '</tr>';
             $(tableSelector + ' tbody').append(newRow);
          });
 
       });
    });
 }
-

From ec85c15dab3729e554483c45556a647d767ccfd7 Mon Sep 17 00:00:00 2001
From: Aleksandr Gekht <aleks@aagproservices.com>
Date: Thu, 14 Dec 2017 09:22:36 +0000
Subject: [PATCH 2/4] Removed temporarily added fielid from the config page
 jelly

---
 .../PipelineAggregator/configure-entries.jelly                 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
index ddd1a0d..1bcb414 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
@@ -17,9 +17,6 @@
         <f:entry title="${%Use condensed tables}">
             <f:checkbox name="useCondensedTables" field="useCondensedTables" />
         </f:entry>
-        <f:entry title="${%Hide build information}">
-            <f:checkbox name="hideBuildInfo" field="hideBuildInfo" />
-        </f:entry>
         <f:entry title="${%Use auto-rolling commits}">
             <f:checkbox name="useScrollingCommits" field="useScrollingCommits" />
         </f:entry>

From bdc68b38cf41b09d488e4968bfdcc23471dfe2bb Mon Sep 17 00:00:00 2001
From: Aleksandr Gekht <aleks@aagproservices.com>
Date: Tue, 2 Jan 2018 10:17:25 +0000
Subject: [PATCH 3/4] Added refresh interval as configurable parameter

---
 .../pipelineaggregatorview/PipelineAggregator.java | 14 ++++++++++++++
 .../PipelineAggregator/configure-entries.jelly     |  3 +++
 .../PipelineAggregator/index.jelly                 |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
index a4124a6..7e3ec5b 100644
--- a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
+++ b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
@@ -39,6 +39,8 @@ public class PipelineAggregator extends View {
 
    private int buildHistorySize;
 
+   private int refreshInterval;
+
    private boolean useCondensedTables;
    
    private boolean onlyLastBuild;
@@ -58,6 +60,7 @@ public PipelineAggregator(String name, String viewName) {
       this.viewName = viewName;
       this.fontSize = 16;
       this.buildHistorySize = 16;
+      this.refreshInterval = 15;
       this.useCondensedTables = false;
 	  this.onlyLastBuild = false;
       this.filterRegex = null;
@@ -73,6 +76,8 @@ protected Object readResolve() {
          fontSize = 16;
       if (buildHistorySize == 0)
          buildHistorySize = 16;
+      if (refreshInterval == 0)
+         refreshInterval = 15;
       return this;
    }
 
@@ -149,11 +154,20 @@ public String getFilterRegex() {
       return filterRegex;
    }
 
+   public int getRefreshInterval() {
+      return refreshInterval;
+   }
+
+   public void setRefreshInterval(int refreshInterval) {
+      this.refreshInterval = refreshInterval;
+   }
+
    @Override
    protected void submit(StaplerRequest req) throws ServletException, IOException {
       JSONObject json = req.getSubmittedForm();
       this.fontSize = json.getInt("fontSize");
       this.buildHistorySize = json.getInt("buildHistorySize");
+      this.refreshInterval = json.getInt("refreshInterval");
       this.useCondensedTables = json.getBoolean("useCondensedTables");
       this.useScrollingCommits = json.getBoolean("useScrollingCommits");
       this.onlyLastBuild = json.getBoolean("onlyLastBuild");
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
index 1bcb414..4bc7a1b 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
@@ -14,6 +14,9 @@
         <f:entry title="${%Records in build history}">
             <f:number name="buildHistorySize" value="${it.buildHistorySize}" />
         </f:entry>
+        <f:entry title="${%Refresh interval}">
+            <f:number name="refreshInterval" value="${it.refreshInterval}" />
+        </f:entry>
         <f:entry title="${%Use condensed tables}">
             <f:checkbox name="useCondensedTables" field="useCondensedTables" />
         </f:entry>
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
index b766edb..e64ce90 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
@@ -22,7 +22,7 @@
         <body class="height100perc">
             <script type="text/javascript">
                 var jenkinsUrl = '${rootURL}';
-                var refreshInterval = 15*1000;
+                var refreshInterval = ${it.refreshInterval}*1000;
                 var nodeStatuses = [];
                 var buildHistorySize = ${it.buildHistorySize};
                 var useScrollingCommits= ${it.useScrollingCommits};

From d173db78697e68b0cc117316d03899973e82675d Mon Sep 17 00:00:00 2001
From: shchukax <shchukax@users.noreply.github.com>
Date: Thu, 13 Dec 2018 16:32:17 +0000
Subject: [PATCH 4/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7550b73..6d78b52 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ The View offers a simple functionality of showing latest pipeline build togheter
 From the view you can navigate back to the build number that was generated.
 
 
-![Fullscreen](./screenshots/AggregatedPipeline.png?raw=true =625x)
\ No newline at end of file
+![Fullscreen](./screenshots/AggregatedPipeline.png?raw=true&width=625x)