From 159fc133c826dee2831b7957e0ab56ba19f80aa0 Mon Sep 17 00:00:00 2001
From: niralmaruda <85137760+niralmaruda@users.noreply.github.com>
Date: Sun, 27 Aug 2023 23:56:14 +0530
Subject: [PATCH 1/2] Fixes JENKINS-71794

Layout change of "Build Executor Status" as mentioned in bug JENKINS-71794.
---
 .../PlaceholderExecutable/executorCell.jelly        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
index 0d090b51..24b9942d 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
@@ -32,18 +32,13 @@
             <j:choose>
                 <j:when test="${rAuth != null}">
                     <a href="${rootURL}/${r.parent.url}"><l:breakable value="${r.parent.fullDisplayName}"/></a>
-                    <t:buildProgressBar build="${it}" executor="${executor}"/>
                 </j:when>
                 <j:otherwise>
                     <span>${%Unknown Pipeline node step}</span>
                 </j:otherwise>
             </j:choose>
         </div>
-    </td>
-    <td class="pane">
-        <j:if test="${rAuth != null}">
-            <a href="${rootURL}/${r.url}" class="model-link inside"><l:breakable value="${r.displayName}"/></a>
-            <st:nbsp/>
+        <div>
             <j:set var="label" value="${it.parent.enclosingLabel}"/>
             <j:choose>
                 <j:when test="${label != null}">
@@ -53,6 +48,12 @@
                     ${%part}
                 </j:otherwise>
             </j:choose>
+        </div>
+    </td>
+    <td class="pane">
+        <j:if test="${rAuth != null}">
+            <a href="${rootURL}/${r.url}" class="model-link inside"><l:breakable value="${r.displayName}"/></a>
+            <t:buildProgressBar build="${it}" executor="${executor}"/>
         </j:if>
     </td>
 </j:jelly>

From 76e810d608117c26a43f89002c1f6a0373a96404 Mon Sep 17 00:00:00 2001
From: niralmaruda <85137760+niralmaruda@users.noreply.github.com>
Date: Wed, 20 Sep 2023 15:51:59 +0530
Subject: [PATCH 2/2] Added conditional statement for Authorized user

Added conditional statement to show label only if the user is Authorized and label != null.
---
 .../PlaceholderTask/PlaceholderExecutable/executorCell.jelly    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
index 24b9942d..b3831719 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution/PlaceholderTask/PlaceholderExecutable/executorCell.jelly
@@ -41,7 +41,7 @@
         <div>
             <j:set var="label" value="${it.parent.enclosingLabel}"/>
             <j:choose>
-                <j:when test="${label != null}">
+                <j:when test="${rAuth != null and label != null}">
                     <l:breakable value="(${label})"/>
                 </j:when>
                 <j:otherwise>