From 9acd45aa93b1a9c169cfab83e203cad21134c3d0 Mon Sep 17 00:00:00 2001 From: beckerinj Date: Sat, 13 May 2023 02:14:14 -0400 Subject: [PATCH] fix log whitespace non preservation issue --- frontend/src/components/deployment/tabs/log/Log.tsx | 5 ++++- frontend/src/components/deployment/tabs/log/log.module.scss | 3 --- frontend/src/style/index.scss | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/deployment/tabs/log/Log.tsx b/frontend/src/components/deployment/tabs/log/Log.tsx index eccc8383c..2c7d9971f 100644 --- a/frontend/src/components/deployment/tabs/log/Log.tsx +++ b/frontend/src/components/deployment/tabs/log/Log.tsx @@ -57,15 +57,18 @@ const Log: Component<{ }, 1500); } }); + /// the return of this closure is used as the innerHTML of the
 element
+  /// need to make sure this can't be used to inject some script into the page
   const log = () => {
     if (deployment()?.state === DockerContainerState.NotDeployed) {
       return "not deployed";
     } else {
       const log = p.error ? p.log?.stderr : p.log?.stdout;
-      // const sanitized = log ? 
+      // const sanitized = log && santize(log);
       return log ? convert.toHtml(log) : `no${p.error ? " error" : ""} log`;
     }
   };
+  createEffect(() => console.log(log()));
   const buffer = useBuffer(scrolled, 250);
   const [poll, togglePoll] = useLocalStorageToggle(
     "deployment-log-polling",
diff --git a/frontend/src/components/deployment/tabs/log/log.module.scss b/frontend/src/components/deployment/tabs/log/log.module.scss
index 772b53cbe..e325f001e 100644
--- a/frontend/src/components/deployment/tabs/log/log.module.scss
+++ b/frontend/src/components/deployment/tabs/log/log.module.scss
@@ -10,9 +10,6 @@
 }
 
 .Log {
-	white-space: pre-line;
-	overflow-wrap: anywhere;
-	tab-size: 2;
 	padding: 1rem;
 	margin-bottom: 40vh;
 }
diff --git a/frontend/src/style/index.scss b/frontend/src/style/index.scss
index 36865b33e..c3fa86ae1 100644
--- a/frontend/src/style/index.scss
+++ b/frontend/src/style/index.scss
@@ -26,6 +26,9 @@ code {
 
 pre {
   margin: 0;
+  white-space: pre-wrap;
+	overflow-wrap: anywhere;
+	tab-size: 2;
 }
 
 h1 {