fix: handle error and fix rendering bug

kurtosis-tech · Oct 25, 2023 · d40cfea · d40cfea
1 parent 0d10726
commit d40cfea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/engine/frontend/package-lock.json b/engine/frontend/package-lock.json
diff --git a/engine/frontend/src/component/log/CreateEnclaveLog.js b/engine/frontend/src/component/log/CreateEnclaveLog.js
@@ -83,7 +83,6 @@ export const CreateEnclaveLog = ({packageId, enclave, args, appData}) => {
     }
 
     const readStreamData = (result) => {
-        // console.log(`${result.case} ${JSON.stringify(result.value)}`)
         if (result.case === INSTRUCTION) {
             setLogs(logs => [...logs, result.value.executableInstruction])
         }
@@ -145,6 +144,8 @@ export const CreateEnclaveLog = ({packageId, enclave, args, appData}) => {
                 }
             } catch (ex) {
                 console.error("Error occurred while reading data from the enclave: ", enclave.name)
+                setLogsExecutionStatusText("Script failed to run with an error")
+                setLogsCurrentExecutionStatus(logsStatus(SCRIPT_RUN_STATUS_ERROR, null))
             } finally {
                 setLoading(false)
             }

diff --git a/engine/frontend/src/component/log/Log.js b/engine/frontend/src/component/log/Log.js
@@ -31,15 +31,13 @@ export const Log = ({logs, fileName, currentExecutionStatus, executionStatusText
     const virtuosoRef = useRef(null)
     const {height: windowHeight} = useWindowDimensions();
     const {onCopy, setValue: setCopyValue, hasCopied} = useClipboard("");
-    const [logsExecutionStatus, setLogsExecutionStatus] = useState(<></>)
 
     useEffect(() => {
         setDisplayLogs(logs);
         const logsWithoutAnsi = logs.map((log) => {
             return stripAnsi(log)
         })
         setCopyValue(logsWithoutAnsi.join(os.EOL))
-        setLogsExecutionStatus(currentExecutionStatus)
     }, [logs]);
 
     const handleDownload = () => {
@@ -82,7 +80,7 @@ export const Log = ({logs, fileName, currentExecutionStatus, executionStatusText
                 <Box p='2' m="4"
                      height={"40px"}
                 >
-                    {logsExecutionStatus}
+                    {currentExecutionStatus}
                 </Box>
                 <Tooltip label={`${hasCopied ? "Copied!" : "Copy to clipboard"}`}
                          placement='top-end'