mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 14:53:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Adds support for log-line groups

Browse source 
Supports special rendering of `##[group]` and `##[endgroup]`.
This commit is contained in:
Mai-Lapyst 2024-04-20 07:02:58 +02:00
parent e4aa7bd511
commit ee2f71f71b
No known key found for this signature in database
GPG key ID: F88D929C09E239F8
1 changed files with 56 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
web_src/js/components/RepoActionView.vue
View file

@ -110,34 +110,6 @@ const sfc = {
}, },
methods: { methods: {
// get the active container element, either the `job-step-logs` or the `job-log-list` in the `job-log-group`
getLogsContainer(idx) {
const el = this.$refs.logs[idx];
return el._stepLogsActiveContainer ?? el;
},
// begin a log group
beginLogGroup(idx) {
const el = this.$refs.logs[idx];
const elJobLogGroup = document.createElement('div');
elJobLogGroup.classList.add('job-log-group');
const elJobLogGroupSummary = document.createElement('div');
elJobLogGroupSummary.classList.add('job-log-group-summary');
const elJobLogList = document.createElement('div');
elJobLogList.classList.add('job-log-list');
elJobLogGroup.append(elJobLogGroupSummary);
elJobLogGroup.append(elJobLogList);
el._stepLogsActiveContainer = elJobLogList;
},
// end a log group
endLogGroup(idx) {
const el = this.$refs.logs[idx];
el._stepLogsActiveContainer = null;
},
// show/hide the step logs for a step // show/hide the step logs for a step
toggleStepLogs(idx) { toggleStepLogs(idx) {
this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded;
@ -153,8 +125,18 @@ const sfc = {
approveRun() { approveRun() {
POST(`${this.run.link}/approve`); POST(`${this.run.link}/approve`);
}, },
// show/hide the step logs for a group
toggleGroupLogs(event) {
const line = event.target.parentElement;
const list = line.nextSibling;
if (event.newState === 'open') {
list.classList.remove('hidden');
} else {
list.classList.add('hidden');
}
},
createLogLine(line, startTime, stepIndex) { createLogLine(line, startTime, stepIndex, group) {
const div = document.createElement('div'); const div = document.createElement('div');
div.classList.add('job-log-line'); div.classList.add('job-log-line');
div.setAttribute('id', `jobstep-${stepIndex}-${line.index}`); div.setAttribute('id', `jobstep-${stepIndex}-${line.index}`);
@ -180,9 +162,19 @@ const sfc = {
logTimeSeconds.textContent = `${seconds}s`; logTimeSeconds.textContent = `${seconds}s`;
toggleElem(logTimeSeconds, this.timeVisible['log-time-seconds']); toggleElem(logTimeSeconds, this.timeVisible['log-time-seconds']);
const logMessage = document.createElement('span'); let logMessage = document.createElement('span');
logMessage.className = 'log-msg';
logMessage.innerHTML = renderAnsi(line.message); logMessage.innerHTML = renderAnsi(line.message);
if (group.isHeader) {
const details = document.createElement('details');
details.addEventListener('toggle', this.toggleGroupLogs);
const summary = document.createElement('summary');
summary.append(logMessage);
details.append(summary);
logMessage = details;
}
logMessage.className = 'log-msg';
logMessage.style.paddingLeft = `${group.depth}em`;
div.append(logTimeStamp); div.append(logTimeStamp);
div.append(logMessage); div.append(logMessage);
div.append(logTimeSeconds); div.append(logTimeSeconds);
@ -191,10 +183,38 @@ const sfc = {
}, },
appendLogs(stepIndex, logLines, startTime) { appendLogs(stepIndex, logLines, startTime) {
const groupStack = [];
const container = this.$refs.logs[stepIndex];
for (const line of logLines) { for (const line of logLines) {
// TODO: group support: ##[group]GroupTitle , ##[endgroup] const el = groupStack.length > 0 ? groupStack[groupStack.length - 1] : container;
const el = this.getLogsContainer(stepIndex); const group = {
el.append(this.createLogLine(line, startTime, stepIndex)); depth: groupStack.length,
isHeader: false,
};
if (line.message.startsWith('##[group]')) {
group.isHeader = true;
const logLine = this.createLogLine(
{
...line,
message: line.message.substring(9),
},
startTime, stepIndex, group,
);
logLine.setAttribute('data-group', group.index);
el.append(logLine);
const list = document.createElement('div');
list.classList.add('job-log-list');
list.classList.add('hidden');
list.setAttribute('data-group', group.index);
groupStack.push(list);
el.append(list);
} else if (line.message.startsWith('##[endgroup]')) {
groupStack.pop();
} else {
el.append(this.createLogLine(line, startTime, stepIndex, group));
}
} }
}, },
@ -872,15 +892,7 @@ export function initRepositoryActionView() {
border-radius: 0; border-radius: 0;
} }
/* TODO: group support .job-log-list.hidden {
display: none;
.job-log-group {
} }
.job-log-group-summary {
}
.job-log-list {
} */
</style> </style>