Working build

janfaracik · Nov 25, 2023 · 7cda504 · 7cda504
1 parent abd994e
commit 7cda504
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 84 deletions.
diff --git a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
@@ -28,50 +28,47 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-  <!-- pending build -->
-  <j:set var="queuedItems" value="${it.queueItems}" />
-  <j:if test="${!queuedItems.isEmpty()}">
-    <j:forEach var="pageEntry" items="${queuedItems}" indexVar="i">
-      <j:set var="item" value="${pageEntry.entry}"/>
-      <j:set var="id" value="${h.generateId()}"/>
-      <tr class="build-row build-pending transitive single-line" id="${item.id}"  page-entry-id="${pageEntry.entryId}">
-	<td class="build-row-cell">
-	  <div class="pane build-name">
-	    <div class="build-icon">
-	      <l:icon class="icon-nobuilt icon-sm"/>
-	    </div>
-	    <!-- Don't use math unless needed, in case nextBuildNumber is not numeric -->
-	    <div class="display-name" title="${%Expected build number}">
-	    #${queuedItems.size()==1 ? it.widget.owner.nextBuildNumber
-	       : it.widget.owner.nextBuildNumber+queuedItems.size()-i-1}
-	    </div>
-	  </div>
-	  <div class="pane build-details indent-multiline">
-	    <j:set var="cause" value="${item.getCauseOfBlockage()}"/>
-	    <j:choose>
-	      <j:when test="${cause!=null}">
-		(${%pending}—<st:include it="${cause}" page="summary.jelly"/>)
-	      </j:when>
-	      <j:otherwise>
-		(${%pending})
-	      </j:otherwise>
-	    </j:choose>
-	  <j:if test="${!item.params.isEmpty()}">
-	    <div style="float:right;margin-right:10px;">
-	      <a href="#" tooltip="Build Parameters:${item.params}"><l:icon class="icon-notepad icon-sm" /></a>
-	    </div>
-	  </j:if>
-	  </div>
-	  <div class="pane build-controls">
-	    <div class="build-stop">
-	      <j:if test="${item.hasCancelPermission()}">
-		<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%cancel this build}"/>
-	      </j:if>
-	    </div>
-	  </div>
-	  <div class="left-bar"></div>
-	</td>
-      </tr>
-    </j:forEach>
-  </j:if>
+    <!-- pending build -->
+    <j:set var="queuedItems" value="${it.queueItems}"/>
+    <j:if test="${!queuedItems.isEmpty()}">
+        <span class="willow">Pending</span>
+        <j:forEach var="pageEntry" items="${queuedItems}">
+            <j:set var="item" value="${pageEntry.entry}"/>
+            <j:set var="id" value="${h.generateId()}"/>
+
+            <div class="ethan ethan--notinteractable" page-entry-id="${pageEntry.entryId}">
+                <div class="toprow">
+                    <div class="toprow__icon">
+                        <l:icon src="symbol-status-nobuilt"/>
+                    </div>
+                    <div class="toprow__link">
+                        <!-- Don't use math unless needed, in case nextBuildNumber is not numeric -->
+                        #${queuedItems.size() == 1 ? it.widget.owner.nextBuildNumber : it.widget.owner.nextBuildNumber+queuedItems.size()-i-1}
+                    </div>
+                    <j:if test="${build.building}">
+                        <div class="toprow__controls">
+                            <j:if test="${item.hasCancelPermission()}">
+                                <l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%cancel this build}"/>
+                            </j:if>
+                        </div>
+                    </j:if>
+                    <div class="toprow__badges">
+                        <j:if test="${!item.params.isEmpty()}">
+                            <div tooltip="Build Parameters: ${item.params}">
+                                <l:icon class="icon-notepad icon-sm"/>
+                            </div>
+                        </j:if>
+                    </div>
+                </div>
+                <div class="ethan__description">
+                    <j:set var="cause" value="${item.getCauseOfBlockage()}"/>
+                    <j:choose>
+                        <j:when test="${cause!=null}">
+                            <st:include it="${cause}" page="summary.jelly"/>
+                        </j:when>
+                    </j:choose>
+                </div>
+            </div>
+        </j:forEach>
+    </j:if>
 </j:jelly>
diff --git a/war/src/main/scss/components/_buttons.scss b/war/src/main/scss/components/_buttons.scss
@@ -375,6 +375,18 @@ $jenkins-split-button-border-radius: 0.2rem;
       gap: 0.5rem;
     }
   }
+
+  &--notinteractable {
+    cursor: default;
+
+    &::before, &::after {
+      display: none;
+    }
+
+    .ethan__description {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .itemsss {

diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss
@@ -106,41 +106,3 @@
 #executors th.pane {
   text-align: left;
 }
-
-/**
- * Build history
- */
-
-.jenkins-pane {
-  &__information {
-    text-align: center;
-    line-height: 80px;
-    background-color: var(--panel-header-bg-color);
-    margin-top: 10px;
-    font-weight: 600;
-    border-radius: var(--form-input-border-radius);
-  }
-
-  .build-row {
-    transition: opacity 0.2s ease;
-
-    &-cell {
-      padding: 4px 8px;
-    }
-  }
-
-  &--loading .build-row {
-    opacity: 0.5;
-  }
-}
-
-.jenkins-pane__header--build-history {
-  display: grid;
-  grid-template-columns: auto 1fr auto;
-  font-weight: bold !important;
-
-  .jenkins-table__cell--tight {
-    width: auto;
-    margin-right: 1rem;
-  }
-}