Merge pull request #308 from jenkinsci/clickable-chart

Open commit repository URL on click in trend chart

Author: uhafner

pom.xml

@@ -31,7 +31,7 @@
     <data-tables-api.version>1.10.25-3</data-tables-api.version>
     <jquery3-api.version>3.6.0-2</jquery3-api.version>
     <font-awesome-api.version>5.15.3-4</font-awesome-api.version>
-    <echarts-api.version>5.1.2-3</echarts-api.version>
+    <echarts-api.version>5.1.2-4</echarts-api.version>
     <bootstrap5-api.version>5.0.2-1</bootstrap5-api.version>
 
   </properties>

src/main/java/io/jenkins/plugins/forensics/miner/FileDetailsView.java

@@ -85,6 +85,20 @@ public LinesChartModel createChartModel() {
         return new FileChurnTrendChart().create(fileStatistics, decorator);
     }
 
+    /**
+     * Returns the repository URL for the specified commit.
+     *
+     * @param commit
+     *         the commit to get the URL for
+     *
+     * @return the repository URL
+     */
+    @JavaScriptMethod
+    @SuppressWarnings("unused") // Called by jelly view
+    public String getCommitUrl(final String commit) {
+        return decorator.getRawLink(commit);
+    }
+
     @JavaScriptMethod
     @SuppressWarnings("unused") // Called by jelly view
     @Override
@@ -182,6 +196,7 @@ public LinesChartModel create(final FileStatistics fileStatistics,
             LinesDataSet dataSet = createDataSetPerCommit(fileStatistics, decorator);
 
             LinesChartModel model = new LinesChartModel(dataSet);
+            model.setDomainAxisItemName("Commit");
             LineSeries added = new LineSeries(Messages.TrendChart_Churn_Legend_Added(), Palette.GREEN.getNormal(),
                     StackedMode.SEPARATE_LINES, FilledMode.FILLED);
             added.addAll(dataSet.getSeries(ADDED_KEY));

src/main/java/io/jenkins/plugins/forensics/util/CommitDecorator.java

@@ -1,5 +1,7 @@
 package io.jenkins.plugins.forensics.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 import hudson.scm.RepositoryBrowser;
 
 /**
@@ -21,12 +23,26 @@ public abstract class CommitDecorator {
     public abstract String asLink(String id);
 
     /**
-     * Renders the commit ID as a human readable text.
+     * Returns the raw link for the specified commit ID.
+     *
+     * @param id
+     *         the ID of the commit
+     *
+     * @return a raw link to the commit, e.g. https://github.com/jenkinsci/analysis-model/commit/9f5eb8b28e422d6249e6c29dc65173a59f2d9f6f
+     */
+    public String getRawLink(final String id) {
+        return StringUtils.defaultString(
+                StringUtils.substringBetween(asLink(id), "href=\"", "\""),
+                id);
+    }
+
+    /**
+     * Renders the commit ID as a human-readable text.
      *
      * @param id
      *         the ID of the commit
      *
-     * @return a commit ID as human readable text
+     * @return a commit ID as human-readable text
      */
     public String asText(final String id) {
         return id;

src/main/resources/io/jenkins/plugins/forensics/miner/FileDetailsView/index.jelly

@@ -36,10 +36,17 @@
 
     <script>
       {
-        const trendProxy = <st:bind value="${it}"/>;
-        trendProxy.getBuildTrendModel(function (lineModel) {
-              echartsJenkinsApi.renderConfigurableZoomableTrendChart('churn-trend-chart', lineModel.responseJSON);
-        });
+          const trendProxy = <st:bind value="${it}"/>;
+          trendProxy.getBuildTrendModel(function (lineModel) {
+              const openCommit = function (commit) {
+                  trendProxy.getCommitUrl(commit, function (commitUrl) {
+                      if (commitUrl.responseJSON.startsWith('http')) {
+                          window.location.assign(commitUrl.responseJSON);
+                      }
+                  });
+              };
+              echartsJenkinsApi.renderConfigurableZoomableTrendChart('churn-trend-chart', lineModel.responseJSON, null, openCommit);
+          });
       }
     </script>
   </bs:page>