[JENKINS-60866] Advanced button, build health, confirmation link, URI…

… encoding monitor (#5515)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>

core/src/main/resources/jenkins/diagnostics/URICheckEncodingMonitor/adjunct.js

@@ -0,0 +1,10 @@
+Behaviour.specify('#URICheckEncodingMonitor-message', 'URICheckEncodingMonitor', 0, function(element) {
+    var url = element.getAttribute('data-url');
+    var params = {value : '\u57f7\u4e8b'};
+    var checkAjax = new Ajax.Updater(
+        'URICheckEncodingMonitor-message', url,
+        {
+            method: 'get', parameters: params
+        }
+    );
+});

core/src/main/resources/jenkins/diagnostics/URICheckEncodingMonitor/message.jelly

@@ -1,16 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
     <j:if test="${it.checkEnabled}">
-        <script>
-            var url="${rootURL}/${it.url}/checkURIEncoding";
-            var params = {value : '\u57f7\u4e8b'};
-            var checkAjax = new Ajax.Updater(
-                'message', url,
-                {
-                    method: 'get', parameters: params
-                }
-            );
-        </script>
-        <span id="message"></span>
+        <div id="URICheckEncodingMonitor-message" data-url="${rootURL}/${it.url}/checkURIEncoding"/>
+        <st:adjunct includes="jenkins.diagnostics.URICheckEncodingMonitor.adjunct"/>
     </j:if>
 </j:jelly>

core/src/main/resources/lib/form/advanced.jelly

@@ -57,16 +57,7 @@ THE SOFTWARE.
 	      <d:invokeBody/>
 	    </div></div>
             <j:if test="${!customizedFields.isEmpty()}">
-              <script>
-                  {
-                      var span = $$('${id}');
-                      if (span != null) {
-                          span.style.display = '';
-                      } else if (console &amp;&amp; console.log) {
-                          console.log('no element ${id} for ${customizedFields}');
-                      }
-                  }
-              </script>
+                <div class="advanced-customized-fields-info" data-id="${id}" data-customized-fields="${customizedFields}"/>
             </j:if>
 	</div>
 </j:jelly>

core/src/main/resources/lib/form/advanced/advanced.js

@@ -32,3 +32,14 @@ Behaviour.specify("INPUT.advanced-button", 'advanced', 0, function(e) {
         });
         e = null; // avoid memory leak
 });
+
+Behaviour.specify('.advanced-customized-fields-info', 'advanced', 0, function(element) {
+    var id = element.getAttribute('data-id');
+    var span = $(id)
+    if (span != null) {
+        span.style.display = '';
+    } else if (console && console.log) {
+        var customizedFields = element.getAttribute('data-customized-fields');
+        console.log('no element ' + id + ' for ' + customizedFields);
+    }
+});

core/src/main/resources/lib/form/validateButton.jelly

@@ -52,15 +52,15 @@ THE SOFTWARE.
   </st:documentation>
   <f:entry>
     <div style="float:right">
-      <input type="button" value="${title}" class="yui-button validate-button ${attrs.clazz}" 
+      <input type="button" value="${title}" class="yui-button validate-button ${attrs.clazz} Behaviour-validateButton"
              data-validate-button-descriptor-url="${descriptor.descriptorFullUrl}"
              data-validate-button-method="${method}"
-             data-validate-button-with="${with}"
-             onclick="safeValidateButton(this)" />
+             data-validate-button-with="${with}" />
     </div>
     <div style="display:none;">
       <img src="${imagesURL}/spinner.gif" /> ${attrs.progress}
     </div>
     <div><!-- this is where the error message goes --></div>
+    <st:adjunct includes="lib.form.validateButton.adjunct"/>
   </f:entry>
 </j:jelly>

core/src/main/resources/lib/form/validateButton/adjunct.js

@@ -0,0 +1,3 @@
+Behaviour.specify('.Behaviour-validateButton', 'Behaviour-validateButton', 0, function(element) {
+    element.onclick = function() { safeValidateButton(this); };
+});

core/src/main/resources/lib/hudson/buildHealth.jelly

@@ -38,9 +38,6 @@ THE SOFTWARE.
     <x:element name="${useTdElement!=null?'td':'div'}">
         <x:attribute name="data">${buildHealth.score}</x:attribute>
         <x:attribute name="class">healthReport</x:attribute>
-        <x:attribute name="onmouseover">this.className='healthReport hover';return true;
-        </x:attribute>
-        <x:attribute name="onmouseout">this.className='healthReport';return true;</x:attribute>
         <j:if test="${buildHealth!=null}">
             <j:if test="${iconSizeClass == null}">
               <j:choose>

core/src/main/resources/lib/layout/confirmationLink.jelly

@@ -41,21 +41,6 @@ THE SOFTWARE.
             A CSS class to use to style the link.
         </st:attribute>
     </st:documentation>
-    <j:set var="id" value="${h.generateId()}"/>
-    <a href="#" class="${class}" onclick="confirmPOST_${id}(${post ? 'true' : 'false'}, '${h.jsStringEscape(attrs.href)}', '${h.jsStringEscape(message)}')"><d:invokeBody/></a>
-    <script>
-        function confirmPOST_${id}(post, href, message) {
-            if (confirm(message)) {
-                var form = document.createElement('form');
-                form.setAttribute('method', post ? 'POST' : 'GET');
-                form.setAttribute('action', href);
-                if (post) {
-                    crumb.appendToForm(form);
-                }
-                document.body.appendChild(form);
-                form.submit();
-            }
-            return false;
-        }
-    </script>
+    <a href="#" class="${class} confirmation-link" data-post="${post}" data-url="${attrs.href}" data-message="${message}"><d:invokeBody/></a>
+    <st:adjunct includes="lib.layout.confirmationLink.adjunct "/>
 </j:jelly>

core/src/main/resources/lib/layout/confirmationLink/adjunct.js

@@ -0,0 +1,18 @@
+Behaviour.specify("A.confirmation-link", 'confirmation-link', 0, function (element) {
+    element.onclick = function(event) {
+        var post = element.getAttribute('data-post');
+        var href = element.getAttribute('data-url');
+        var message = element.getAttribute('data-message');
+        if (confirm(message)) {
+            var form = document.createElement('form');
+            form.setAttribute('method', (post === "true") ? 'POST' : 'GET');
+            form.setAttribute('action', href);
+            if (post) {
+                crumb.appendToForm(form);
+            }
+            document.body.appendChild(form);
+            form.submit();
+        }
+        return false;
+    };
+});

test/src/test/java/hudson/model/ManagementLinkTest.java

@@ -54,7 +54,7 @@ public void links() throws Exception {
 
         for (int i=0; ; i++) {
             HtmlPage page = wc.goTo("manage");
-            List<?> anchors = DomNodeUtil.selectNodes(page, "//div[contains(@class,'jenkins-section__item')]/a[not(@onclick)]");
+            List<?> anchors = DomNodeUtil.selectNodes(page, "//div[contains(@class,'jenkins-section__item')]/a[not(contains(@class,'confirmation-link'))]");
             assertTrue(anchors.size()>=8);
             if (i==anchors.size())  return; // done
 

test/src/test/java/lib/layout/ConfirmationLinkTest.java

@@ -87,9 +87,6 @@ private void checkRegularCasePost(TestRootAction testParams) throws Exception {
         testParams.paramPost = "true";
         assertMethodPostAfterClick();
 
-        testParams.paramPost = "TruE";
-        assertMethodPostAfterClick();
-
         testParams.paramPost = false;
         assertMethodGetAfterClick();