[JENKINS-74890] Extract inline JavaScript from LogParserWriter.java

yaroslavafenkin · hypery2k · commit 68467ae43d5a · 2024-11-22T15:09:14.000Z
diff --git a/src/main/java/hudson/plugins/logparser/LogParserConsts.java b/src/main/java/hudson/plugins/logparser/LogParserConsts.java
@@ -1,5 +1,6 @@
 package hudson.plugins.logparser;
 
+import hudson.Functions;
 import jenkins.model.Jenkins;
 
 import java.util.Arrays;
@@ -25,12 +26,12 @@ public class LogParserConsts {
 
     public static String getHtmlOpeningTags() {
         final String hudsonRoot = Jenkins.get().getRootUrl();
+        final String pluginResourceUrl = String.format("%s/plugin/log-parser/", Jenkins.RESOURCE_PATH).substring(1);
+
         return "<!DOCTYPE html>\n" + "<html>\n" + "\t<head>\n"
                 + "\t\t<title>log-parser plugin page</title>\n"
-                + "\t\t<link type=\"text/css\" rel=\"stylesheet\" href=\""
-                + hudsonRoot + "css/style.css\" />\n"
-                + "\t\t<link type=\"text/css\" rel=\"stylesheet\" href=\""
-                + hudsonRoot + "css/color.css\" />\n" + "\t</head>\n"
+                + "\t\t<script type=\"application/javascript\" src=\"" + hudsonRoot + pluginResourceUrl + "js/log-parser-behaviour.js\"></script>\n"
+                +"\t</head>\n"
                 + "\t<body>\n";
     }
 
diff --git a/src/main/java/hudson/plugins/logparser/LogParserWriter.java b/src/main/java/hudson/plugins/logparser/LogParserWriter.java
@@ -50,16 +50,9 @@ public static void writeReferenceHtml(final String buildRefPath,
             final HashMap<String, String> linkFiles,
             final List<String> extraTags) throws IOException {
 
-        final String refStart = "<script type=\"text/javascript\">\n"
-                + "\tfunction toggleList(list){\n"
-                + "\t\telement = document.getElementById(list).style;\n"
-                + "\t\telement.display == 'none' ? element.display='block' : element.display='none';\n"
-                + "\t}\n" + "</script>\n";
-
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(buildRefPath))) {
             // Hudson stylesheets
             writer.write(LogParserConsts.getHtmlOpeningTags());
-            writer.write(refStart); // toggle links javascript
             // Write Errors
             writeLinks(writer, LogParserConsts.ERROR, headerForSection,
                     statusCountPerSection, iconTable, linkListDisplay,
@@ -123,7 +116,7 @@ private static void writeLinks(final BufferedWriter writer,
 		
         final String linksStart = "<img src=\"" + hudsonRoot + iconLocation + statusIcon
                 + "\" style=\"margin: 2px;\" width=\"24\" alt=\"" + linkListDisplayStr + " Icon\" height=\"24\" />\n"
-                + "<a href=\"javascript:toggleList('" + linkListDisplayStr + "')\" target=\"_self\"><STRONG>"
+                + "<a class=\"lpp-toggle-list\" href=\"#\" data-display-category=\"" + linkListDisplayStr + "\"><STRONG>"
                 + linkListDisplayStr + " (" + linkListCount + ")</STRONG></a><br />\n"
                 + "<ul style=\"display: none;\" id=\""
                 + linkListDisplayStr + "\" >\n";
diff --git a/src/main/resources/hudson/plugins/logparser/LogParserAction/index.jelly b/src/main/resources/hudson/plugins/logparser/LogParserAction/index.jelly
@@ -4,7 +4,7 @@
   <j:set var="parseSucceeded" value="${it.result.failedToParseError == null}"/>
   <j:set var="parseFailed" value="${it.result.failedToParseError != null}"/>
   <j:set var="badParseRules" value="${it.result.badParsingRulesError != null}"/>
-  <l:layout>
+  <l:layout title="Parsed Console Output">
     <st:include it="${it.owner}" page="sidepanel.jelly"/>
     <l:main-panel>
       <j:if test="${parseSucceeded}">
diff --git a/src/main/webapp/js/log-parser-behaviour.js b/src/main/webapp/js/log-parser-behaviour.js
@@ -0,0 +1,11 @@
+window.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".lpp-toggle-list").forEach((toggle) => {
+        toggle.addEventListener("click", (event) => {
+            event.preventDefault();
+            const { displayCategory } = event.target.closest(".lpp-toggle-list").dataset;
+
+            element = document.getElementById(displayCategory).style;
+            element.display = element.display == 'none' ? 'block' : 'none';
+        })
+    });
+});
