More

janfaracik · Feb 28, 2024 · bb2b9a4 · bb2b9a4
1 parent d53da8c
commit bb2b9a4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -115,7 +115,7 @@ THE SOFTWARE.
             <j:if test="${isDistributedBuildEnabled}">
               <th>${%Agent}</th>
             </j:if>
-            <th>${%overflow}</th>
+            <th></th>
           </tr>
           <tbody></tbody>
         </thead>

diff --git a/war/src/main/js/components/dropdowns/jumplists.js b/war/src/main/js/components/dropdowns/jumplists.js
@@ -31,7 +31,7 @@ function generateJumplistAccessors() {
  */
 function generateDropdowns() {
   behaviorShim.specify(
-    "li.children, #menuSelector, .jenkins-menu-dropdown-chevron",
+    "li.children, #menuSelector, .overflowTing, .jenkins-menu-dropdown-chevron",
     "-dropdown-",
     1000,
     (element) =>

diff --git a/war/src/main/js/pages/project/builds/index.js b/war/src/main/js/pages/project/builds/index.js
@@ -27,49 +27,48 @@ window.buildTimeTrend_displayBuilds = function (data) {
   console.log(data);
 
   data.forEach((item) => {
+    let distributedBuildColumn = ``;
+
+    if (isDistributedBuildsEnabled) {
+      var buildInfo;
+      var buildInfoStr = xmlEscape(item.builtOnStr || "");
+      if (item.builtOn) {
+        buildInfo = document.createElement("a");
+        buildInfo.href = rootURL + "/computer/" + item.builtOn;
+        buildInfo.classList.add("model-link");
+        buildInfo.innerText = buildInfoStr;
+      } else {
+        buildInfo = buildInfoStr;
+      }
+      const td = document.createElement("td");
+      if (buildInfo instanceof Node) {
+        td.appendChild(buildInfo);
+      } else {
+        td.innerText = buildInfo;
+      }
+      distributedBuildColumn = td.innerHTML;
+    }
+
     const tableRow = createElementFromHtml(`<tr>
-<td data="${item.iconColorOrdinal}"><a href="${item.consoleUrl}">${generateSVGIcon(item.iconName)}</a></td>
-<td class="model-link iamlink" data="${item.number}"><a href="${item.number}/">${xmlEscape(item.displayName)}</a></td>
+<td class="jenkins-table__cell--tight jenkins-table__icon" data="${item.iconColorOrdinal}"><div class="jenkins-table__cell__button-wrapper"><a href="${item.consoleUrl}">${generateSVGIcon(item.iconName)}</a></div></td>
+<td data="${item.number}"><a class="iamlink" href="${item.number}/">${xmlEscape(item.displayName)}</a></td>
 <td data="${item.duration}">${xmlEscape(item.durationString)}</td>
-<td>${item}</td>
-<td><button class="jenkins-button">...</button></td>
+${distributedBuildColumn}
+<td><button data-href="${item.number}/" class="jenkins-button jenkins-button--tertiary overflowTing"><div class="jenkins-overflow-button__ellipsis">
+          <span></span>
+          <span></span>
+         <span></span>
+        </div></button></td>
 </tr>`);
 
     p.append(tableRow);
     behaviorShim.applySubtree(tableRow);
   });
 
-  //   tr.appendChild(td);
-  //   if (isDistributedBuildsEnabled) {
-  //     var buildInfo = null;
-  //     var buildInfoStr = escapeHTML(e.builtOnStr || "");
-  //     if (e.builtOn) {
-  //       buildInfo = document.createElement("a");
-  //       buildInfo.href = rootURL + "/computer/" + e.builtOn;
-  //       buildInfo.classList.add("model-link");
-  //       buildInfo.innerText = buildInfoStr;
-  //     } else {
-  //       buildInfo = buildInfoStr;
-  //     }
-  //     td = document.createElement("td");
-  //     if (buildInfo instanceof Node) {
-  //       td.appendChild(buildInfo);
-  //     } else {
-  //       td.innerText = buildInfo;
-  //     }
-  //     tr.appendChild(td);
-  //   }
-  //   p.appendChild(tr);
-  //   Behaviour.applySubtree(tr);
-  // }
-  // ts_refresh(p);
-
+  ts_refresh(p);
   generateSearchResults();
 };
 
-/**
- * Generate SVG Icon
- */
 function generateSVGIcon(iconName) {
   const icons = document.querySelector("#jenkins-build-status-icons");