Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

frontend: fix double-escaped link

Browse Source 
do not escape links to downstream jobs generated with a private
ANSI CSI escape sequence, because the newer ansi_up escapes HTML.
Work around its dropping of unknown sequences, and have the link
use the Vue routing mechanism rather than a page reload.

resolves #161
This commit is contained in:
Oliver Giles 2021-09-25 19:07:36 +12:00
parent ded13ed9fe
commit 78ceeec3e8
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/resources/js/app.js
View File

@ -655,11 +655,20 @@ const Run = templateId => {
value = utf8decoder.decode(value); value = utf8decoder.decode(value);
if (done) if (done)
return; return;
// output may contain private ANSI CSI escape sequence to point to
// downstream jobs. ansi_up (correctly) discards unknown sequences,
// so they must be matched before passing through ansi_up. ansi_up
// also (correctly) escapes HTML, so they need to be converted back
// to links after going through ansi_up.
// A better solution one day would be if ansi_up were to provide
// a callback interface for handling unknown sequences.
state.log += ansi_up.ansi_to_html( state.log += ansi_up.ansi_to_html(
value.replace(/\033\[\{([^:]+):(\d+)\033\\/g, (m, $1, $2) => value.replace(/\033\[\{([^:]+):(\d+)\033\\/g, (m, $1, $2) =>
'<a href="jobs/'+$1+'" onclick="return vroute(this);">'+$1+'</a>:'+ '~~~~LAMINAR_RUN~'+$1+':'+$2+'~'
'<a href="jobs/'+$1+'/'+$2+'" onclick="return vroute(this);">#'+$2+'</a>' )
) ).replace(/~~~~LAMINAR_RUN~([^:]+):(\d+)~/g, (m, $1, $2) =>
'<a href="jobs/'+$1+'" onclick="return LaminarApp.navigate(this.href);">'+$1+'</a>:'+
'<a href="jobs/'+$1+'/'+$2+'" onclick="return LaminarApp.navigate(this.href);">#'+$2+'</a>'
); );
vm.$forceUpdate(); vm.$forceUpdate();
return pump(); return pump();
@ -825,7 +834,7 @@ Vue.component('RouterView', (() => {
}; };
})()); })());
new Vue({ const LaminarApp = new Vue({
el: '#app', el: '#app',
data: { data: {
title: '', // populated by status message title: '', // populated by status message
@ -851,6 +860,11 @@ new Vue({
new Notification('Job ' + data.result, { new Notification('Job ' + data.result, {
body: data.name + ' ' + '#' + data.number + ': ' + data.result body: data.name + ' ' + '#' + data.number + ': ' + data.result
}); });
},
navigate: function(path) {
history.pushState(null, null, path);
this.$emit('navigate');
return false;
} }
}, },
watch: { watch: {