Merge branch 'improve-project-settings' into new-reorderable-list

janfaracik · Sep 18, 2024 · 667cf8f · 667cf8f
2 parents 029eeb7 + 6406b9b
commit 667cf8f
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 23 deletions.
diff --git a/core/src/main/resources/lib/form/descriptorList.jelly b/core/src/main/resources/lib/form/descriptorList.jelly
@@ -34,6 +34,9 @@ THE SOFTWARE.
       Sets the icon on the sidebar item for the section anchor link
       The icon isn't visible in the section itself
     </st:attribute>
+    <st:attribute name="description" since="TODO">
+      Optional attribute to set a description for the section
+    </st:attribute>
     <st:attribute name="descriptors" use="required">
       hudson.model.Descriptor collection whose configuration page is rendered.
     </st:attribute>
@@ -72,7 +75,7 @@ THE SOFTWARE.
   <j:set var="instances" value="${attrs.instances ?: instance[field] ?: descriptor['default'+h.capitalize(field)]}"/>
 
   <j:if test="${!empty(descriptors) or context['org.apache.commons.jelly.body']!=null}">
-    <f:section title="${attrs.title}" name="${attrs.field?:attrs.name}" icon="${attrs.icon}">
+    <f:section title="${attrs.title}" name="${attrs.field?:attrs.name}" icon="${attrs.icon}" description="${attrs.description}">
       <j:if test="${attrs.field!=null}">
         <div class="stapler-class-bag tr">
           <div>

diff --git a/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly b/core/src/main/resources/lib/hudson/project/config-buildWrappers.jelly
@@ -29,7 +29,8 @@ THE SOFTWARE.
 <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:p="/lib/hudson/project">
   <j:set var="wrappers" value="${h.getBuildWrapperDescriptors(it)}" />
   <j:if test="${!empty(wrappers)}">
-    <f:descriptorList title="${%Build Environment}"
+    <f:descriptorList title="${%Environment}"
+                      description="${%description}"
                       descriptors="${wrappers}"
                       instances="${it.buildWrappers}"
                       icon="symbol-environment" />

diff --git a/core/src/main/resources/lib/hudson/project/config-buildWrappers.properties b/core/src/main/resources/lib/hudson/project/config-buildWrappers.properties
@@ -0,0 +1 @@
+description=Configure settings and variables that define the context in which your build runs, like credentials, paths, and global parameters.
diff --git a/core/src/main/resources/lib/hudson/project/config-builders.jelly b/core/src/main/resources/lib/hudson/project/config-builders.jelly
@@ -27,12 +27,12 @@ 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:p="/lib/hudson/project">
-  <f:section title="${%Build Steps}" icon="symbol-build-steps">
-    <f:block>
-      <f:hetero-list name="builder" hasHeader="true"
-                     descriptors="${h.getBuilderDescriptors(it)}"
-                     items="${it.builders}"
-                     addCaption="${%Add build step}"/>
-    </f:block>
+  <f:section title="${%Build Steps}"
+             description="${%description}"
+             icon="symbol-build-steps">
+    <f:hetero-list name="builder" hasHeader="true"
+                   descriptors="${h.getBuilderDescriptors(it)}"
+                   items="${it.builders}"
+                   addCaption="${%Add build step}"/>
   </f:section>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/config-builders.properties b/core/src/main/resources/lib/hudson/project/config-builders.properties
@@ -0,0 +1 @@
+description=Automate your build process with ordered tasks like code compilation, testing, and deployment.
diff --git a/core/src/main/resources/lib/hudson/project/config-publishers2.jelly b/core/src/main/resources/lib/hudson/project/config-publishers2.jelly
@@ -27,15 +27,14 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-  <f:section title="${%Post-build Actions}" icon="symbol-post-build">
-    <f:block>
-      <f:hetero-list name="publisher" hasHeader="true"
-                     descriptors="${h.getPublisherDescriptors(it)}"
-                     items="${it.publishersList}"
-                     oneEach="true"
-                     menuAlign="bl-tl"
-                     honorOrder="true"
-                     addCaption="${%Add post-build action}"/>
-    </f:block>
+  <f:section title="${%Post-build Actions}" icon="symbol-post-build"
+             description="${%description}">
+    <f:hetero-list name="publisher" hasHeader="true"
+                   descriptors="${h.getPublisherDescriptors(it)}"
+                   items="${it.publishersList}"
+                   oneEach="true"
+                   menuAlign="bl-tl"
+                   honorOrder="true"
+                   addCaption="${%Add post-build action}"/>
   </f:section>
 </j:jelly>
