Added template function to construct entire data structure on the backend

Author: acirep

static/pkg_info.js

@@ -6,7 +6,7 @@ $(document).ready(function() {
     $("a[name=build-stages]").each(function() {
       var text = $(this).text();
       var id = text + ".log";
-      var statusCode = urlData[id].statusCode;
+      var statusCode = urlData[id].StatusCode;
       if (statusCode == 404) {
         $(this).addClass("disabled");
       }
@@ -16,10 +16,10 @@ $(document).ready(function() {
       e.preventDefault();
       var text = $(this).text();
       var id = text + ".log";
-      var statusCode = urlData[id].statusCode;
-      var url = new String(urlData[id].url);
+      var statusCode = urlData[id].StatusCode;
+      var url = new String(urlData[id].URL);
       var displayURL = url.length > 90 ? url.substring(0, 40) + " ... " + url.substring(url.length-40, url.length): url;
-      var displayData = urlData[id].data === "" ? "No data available" : urlData[id].data;
+      var displayData = urlData[id].Data === "" ? "No data available" : urlData[id].Data;
 
       // Add shortcut unicode character to the displayURL
       displayURL = displayURL + " ⇗"; // Unicode character for link
@@ -35,9 +35,9 @@ $(document).ready(function() {
         activeLogName = text;
       }
 
-      $("#logFrame").text(urlData[id].error || displayData);
+      $("#logFrame").text(urlData[id].Error || displayData);
       $("#logContainer").show();
-      $("#original-logfile").attr("href", urlData[id].url);
+      $("#original-logfile").attr("href", urlData[id].URL);
       $("#original-logfile").html(displayURL);
     });
 

templates/pkg_info.html

@@ -33,22 +33,8 @@
       {{if eq .Res.BuildStatus 2}}
         <dt>Build Logs</dt>
         <script>
-          // Create JavaScript object with URLData
-          var urlData = {
-            {{range .URLData}}
-            {{.ID}}:
-            {
-              id: {{.ID}},
-              url: {{.URL}},
-              statusCode: {{.StatusCode}},
-              {{if .Error}}
-              error: {{.Error}},
-              {{else}}
-              data: {{.Data}},
-              {{end}}
-            },
-            {{end}}
-          };
+          // URLData is used by pkg_info.js to load the logs
+          var urlData = {{.URLDataJSON}};
         </script>
         <dd>
           <div class="btn-group btn-group-sm">

templates/templates.go

@@ -23,6 +23,7 @@ package templates
 import (
 	"context"
 	"embed"
+	"encoding/json"
 	"fmt"
 	"html/template"
 	"io"
@@ -142,6 +143,16 @@ func BulkBuildInfo(w io.Writer, b *ddao.Build) {
 	t.ExecuteTemplate(w, "bulk_build_info.html", b)
 }
 
+// marshalToJSON marshals the given data to a JSON string that can be used in JavaScript.
+// Returns a template.JS value to prevent HTML escaping of the JSON.
+func marshalToJSON(data interface{}) (template.JS, error) {
+	jsonBytes, err := json.Marshal(data)
+	if err != nil {
+		return "", err
+	}
+	return template.JS(jsonBytes), nil
+}
+
 func PkgInfo(w io.Writer, res ddao.GetSingleResultRow) {
 	// Define what to fetch - these represent the stages of the build process
 	// and are used to fetch the corresponding log files.
@@ -215,18 +226,32 @@ func PkgInfo(w io.Writer, res ddao.GetSingleResultRow) {
 	// Wait for all requests to complete
 	wg.Wait()
 
+	// Create a map of URL results for JSON marshalling
+	urlDataMap := make(map[string]URLRequestResult)
+	for _, result := range results {
+		urlDataMap[result.ID] = result
+	}
+
+	// Marshal URL data to JSON
+	jsonData, err := marshalToJSON(urlDataMap)
+	if err != nil {
+		log.Errorf(ctx, "templates.PkgInfo: Error marshalling URL data: %v", err)
+	}
+
 	// Create the structure to pass to the template
 	s := struct {
-		Res     *ddao.GetSingleResultRow
-		URLData []URLRequestResult
+		Res         *ddao.GetSingleResultRow
+		URLData     []URLRequestResult
+		URLDataJSON template.JS
 		bp
 	}{
-		Res:     &res,
-		URLData: results,
+		Res:         &res,
+		URLData:     results,
+		URLDataJSON: jsonData,
 	}
 
 	// Execute the template
-	err := t.ExecuteTemplate(w, "pkg_info.html", s)
+	err = t.ExecuteTemplate(w, "pkg_info.html", s)
 	if err != nil {
 		log.Errorf(ctx, "templates.PkgInfo: %v", err)
 	}