From 7a0fc84842b6a5e6e6034f58ece1df7e94678ac0 Mon Sep 17 00:00:00 2001
From: Akash Ramaswamy <87078332+akash-ramaswamy@users.noreply.github.com>
Date: Sat, 23 Dec 2023 20:18:22 +0530
Subject: [PATCH] fix: copy log ansi character parsing and html decode (#2621)

---
 assets/components/LogViewer/SimpleLogItem.vue | 4 +++-
 package.json                                  | 1 +
 pnpm-lock.yaml                                | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/assets/components/LogViewer/SimpleLogItem.vue b/assets/components/LogViewer/SimpleLogItem.vue
index 6d90f856..d32457d5 100644
--- a/assets/components/LogViewer/SimpleLogItem.vue
+++ b/assets/components/LogViewer/SimpleLogItem.vue
@@ -9,7 +9,7 @@
     ></div>
     <log-message-actions
       class="duration-250 absolute -right-1 opacity-0 transition-opacity delay-150 group-hover/entry:opacity-100"
-      :message="logEntry.message"
+      :message="decodeXML(stripAnsi(logEntry.message))"
       :log-entry="logEntry"
     />
   </div>
@@ -17,6 +17,8 @@
 <script lang="ts" setup>
 import { SimpleLogEntry } from "@/models/LogEntry";
 import AnsiConvertor from "ansi-to-html";
+import stripAnsi from "strip-ansi";
+import { decodeXML } from "entities";
 
 const ansiConvertor = new AnsiConvertor({ escapeXML: false, fg: "var(--text-color)" });
 defineProps<{
diff --git a/package.json b/package.json
index 37d36b45..8aa9bcae 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
   "postcss": "^8.4.32",
   "postcss-mixins": "^9.0.4",
   "splitpanes": "^3.1.5",
+  "strip-ansi": "^7.1.0",
   "tailwindcss": "^3.4.0",
   "unplugin-auto-import": "^0.17.2",
   "unplugin-icons": "^0.18.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e9bceb8..fb837685 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -98,6 +98,9 @@ dependencies:
   splitpanes:
     specifier: ^3.1.5
     version: 3.1.5
+  strip-ansi:
+    specifier: ^7.1.0
+    version: 7.1.0
   tailwindcss:
     specifier: ^3.4.0
     version: 3.4.0(ts-node@10.9.2)
@@ -1879,7 +1882,6 @@ packages:
   /ansi-regex@6.0.1:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
-    dev: true
 
   /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
@@ -4645,7 +4647,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.0.1
-    dev: true
 
   /strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}