Merge branch 'master' into revamp-dropdowns

janfaracik · Jan 14, 2024 · 1e22c34 · 1e22c34
2 parents 44981c2 + 48661db
commit 1e22c34
Show file tree

Hide file tree

Showing 21 changed files with 87 additions and 104 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx1100m
+-Xmx1400m
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <asm.version>9.6</asm.version>
-    <slf4jVersion>2.0.10</slf4jVersion>
+    <slf4jVersion>2.0.11</slf4jVersion>
     <stapler.version>1822.v120278426e1c</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>

diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -23,29 +23,32 @@ THE SOFTWARE.
 -->
 
 <?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" xmlns:i="jelly:fmt">
-      <td class="jenkins-table__cell--tight">
-          <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
-            <j:set var="id" value="${h.generateId()}"/>
-            <j:set var="href" value="${jobBaseUrl}${job.shortUrl}build?delay=0sec"/>
-            <div class="jenkins-table__cell__button-wrapper">
-              <j:choose>
-                <j:when test="${job.parameterized}">
-                  <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
-                </j:when>
-                <j:otherwise>
-                  <span class="build-button-column-icon-reference-holder" data-id="${id}" data-url="${href}" data-notification="${%Task_scheduled(it.taskNoun(job))}"/>
-                  <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
-                </j:otherwise>
-              </j:choose>
-              <j:set var="isQueued" value="${app.queue.contains(job)}"/>
-              <a id="${id}" tooltip="${title}" class="jenkins-table__button jenkins-!-build-color" href="${href}">
-                <span class="${isQueued ? 'pulse-animation': ''}">
-                  <l:icon src="symbol-play" />
-                </span>
-                <st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
-              </a>
-            </div>
-          </j:if>
-      </td>
+<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" xmlns:i="jelly:fmt" xmlns:x="jelly:xml">
+    <x:element name="${jenkins_mobile_show?'div':'td'}">
+        <j:if test="${!jenkins_mobile_show}">
+          <x:attribute name="class">jenkins-table__cell--tight</x:attribute>
+        </j:if>
+        <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
+          <j:set var="id" value="${h.generateId()}"/>
+          <j:set var="href" value="${jobBaseUrl}${job.shortUrl}build?delay=0sec"/>
+          <div class="jenkins-table__cell__button-wrapper">
+            <j:choose>
+              <j:when test="${job.parameterized}">
+                <j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
+              </j:when>
+              <j:otherwise>
+                <span class="build-button-column-icon-reference-holder" data-id="${id}" data-url="${href}" data-notification="${%Task_scheduled(it.taskNoun(job))}"/>
+                <j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
+              </j:otherwise>
+            </j:choose>
+            <j:set var="isQueued" value="${app.queue.contains(job)}"/>
+            <a id="${id}" tooltip="${title}" class="jenkins-table__button jenkins-!-build-color" href="${href}">
+              <span class="${isQueued ? 'pulse-animation': ''}">
+                <l:icon src="symbol-play" />
+              </span>
+              <st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
+            </a>
+          </div>
+        </j:if>
+    </x:element>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -88,6 +88,7 @@ THE SOFTWARE.
       </div>
 
       <div class="jenkins-jobs-list jenkins-mobile-show">
+        <j:set var="jenkins_mobile_show" value="${true}"/>
         <j:forEach var="job" items="${jobs}">
           <j:set var="relativeLinkToJob" value="${h.getRelativeLinkTo(job)}"/>
           <j:set var="jobBaseUrl" value="${relativeLinkToJob.substring(0, relativeLinkToJob.length() - job.shortUrl.length())}"/>
@@ -121,7 +122,7 @@ THE SOFTWARE.
               </div>
             </a>
             <div class="jenkins-jobs-list__item__actions">
-              <st:include page="column.jelly" it="${buildButtonColumn}" optional="true" />
+              <st:include page="column.jelly" it="${buildButtonColumn}" optional="true"/>
             </div>
           </div>
         </j:forEach>

diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:f="/lib/form">
-  <l:layout permission="${h.ADMINISTER}" title="${%scriptConsole}">
+  <l:layout permission="${app.ADMINISTER}" title="${%scriptConsole}">
     <st:include page="sidepanel.jelly" />
 
     <l:breadcrumb title="${%scriptConsole}"/>

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
@@ -6,7 +6,7 @@
         </breadcrumbs>
         <head>
             <![CDATA[
-                <script src="https://cdn.jsdelivr.net/npm/lit@3.1.0/polyfill-support.js"></script>
+                <script src="https://cdn.jsdelivr.net/npm/lit@3.1.1/polyfill-support.js"></script>
                 <script src="https://cdn.jsdelivr.net/npm/@webcomponents/webcomponentsjs@2.8.0/webcomponents-loader.js"></script>
                 <script data="jio" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components/+esm" type="module"></script>
                 <script data="jio" nomodule="" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components"></script>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.108</version>
+    <version>1.109</version>
     <relativePath />
   </parent>
 
@@ -73,7 +73,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.440</revision>
+    <revision>2.441</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- configuration for patch tracker plugin  -->
@@ -86,15 +86,11 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3203.v94ce994fdb_31</remoting.version>
+    <remoting.version>3206.vb_15dcf73f6a_9</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>4.13</remoting.minimum.supported.version>
 
-    <!-- TODO: Remove when parent pom is using this version or newer -->
-    <!-- https://github.com/jenkinsci/pom/pull/510 -->
-    <spotbugs-maven-plugin.version>4.8.2.0</spotbugs-maven-plugin.version>
     <spotbugs.effort>Max</spotbugs.effort>
-    <spotbugs.omitVisitors>FindReturnRef,ConstructorThrow</spotbugs.omitVisitors>
     <spotbugs.threshold>Medium</spotbugs.threshold>
 
     <access-modifier.version>1.33</access-modifier.version>

diff --git a/test/pom.xml b/test/pom.xml
@@ -105,7 +105,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1305.v487433146192</version>
+        <version>1313.v7a_6067dc7087</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -131,7 +131,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2140.ve736dc2b_b_d2c</version>
+      <version>2148.v80482520b_d2c</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly b/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
     <l:layout title="Usage of svgIcon">
         <l:main-panel>
             <div id="test-panel">
-                <l:svgIcon href="${resURL}/images/material-icons/svg-sprite-action-symbol.svg#ic_search_24px" tooltip="${it.tooltipContent}" />
+                <l:svgIcon href="${resURL}/images/svgs/go-up.svg#arrow" tooltip="${it.tooltipContent}" />
             </div>
         </l:main-panel>
     </l:layout>

diff --git a/war/package.json b/war/package.json
@@ -25,23 +25,23 @@
   "devDependencies": {
     "@babel/cli": "7.23.4",
     "@babel/core": "7.23.7",
-    "@babel/preset-env": "7.23.7",
+    "@babel/preset-env": "7.23.8",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
-    "css-loader": "6.8.1",
+    "css-loader": "6.9.0",
     "css-minimizer-webpack-plugin": "5.0.1",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.7.6",
-    "postcss": "8.4.32",
+    "postcss": "8.4.33",
     "postcss-loader": "7.3.4",
     "postcss-preset-env": "9.3.0",
     "postcss-scss": "4.0.9",
     "prettier": "3.1.1",
     "sass": "1.69.7",
     "sass-loader": "13.3.3",
-    "style-loader": "3.3.3",
+    "style-loader": "3.3.4",
     "stylelint": "16.1.0",
     "stylelint-checkstyle-reporter": "0.2.0",
     "stylelint-config-standard": "33.0.0",

diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js
@@ -334,7 +334,15 @@ $.when(getItems()).done(function (data) {
         if (!getFieldValidationStatus("name")) {
           activateValidationMessage("#itemname-required", ".add-item-name");
           setTimeout(function () {
-            $('input[name="name"][type="text"]', "#createItem").focus();
+            var parentName = $('input[name="from"]', "#createItem").val();
+            $.get("job/" + parentName + "/api/json?tree=name").done(
+              function (data) {
+                if (data.name === parentName) {
+                  //if "name" is invalid, but "from" is a valid job, then switch focus to "name"
+                  $('input[name="name"][type="text"]', "#createItem").focus();
+                }
+              },
+            );
           }, 400);
         } else {
           if (getFormValidationStatus()) {

diff --git a/war/src/main/webapp/images/material-icons/computer-24px.svg b/war/src/main/webapp/images/material-icons/computer-24px.svg
diff --git a/war/src/main/webapp/images/material-icons/edit.svg b/war/src/main/webapp/images/material-icons/edit.svg
diff --git a/war/src/main/webapp/images/material-icons/feed.svg b/war/src/main/webapp/images/material-icons/feed.svg
diff --git a/war/src/main/webapp/images/material-icons/rss_feed-24px.svg b/war/src/main/webapp/images/material-icons/rss_feed-24px.svg
diff --git a/war/src/main/webapp/images/material-icons/svg-sprite-action-symbol.svg b/war/src/main/webapp/images/material-icons/svg-sprite-action-symbol.svg