From 320a149f7640d31f4fb7c4ee8eee81124cd6c588 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 12 Nov 2025 15:27:01 +0000
Subject: [PATCH] Refine Changes for the experimental Run UI (#11277)

---
 .../hudson/model/AbstractBuild/changes.jelly  | 26 ++++++++------
 .../hudson/model/AbstractBuild/tasks.jelly    |  1 -
 .../jenkins/run/ChangesTab/widget.jelly       | 17 +++------
 .../jenkins/scm/RunWithSCM/changesets.jelly   | 36 ++++++++++---------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
index b36192f305..90b6149d12 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/changes.jelly
@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-  Displays the console output
--->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
   <j:new className="jenkins.run.ChangesTab" var="it">
@@ -32,19 +29,26 @@ THE SOFTWARE.
   </j:new>
 
   <l:run-subpage>
-    <l:app-bar title="${it.displayName}" headingLevel="h2" />
+    <l:app-bar title="${it.displayName}">
+      <l:details-bar it="${it.object}" />
+    </l:app-bar>
 
-    <j:set var="it" value="${it.object}" />
+    <j:set var="changeSets" value="${it.object.changeSets}" />
 
     <j:choose>
-      <j:when test="${it.hasChangeSetComputed()}">
-        <st:include page="index.jelly" it="${it.changeSet}" />
-      </j:when>
-      <j:when test="${it.building}">
-        ${%Not yet determined}
+      <j:when test="${!empty(changeSets)}">
+        <div class="jenkins-card">
+          <div class="jenkins-card__content">
+            <j:forEach var="changeSet" items="${changeSets}">
+              <st:include page="index.jelly" it="${changeSet}" />
+            </j:forEach>
+          </div>
+        </div>
       </j:when>
       <j:otherwise>
-        ${%Failed to determine} (<a href="${h.getConsoleUrl(it)}">${%log}</a>)
+        <l:notice icon="${it.iconFileName}" title="${%Failed to determine}">
+          <a href="${h.getConsoleUrl(it.object)}">${%log}</a>
+        </l:notice>
       </j:otherwise>
     </j:choose>
   </l:run-subpage>
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly b/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
index 34843a879e..7da049edb0 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
@@ -29,7 +29,6 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:p="/lib/hudson/project">
   <j:choose>
     <j:when test="${newBuildPage}">
-      <l:task href="${buildUrl.baseUrl}/changes" icon="symbol-changes" title="${%Changes}"/>
       <j:choose>
         <j:when test="${h.hasPermission(it,it.UPDATE)}">
           <l:task icon="symbol-edit-note" href="${buildUrl.baseUrl}/configure" title="${%Edit Build Information}"/>
diff --git a/core/src/main/resources/jenkins/run/ChangesTab/widget.jelly b/core/src/main/resources/jenkins/run/ChangesTab/widget.jelly
index f9bfb1c0fa..e82c144473 100644
--- a/core/src/main/resources/jenkins/run/ChangesTab/widget.jelly
+++ b/core/src/main/resources/jenkins/run/ChangesTab/widget.jelly
@@ -24,17 +24,10 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
-  <l:card title="${%Changes}" expandable="changes">
-    <j:choose>
-      <j:when test="${it.hasChangeSetComputed()}">
-        <st:include page="index.jelly" it="${it.changeSet}" />
-      </j:when>
-      <j:when test="${it.building}">
-        ${%Not yet determined}
-      </j:when>
-      <j:otherwise>
-        ${%Failed to determine} (<a href="${h.getConsoleUrl(it)}">${%log}</a>)
-      </j:otherwise>
-    </j:choose>
+  <l:card title="${it.displayName}" expandable="${it.urlName}">
+    <j:set var="changeSets" value="${it.object.changeSets}" />
+    <j:forEach var="changeSet" items="${changeSets}">
+      <st:include it="${changeSet}" page="digest.jelly" />
+    </j:forEach>
   </l:card>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly b/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
index b4141013c4..efc324bb4c 100644
--- a/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
+++ b/core/src/main/resources/jenkins/scm/RunWithSCM/changesets.jelly
@@ -23,20 +23,24 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson">
-  <j:set var="changeSets" value="${it.changeSets}"/>
-  <table>
-    <t:summary icon="symbol-changes">
-      <j:choose>
-        <j:when test="${!changeSets.isEmpty()}">
-          <j:forEach var="changeSet" items="${changeSets}">
-            <st:include it="${changeSet}" page="digest.jelly"/>
-          </j:forEach>
-        </j:when>
-        <j:otherwise>
-          <st:include class="hudson.scm.EmptyChangeLogSet" page="digest.jelly" />
-        </j:otherwise>
-      </j:choose>
-    </t:summary>
-  </table>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:t="/lib/hudson" xmlns:l="/lib/layout">
+  <l:userExperimentalFlag var="newBuildPage" flagClassName="jenkins.model.experimentalflags.NewBuildPageUserExperimentalFlag" />
+
+  <j:if test="${!newBuildPage}">
+    <j:set var="changeSets" value="${it.changeSets}"/>
+    <table>
+      <t:summary icon="symbol-changes">
+        <j:choose>
+          <j:when test="${!changeSets.isEmpty()}">
+            <j:forEach var="changeSet" items="${changeSets}">
+              <st:include it="${changeSet}" page="digest.jelly"/>
+            </j:forEach>
+          </j:when>
+          <j:otherwise>
+            <st:include class="hudson.scm.EmptyChangeLogSet" page="digest.jelly" />
+          </j:otherwise>
+        </j:choose>
+      </t:summary>
+    </table>
+  </j:if>
 </j:jelly>