Merge pull request #348 from mathworks/issue_345

Issue 345

Author: nbhoski

src/main/java/com/mathworks/ci/BuildArtifactAction.java

@@ -43,7 +43,7 @@ public BuildArtifactAction(Run<?, ?> build, String actionID) {
     }
 
     public String getActionID(){
-        return this.actionID;
+        return (this.actionID == null) ? "" : this.actionID;
     }
 
     @CheckForNull
@@ -61,14 +61,19 @@ public String getDisplayName() {
     @CheckForNull
     @Override
     public String getUrlName() {
-        return "buildresults" + this.actionID ;
+        return (this.actionID == null) ? "buildresults" : "buildresults" + this.actionID ;
     }
 
     public List<BuildArtifactData> getBuildArtifact() throws ParseException, InterruptedException, IOException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
-
-        FilePath fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
-                BUILD_ARTIFACT_FILE + this.actionID + ".json"));
+        FilePath fl;
+        if(this.actionID == null){
+            fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
+                    BUILD_ARTIFACT_FILE + ".json"));
+        } else {
+            fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
+                    BUILD_ARTIFACT_FILE + this.actionID + ".json"));
+        }
         try (InputStreamReader reader = new InputStreamReader(new FileInputStream(new File(fl.toURI())), "UTF-8")) {
             Object obj = new JSONParser().parse(reader);
             JSONObject jo = (JSONObject) obj;
@@ -139,7 +144,14 @@ public void setOwner(Run owner) {
 
     private void setCounts() throws InterruptedException, ParseException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
-        FilePath fl = new FilePath(new File(build.getRootDir(), BUILD_ARTIFACT_FILE + this.actionID + ".json"));
+        FilePath fl;
+        if(this.actionID == null){
+            fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
+                    BUILD_ARTIFACT_FILE + ".json"));
+        } else {
+            fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
+                    BUILD_ARTIFACT_FILE + this.actionID + ".json"));
+        }
         try (InputStreamReader reader = new InputStreamReader(new FileInputStream(new File(fl.toURI())), "UTF-8")) {
             Object obj = new JSONParser().parse(reader);
             JSONObject jo = (JSONObject) obj;

src/main/resources/com/mathworks/ci/BuildArtifactAction/index.jelly

@@ -59,12 +59,22 @@
                 <j:forEach var="p" items="${it.buildArtifact}" varStatus="status">
                     <tr>
                         <td class="pane" align="left">
-                            <a href="../console#matlab-${p.taskName}-${it.actionID}">${p.taskName}</a>
+                            <j:if test="${it.actionID != ''}">
+                                <a href="../console#matlab-${p.taskName}-${it.actionID}">${p.taskName}</a>
+                            </j:if>
+                            <j:if test="${it.actionID == ''}">
+                                <a href="../console#matlab-${p.taskName}">${p.taskName}</a>
+                            </j:if>
                         </td>
                         <td class="pane" style="width:9em">
                             <span class="${pst.cssClass}">
                                 <j:if test="${p.taskFailed != false}">
-                                    <a href="../console#matlab-${p.taskName}-${it.actionID}"><font color="#EF2929"> FAILED </font> </a>
+                                   <j:if test="${it.actionID != ''}">
+                                       <a href="../console#matlab-${p.taskName}-${it.actionID}"><font color="#EF2929"> FAILED </font> </a>
+                                   </j:if>
+                                   <j:if test="${it.actionID == ''}">
+                                       <a href="../console#matlab-${p.taskName}"><font color="#EF2929"> FAILED </font> </a>
+                                   </j:if>
                                 </j:if>
                                 <j:if test="${p.taskFailed == false}">
                                     <j:if test="${p.taskSkipped == false}">

src/main/resources/com/mathworks/ci/BuildArtifactAction/summary.jelly

@@ -6,7 +6,7 @@
   xmlns:f="/lib/form"
   xmlns:i="jelly:fmt">
   <t:summary icon="document.png">
-    <p><a href="buildresults${it.actionID}">MATLAB Build Results</a></p>
+    <p><a href="${it.urlName}">MATLAB Build Results</a></p>
     <span class="${pst.cssClass}">
       <j:if test="${it.totalCount == 0}">
         <font color="#EF2929"><h5>Unable to generate a build artifact. </h5></font>