diff --git a/BACKEND/app/services/line_connection.ts b/BACKEND/app/services/line_connection.ts index 6b47ea5..cd240b5 100644 --- a/BACKEND/app/services/line_connection.ts +++ b/BACKEND/app/services/line_connection.ts @@ -2183,7 +2183,7 @@ Ports Missing/Down: ${missing.length}\n\n` const regex = new RegExp(`\\b${sn.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\$&')}\\b`, 'g') result = result.replace( regex, - `${escapeHtml(sn)}` + `${escapeHtml(sn)}` ) } }) diff --git a/FRONTEND/src/components/Modal/ModalLineHistory.tsx b/FRONTEND/src/components/Modal/ModalLineHistory.tsx index 252e699..febf778 100644 --- a/FRONTEND/src/components/Modal/ModalLineHistory.tsx +++ b/FRONTEND/src/components/Modal/ModalLineHistory.tsx @@ -241,6 +241,7 @@ const ModalLineHistory = ({ setOpenLog(false); }} testLogContent={selectedHistory?.output || ""} + isShowShortLog={true} /> ); diff --git a/FRONTEND/src/components/Modal/ModalLog.tsx b/FRONTEND/src/components/Modal/ModalLog.tsx index 7793afe..0e23030 100644 --- a/FRONTEND/src/components/Modal/ModalLog.tsx +++ b/FRONTEND/src/components/Modal/ModalLog.tsx @@ -1,16 +1,29 @@ -import { Modal, Text } from "@mantine/core"; +import { Button, Flex, Modal, Text } from "@mantine/core"; import classes from "../Component.module.css"; -import { convertTimestampToDate } from "../../untils/helper"; +import { + convertTimestampToDate, + createShortLog, + printLogWeb, +} from "../../untils/helper"; +import { useEffect, useState } from "react"; const ModalLog = ({ opened, onClose, testLogContent, + isShowShortLog = false, }: { opened: boolean; onClose: () => void; testLogContent: string; + isShowShortLog?: boolean; }) => { + const [valueLog, setValueLog] = useState(testLogContent); + const [isShort, setIsShort] = useState(false); + + useEffect(() => { + setValueLog(testLogContent); + }, [testLogContent]); const addTooltipsToHighlights = () => { const highlights = document.querySelectorAll(".highlight"); highlights.forEach((highlight) => { @@ -60,7 +73,7 @@ const ModalLog = ({ size="90%" styles={{ content: { - height: "85vh", + height: isShowShortLog ? "90vh" : "85vh", display: "flex", flexDirection: "column", }, @@ -72,13 +85,50 @@ const ModalLog = ({ >
{ if (el) addTooltipsToHighlights(); }} >
+ + {isShowShortLog ? ( + + {!isShort ? ( + + ) : ( + + )} + + + ) : ( + "" + )} ); }; diff --git a/FRONTEND/src/components/Modal/ModalTerminal.tsx b/FRONTEND/src/components/Modal/ModalTerminal.tsx index 61a6886..bc54e09 100644 --- a/FRONTEND/src/components/Modal/ModalTerminal.tsx +++ b/FRONTEND/src/components/Modal/ModalTerminal.tsx @@ -543,6 +543,7 @@ const ModalTerminal = ({ { if (openDrawerScenario) { setOpenDrawerScenario(false); @@ -642,7 +643,7 @@ const ModalTerminal = ({ - + + + } > @@ -1570,18 +1584,6 @@ const ModalTerminal = ({ > Send Break -