diff --git a/core/src/main/resources/lib/hudson/project/config-publishers2.properties b/core/src/main/resources/lib/hudson/project/config-publishers2.properties
@@ -0,0 +1 @@
+description=Define what happens after a build completes, like sending notifications, archiving artifacts, or triggering other jobs.
diff --git a/core/src/main/resources/lib/hudson/project/config-scm.jelly b/core/src/main/resources/lib/hudson/project/config-scm.jelly
@@ -25,7 +25,9 @@ THE SOFTWARE.
 <!-- SCM config pane -->
 <?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">
-  <f:section title="${%Source Code Management}" icon="symbol-source-code-management">
+  <f:section title="${%Source Code Management}"
+             description="${%description}"
+             icon="symbol-source-code-management">
     <!-- Could use f:descriptorRadioList were it not for scm/scmd compatibility code; pending JENKINS-20959 would not help with performance -->
     <j:forEach var="descriptor" items="${h.getSCMDescriptors(instance)}" varStatus="loop">
       <j:set var="scmd" value="${descriptor}" /><!-- backward compatibility with <1.238 -->

diff --git a/core/src/main/resources/lib/hudson/project/config-scm.properties b/core/src/main/resources/lib/hudson/project/config-scm.properties
@@ -0,0 +1 @@
+description=Connect and manage your code repository to automatically pull the latest code for your builds.
diff --git a/core/src/main/resources/lib/hudson/project/config-trigger.jelly b/core/src/main/resources/lib/hudson/project/config-trigger.jelly
@@ -31,7 +31,8 @@ THE SOFTWARE.
   <j:invokeStatic var="triggers" className="hudson.triggers.Trigger" method="for_">
     <j:arg value="${it}" type="hudson.model.Item" />
   </j:invokeStatic>
-  <f:descriptorList title="${%Build Triggers}"
+  <f:descriptorList title="${%Triggers}"
+                    description="${%description}"
                     descriptors="${triggers}"
                     instances="${it.triggers}"
                     icon="symbol-trigger">

diff --git a/core/src/main/resources/lib/hudson/project/config-trigger.properties b/core/src/main/resources/lib/hudson/project/config-trigger.properties
@@ -0,0 +1 @@
+description=Set up automated actions that start your build based on specific events, like code changes or scheduled times.
diff --git a/war/src/main/js/section-to-sidebar-items.js b/war/src/main/js/section-to-sidebar-items.js
@@ -1,7 +1,7 @@
 import { createElementFromHtml, toId } from "./util/dom";
 
 const HEADER_SELECTOR =
-  ".config-table .jenkins-app-bar h2, .config-table > .jenkins-section > .jenkins-section__title";
+  ".config-table .jenkins-app-bar h2, .config-table > .jenkins-section > .jenkins-section__title, .config-table > section > .jenkins-section > .jenkins-section__title";
 const DEFAULT_ICON = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M262.29 192.31a64 64 0 1057.4 57.4 64.13 64.13 0 00-57.4-57.4zM416.39 256a154.34 154.34 0 01-1.53 20.79l45.21 35.46a10.81 10.81 0 012.45 13.75l-42.77 74a10.81 10.81 0 01-13.14 4.59l-44.9-18.08a16.11 16.11 0 00-15.17 1.75A164.48 164.48 0 01325 400.8a15.94 15.94 0 00-8.82 12.14l-6.73 47.89a11.08 11.08 0 01-10.68 9.17h-85.54a11.11 11.11 0 01-10.69-8.87l-6.72-47.82a16.07 16.07 0 00-9-12.22 155.3 155.3 0 01-21.46-12.57 16 16 0 00-15.11-1.71l-44.89 18.07a10.81 10.81 0 01-13.14-4.58l-42.77-74a10.8 10.8 0 012.45-13.75l38.21-30a16.05 16.05 0 006-14.08c-.36-4.17-.58-8.33-.58-12.5s.21-8.27.58-12.35a16 16 0 00-6.07-13.94l-38.19-30A10.81 10.81 0 0149.48 186l42.77-74a10.81 10.81 0 0113.14-4.59l44.9 18.08a16.11 16.11 0 0015.17-1.75A164.48 164.48 0 01187 111.2a15.94 15.94 0 008.82-12.14l6.73-47.89A11.08 11.08 0 01213.23 42h85.54a11.11 11.11 0 0110.69 8.87l6.72 47.82a16.07 16.07 0 009 12.22 155.3 155.3 0 0121.46 12.57 16 16 0 0015.11 1.71l44.89-18.07a10.81 10.81 0 0113.14 4.58l42.77 74a10.8 10.8 0 01-2.45 13.75l-38.21 30a16.05 16.05 0 00-6.05 14.08c.33 4.14.55 8.3.55 12.47z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>`;
 
 window.addEventListener("load", function () {

diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss
@@ -36,7 +36,7 @@
 
 .jenkins-section__description {
   // Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title`
-  margin: -0.5rem 0 1rem;
+  margin: -0.8125rem 0 1rem;
   color: var(--text-color-secondary);
   line-height: 1.66;
 }