mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-23 08:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Hide log container if step does not have logs (#1086)

Browse source
This commit is contained in:
Lauris BH 2022-08-10 10:53:55 +03:00 committed by GitHub
parent 2e8f9e17e6
commit 4d390104bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
web/src/components/repo/build/BuildLog.vue
View file

@ -24,7 +24,7 @@
</div> </div>
<div <div
v-show="loadedLogs" v-show="hasLogs && loadedLogs"
ref="consoleElement" ref="consoleElement"
class="w-full max-w-full grid grid-cols-[min-content,1fr,min-content] auto-rows-min flex-grow p-2 gap-x-2 overflow-x-hidden overflow-y-auto" class="w-full max-w-full grid grid-cols-[min-content,1fr,min-content] auto-rows-min flex-grow p-2 gap-x-2 overflow-x-hidden overflow-y-auto"
> >
@ -115,6 +115,11 @@ export default defineComponent({
const consoleElement = ref<Element>(); const consoleElement = ref<Element>();
const loadedLogs = computed(() => !!log.value); const loadedLogs = computed(() => !!log.value);
const hasLogs = computed(
() =>
// we do not have logs for skipped jobs
repo?.value && build.value && proc.value && proc.value.state !== 'skipped' && proc.value.state !== 'killed',
);
const autoScroll = ref(true); // TODO: allow enable / disable const autoScroll = ref(true); // TODO: allow enable / disable
const showActions = ref(false); const showActions = ref(false);
const downloadInProgress = ref(false); const downloadInProgress = ref(false);
@ -150,6 +155,9 @@ export default defineComponent({
logBuffer.value = []; logBuffer.value = [];
if (buffer.length === 0) { if (buffer.length === 0) {
if (!log.value) {
log.value = [];
}
return; return;
} }
@ -218,7 +226,7 @@ export default defineComponent({
return; return;
} }
loadedProcSlug.value = procSlug.value; loadedProcSlug.value = procSlug.value;
log.value = []; log.value = undefined;
logBuffer.value = []; logBuffer.value = [];
ansiUp.value = new AnsiUp(); ansiUp.value = new AnsiUp();
ansiUp.value.use_classes = true; ansiUp.value.use_classes = true;
@ -231,20 +239,13 @@ export default defineComponent({
stream.value.close(); stream.value.close();
} }
// we do not have logs for skipped jobs if (!hasLogs.value || !proc.value) {
if (
!repo.value ||
!build.value ||
!proc.value ||
proc.value.state === 'skipped' ||
proc.value.state === 'killed'
) {
return; return;
} }
if (isProcFinished(proc.value)) { if (isProcFinished(proc.value)) {
const logs = await apiClient.getLogs(repo.value.owner, repo.value.name, build.value.number, proc.value.pid); const logs = await apiClient.getLogs(repo.value.owner, repo.value.name, build.value.number, proc.value.pid);
logs.forEach((line) => writeLog({ index: line.pos, text: line.out, time: line.time })); logs?.forEach((line) => writeLog({ index: line.pos, text: line.out, time: line.time }));
flushLogs(false); flushLogs(false);
} }
@ -283,7 +284,7 @@ export default defineComponent({
} }
}); });
return { consoleElement, proc, log, loadedLogs, formatTime, showActions, download, downloadInProgress }; return { consoleElement, proc, log, loadedLogs, hasLogs, formatTime, showActions, download, downloadInProgress };
}, },
}); });
</script> </script>