Skip to content

Commit

Permalink
More
Browse files Browse the repository at this point in the history
  • Loading branch information
@janfaracik
janfaracik committed Feb 28, 2024
1 parent 3baf616 commit d53da8c
Show file tree
Hide file tree
Showing 7 changed files with 318 additions and 233 deletions.
9 changes: 4 additions & 5 deletions core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ THE SOFTWARE.
<l:layout title="${%title(it.displayName)}" type="one-column">
<l:breadcrumb title="${%Builds}" />

<st:adjunct includes="hudson.model.Job.buildTimeTrend_resources" />

<l:main-panel>
<template id="jenkins-build-status-icons">
<l:icon src="symbol-status-blue" id="blue" />
Expand All @@ -57,6 +55,8 @@ THE SOFTWARE.
</div>
</div>

<script src="${resURL}/jsbundles/pages/project/builds.js" type="text/javascript" />

<!-- <j:set var="job" value="${it}" />-->
<!-- <j:forEach var="p" items="${it.permalinks}">-->
<!-- <st:include page="link.jelly" it="${p}" />-->
Expand Down Expand Up @@ -111,12 +111,11 @@ THE SOFTWARE.
<tr>
<th class="jenkins-table__cell--tight">S</th>
<th initialSortDir="up">${%Build}</th>
<th>${%Duration}</th>
<th>${%Completed}</th>
<th>${%Duration}</th>
<j:if test="${isDistributedBuildEnabled}">
<th>${%Agent}</th>
</j:if>
<th>${%overflow}</th>
<th>${%overflow}</th>
</tr>
<tbody></tbody>
</thead>
Expand Down
359 changes: 177 additions & 182 deletions core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
View file
Original file line number Diff line number Diff line change
@@ -1,182 +1,177 @@
/**
* Public method to be called by progressiveRendering's callback
*/
window.buildTimeTrend_displayBuilds = function (data) {
var p = document.getElementById("trend");
var isDistributedBuildsEnabled =
"true" === p.getAttribute("data-is-distributed-build-enabled");
var rootURL = document.head.getAttribute("data-rooturl");

for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = document.createElement("tr");

let td = document.createElement("td");
td.setAttribute("data", e.iconColorOrdinal);

let link = document.createElement("a");
link.classList.add("build-status-link");
link.href = e.consoleUrl;
td.appendChild(link);
let svg = generateSVGIcon(e.iconName);
link.appendChild(svg);
tr.appendChild(td);

td = document.createElement("td");
td.setAttribute("data", e.number);

link = document.createElement("a");
link.href = e.number + "/";
link.classList.add("model-link", "iamlink");
link.innerText = escapeHTML(e.displayName);

td.appendChild(link);
tr.appendChild(td);

td = document.createElement("td");
td.setAttribute("data", e.duration);

td.innerText = escapeHTML(e.durationString);

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", "inside");
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);

doThing()
};

/**
* Generate SVG Icon
*/
function generateSVGIcon(iconName) {
const icons = document.querySelector("#jenkins-build-status-icons");

return icons.content.querySelector(`#${iconName}`).cloneNode(true);
}

/**
* Public method to be called by progressiveRendering's callback
*/
window.displayBuilds = function (data) {
var rootUrl = document.head.getAttribute("data-rooturl");
var p = document.getElementById("projectStatus");
p.style.display = "";
for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = document.createElement("tr");

var td1 = document.createElement("td");
td1.setAttribute("data", e.iconColorOrdinal);
td1.classList.add("jenkins-table__cell--tight", "jenkins-table__icon");
var div1 = document.createElement("div");
div1.classList.add("jenkins-table__cell__button-wrapper");
var svg = generateSVGIcon(e.iconName);
div1.appendChild(svg);
td1.appendChild(div1);
tr.appendChild(td1);

var td2 = document.createElement("td");
var a1 = document.createElement("a");
a1.classList.add("jenkins-table__link", "model-link");
a1.href = rootUrl + "/" + e.parentUrl;
var span1 = document.createElement("span");
// TODO port Functions#breakableString to JavaScript and use .textContent rather than .innerHTML
span1.innerHTML = e.parentFullDisplayName;
a1.appendChild(span1);
td2.appendChild(a1);
var a2 = document.createElement("a");
a2.classList.add(
"jenkins-table__link",
"jenkins-table__badge",
"model-link",
"inside",
);
a2.href = rootUrl + "/" + e.url;
a2.textContent = e.displayName;
td2.appendChild(a2);
tr.appendChild(td2);

var td3 = document.createElement("td");
td3.setAttribute("data", e.timestampString2);
td3.textContent = e.timestampString;
tr.appendChild(td3);

var td4 = document.createElement("td");
if (e.buildStatusSummaryWorse) {
td4.style.color = "var(--red)";
}
td4.textContent = e.buildStatusSummaryMessage;
tr.appendChild(td4);

var td5 = document.createElement("td");
td5.classList.add("jenkins-table__cell--tight");
var div2 = document.createElement("div");
div2.classList.add("jenkins-table__cell__button-wrapper");
var a3 = document.createElement("a");
a3.classList.add("jenkins-table__button");
a3.href = e.consoleUrl;
a3.innerHTML = p.dataset.consoleOutputIcon;
div2.appendChild(a3);
td5.appendChild(div2);
tr.appendChild(td5);

p.appendChild(tr);
Behaviour.applySubtree(tr);
}
ts_refresh(p);



};

