From 78ceeec3e8c953e7c0c1baaaa7b3a3dcd84b16d7 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Sat, 25 Sep 2021 19:07:36 +1200
Subject: [PATCH] frontend: fix double-escaped link

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
---
 src/resources/js/app.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index 08bad18..629ed3b 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -655,11 +655,20 @@ const Run = templateId => {
           value = utf8decoder.decode(value);
           if (done)
             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(
             value.replace(/\033\[\{([^:]+):(\d+)\033\\/g, (m, $1, $2) =>
-                   '<a href="jobs/'+$1+'" onclick="return vroute(this);">'+$1+'</a>:'+
-                   '<a href="jobs/'+$1+'/'+$2+'" onclick="return vroute(this);">#'+$2+'</a>'
-                 )
+              '~~~~LAMINAR_RUN~'+$1+':'+$2+'~'
+            )
+          ).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();
           return pump();
@@ -825,7 +834,7 @@ Vue.component('RouterView', (() => {
   };
 })());
 
-new Vue({
+const LaminarApp = new Vue({
   el: '#app',
   data: {
     title: '', // populated by status message
@@ -851,6 +860,11 @@ new Vue({
         new Notification('Job ' + data.result, {
           body: data.name + ' ' + '#' + data.number + ': ' + data.result
         });
+    },
+    navigate: function(path) {
+      history.pushState(null, null, path);
+      this.$emit('navigate');
+      return false;
     }
   },
   watch: {