Merge branch 'master' into new-header

Author: janfaracik

bom/pom.xml

@@ -71,7 +71,7 @@ THE SOFTWARE.
         <!-- https://docs.spring.io/spring-security/reference/6.3/getting-spring-security.html#getting-maven-no-boot -->
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-bom</artifactId>
-        <version>6.4.3</version>
+        <version>6.4.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -144,7 +144,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.16.0</version>
+        <version>5.17.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.sezpoz</groupId>

core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly

@@ -40,14 +40,13 @@ THE SOFTWARE.
   <j:set var="initialDescription" value="${request2.getParameter('description')}" defaultValue="${it.description}"/>
   <l:ajax>
     <form action="${submissionUrl}" method="post">
-      <table>
-        <f:entry help="${app.markupFormatter.helpUrl}">
-          <f:textarea name="description" value="${initialDescription}"
-                      codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
-        </f:entry>
-      </table>
-      <div align="right">
+      <f:entry help="${app.markupFormatter.helpUrl}">
+        <f:textarea name="description" value="${initialDescription}"
+                    codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
+      </f:entry>
+      <div class="jenkins-buttons-row jenkins-buttons-row--equal-width">
         <f:submit value="${%Save}" />
+        <button type="button" class="jenkins-button description-cancel-button">${%Cancel}</button>
       </div>
     </form>
   </l:ajax>

core/src/main/resources/lib/hudson/editable-description.js

@@ -1,8 +1,8 @@
 /* global replaceDescription */
 (function () {
   document.addEventListener("DOMContentLoaded", function () {
-    let descriptionLink = document.querySelector("#description-link");
-    let description = document.getElementById("description");
+    const descriptionLink = document.querySelector("#description-link");
+    const description = document.getElementById("description");
     if (description != null) {
       descriptionLink.classList.remove("jenkins-hidden");
       descriptionLink.addEventListener("click", function (e) {
@@ -14,4 +14,25 @@
       });
     }
   });
+
+  Behaviour.specify(
+    ".description-cancel-button",
+    "description-cancel-button",
+    0,
+    function (b) {
+      b.onclick = function () {
+        const descriptionLink = document.getElementById("description-link");
+        const descriptionContent = document.getElementById(
+          "description-content",
+        );
+        const descriptionEditForm = document.getElementById(
+          "description-edit-form",
+        );
+        descriptionEditForm.innerHTML = "";
+        descriptionEditForm.classList.add("jenkins-hidden");
+        descriptionContent.classList.remove("jenkins-hidden");
+        descriptionLink.classList.remove("jenkins-hidden");
+      };
+    },
+  );
 })();

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

@@ -48,12 +48,12 @@ THE SOFTWARE.
   <j:set var="hideDescriptionButton" value="${hideButton}" defaultValue="false"/>
 
   <div id="description" class="jenkins-!-margin-bottom-${hideButton?'3':'1'}">
-    <div>
+    <div id="description-content">
       <j:out value="${actualDescription!=null ? app.markupFormatter.translate(actualDescription) : ''}" />
     </div>
-
+    <div id="description-edit-form" class="jenkins-hidden"/>
     <j:if test="${!hideDescriptionButton}">
-      <div class="jenkins-buttons-row jenkins-buttons-row--invert">
+      <div class="jenkins-buttons-row jenkins-buttons-row--invert description-edit-button">
         <t:editDescriptionButton permission="${permission}" description="${actualDescription}" submissionUrl="${submissionUrl}"/>
       </div>
     </j:if>

pom.xml

@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3291.vb_131b_dc231fa_</remoting.version>
+    <remoting.version>3299.v0d0d06908537</remoting.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>

test/pom.xml

@@ -123,7 +123,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1363.v03f731255494</version>
+        <version>1366.vf1fb_e1a_f6b_22</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -242,7 +242,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-auth</artifactId>
-      <version>3.2.4</version>
+      <version>3.2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

war/pom.xml

@@ -156,6 +156,7 @@ THE SOFTWARE.
                     <exclude>org.jenkins-ci:crypto-util</exclude>
                     <exclude>org.jenkins-ci.main:cli</exclude>
                     <exclude>org.jenkins-ci.main:jenkins-core</exclude>
+                    <exclude>org.jenkins-ci.main:remoting</exclude>
                     <exclude>org.jenkins-ci.main:websocket-jetty12-ee9</exclude>
                     <exclude>org.jenkins-ci.main:websocket-spi</exclude>
                     <exclude>org.jenkins-ci:memory-monitor</exclude>
@@ -288,7 +289,7 @@ THE SOFTWARE.
                   <!-- detached after 1.535 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-auth</artifactId>
-                  <version>3.2.4</version>
+                  <version>3.2.5</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -323,7 +324,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1363.v03f731255494</version>
+                  <version>1366.vf1fb_e1a_f6b_22</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

war/src/main/webapp/scripts/hudson-behavior.js

@@ -1874,12 +1874,10 @@ function xor(a, b) {
 // used by editableDescription.jelly to replace the description field with a form
 // eslint-disable-next-line no-unused-vars
 function replaceDescription(initialDescription, submissionUrl) {
-  var d = document.getElementById("description");
-  let button = d.firstElementChild.nextElementSibling;
-  if (button !== null) {
-    d.firstElementChild.nextElementSibling.innerHTML =
-      "<div class='jenkins-spinner'></div>";
-  }
+  const descriptionContent = document.getElementById("description-content");
+  const descriptionEditForm = document.getElementById("description-edit-form");
+  descriptionEditForm.innerHTML = "<div class='jenkins-spinner'></div>";
+  descriptionContent.classList.add("jenkins-hidden");
   let parameters = {};
   if (initialDescription !== null && initialDescription !== "") {
     parameters["description"] = initialDescription;
@@ -1895,10 +1893,11 @@ function replaceDescription(initialDescription, submissionUrl) {
     body: objectToUrlFormEncoded(parameters),
   }).then((rsp) => {
     rsp.text().then((responseText) => {
-      d.innerHTML = responseText;
+      descriptionEditForm.innerHTML = responseText;
+      descriptionEditForm.classList.remove("jenkins-hidden");
       evalInnerHtmlScripts(responseText, function () {
-        Behaviour.applySubtree(d);
-        d.getElementsByTagName("TEXTAREA")[0].focus();
+        Behaviour.applySubtree(descriptionEditForm);
+        descriptionEditForm.getElementsByTagName("TEXTAREA")[0].focus();
       });
       layoutUpdateCallback.call();
       return false;