function doThing() {
const searchBarInput = document.querySelector("#search-bar-builds");

console.log('light years')
console.log('light years')
console.log(document.querySelectorAll("tbody tr"))

console.log(Array.from(document.querySelectorAll("tbody tr"))
.map((item) => ({
url: item.querySelector(".iamlink").href,
icon: item.querySelector(
"svg",
).outerHTML,
label: item.querySelector(".iamlink").textContent,
})))

searchBarInput.suggestions = function () {
return Array.from(document.querySelectorAll("tbody tr"))
.map((item) => ({
url: item.querySelector(".iamlink").href,
icon: item.querySelector(
"svg",
).outerHTML,
label: item.querySelector(".iamlink").textContent,
}));
};

Behaviour.applySubtree(searchBarInput, true)
}

// /**
// * Public method to be called by progressiveRendering's callback
// */
// window.buildTimeTrend_displayBuilds = function (data) {
// var p = document.getElementById("trend");
// var isDistributedBuildsEnabled =
// "true" === p.getAttribute("data-is-distributed-build-enabled");
// var rootURL = document.head.getAttribute("data-rooturl");
//
// for (var x = 0; data.length > x; x++) {
// var e = data[x];
// var tr = document.createElement("tr");
//
// let td = document.createElement("td");
// td.setAttribute("data", e.iconColorOrdinal);
//
// let link = document.createElement("a");
// link.classList.add("build-status-link");
// link.href = e.consoleUrl;
// td.appendChild(link);
// let svg = generateSVGIcon(e.iconName);
// link.appendChild(svg);
// tr.appendChild(td);
//
// td = document.createElement("td");
// td.setAttribute("data", e.number);
//
// link = document.createElement("a");
// link.href = e.number + "/";
// link.classList.add("model-link", "iamlink");
// link.innerText = escapeHTML(e.displayName);
//
// td.appendChild(link);
// tr.appendChild(td);
//
// td = document.createElement("td");
// td.setAttribute("data", e.duration);
//
// td.innerText = escapeHTML(e.durationString);
//
// 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);
//
// doThing()
// };
//
// /**
// * Generate SVG Icon
// */
// function generateSVGIcon(iconName) {
// const icons = document.querySelector("#jenkins-build-status-icons");
//
// return icons.content.querySelector(`#${iconName}`).cloneNode(true);
// }
//
// /**
// * Public method to be called by progressiveRendering's callback
// */
// window.displayBuilds = function (data) {
// var rootUrl = document.head.getAttribute("data-rooturl");
// var p = document.getElementById("projectStatus");
// p.style.display = "";
// for (var x = 0; data.length > x; x++) {
// var e = data[x];
// var tr = document.createElement("tr");
//
// var td1 = document.createElement("td");
// td1.setAttribute("data", e.iconColorOrdinal);
// td1.classList.add("jenkins-table__cell--tight", "jenkins-table__icon");
// var div1 = document.createElement("div");
// div1.classList.add("jenkins-table__cell__button-wrapper");
// var svg = generateSVGIcon(e.iconName);
// div1.appendChild(svg);
// td1.appendChild(div1);
// tr.appendChild(td1);
//
// var td2 = document.createElement("td");
// var a1 = document.createElement("a");
// a1.classList.add("jenkins-table__link", "model-link");
// a1.href = rootUrl + "/" + e.parentUrl;
// var span1 = document.createElement("span");
// // TODO port Functions#breakableString to JavaScript and use .textContent rather than .innerHTML
// span1.innerHTML = e.parentFullDisplayName;
// a1.appendChild(span1);
// td2.appendChild(a1);
// var a2 = document.createElement("a");
// a2.classList.add(
// "jenkins-table__link",
// "jenkins-table__badge",
// "model-link",
// );
// a2.href = rootUrl + "/" + e.url;
// a2.textContent = e.displayName;
// td2.appendChild(a2);
// tr.appendChild(td2);
//
// var td3 = document.createElement("td");
// td3.setAttribute("data", e.timestampString2);
// td3.textContent = e.timestampString;
// tr.appendChild(td3);
//
// var td4 = document.createElement("td");
// if (e.buildStatusSummaryWorse) {
// td4.style.color = "var(--red)";
// }
// td4.textContent = e.buildStatusSummaryMessage;
// tr.appendChild(td4);
//
// var td5 = document.createElement("td");
// td5.classList.add("jenkins-table__cell--tight");
// var div2 = document.createElement("div");
// div2.classList.add("jenkins-table__cell__button-wrapper");
// var a3 = document.createElement("a");
// a3.classList.add("jenkins-table__button");
// a3.href = e.consoleUrl;
// a3.innerHTML = p.dataset.consoleOutputIcon;
// div2.appendChild(a3);
// td5.appendChild(div2);
// tr.appendChild(td5);
//
// p.appendChild(tr);
// Behaviour.applySubtree(tr);
// }
// ts_refresh(p);
//
//
//
// };
//
// function doThing() {
// const searchBarInput = document.querySelector("#search-bar-builds");
//
// console.log(Array.from(document.querySelectorAll("tbody tr"))
// .map((item) => ({
// url: item.querySelector(".iamlink").href,
// icon: item.querySelector(
// "svg",
// ).outerHTML,
// label: item.querySelector(".iamlink").textContent,
// })))
//
// searchBarInput.suggestions = function () {
// return Array.from(document.querySelectorAll("tbody tr"))
// .map((item) => ({
// url: item.querySelector(".iamlink").href,
// icon: item.querySelector(
// "svg",
// ).outerHTML,
// label: item.querySelector(".iamlink").textContent,
// }));
// };
//
// Behaviour.applySubtree(searchBarInput, true)
// }
//
Loading

0 comments on commit d53da8c

Please sign in to comment.