From b5c84e5ceea553edf2514dd434cda7bef99fe629 Mon Sep 17 00:00:00 2001
From: nguyentrungthat <80239428+nguentrungthat@users.noreply.github.com>
Date: Wed, 1 Apr 2026 13:57:06 +0700
Subject: [PATCH] Update

---
 BACKEND/app/services/line_connection.ts       |  2 +-
 BACKEND/app/ultils/templates/show_version.ts  |  7 +++++++
 .../Modal/ModalConfirmRunPhysicalTest.tsx     |  9 +++++---
 .../src/components/Modal/ModalTerminal.tsx    | 21 ++++++++++++++++---
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/BACKEND/app/services/line_connection.ts b/BACKEND/app/services/line_connection.ts
index fe1c529..ac0d9f5 100644
--- a/BACKEND/app/services/line_connection.ts
+++ b/BACKEND/app/services/line_connection.ts
@@ -1336,7 +1336,7 @@ Ports Missing/Down: ${missing.length}\n\n`
       this.config.listFeatureTested?.includes('PHYSICAL') &&
       this.config.listFeatureTested?.includes('DPELP')
     )
-      this.setTimeoutSendSummaryReport(30000)
+      this.setTimeoutSendSummaryReport(5000)
     const formReport = this.physicalTest.getFormReport(this.config.inventory)
     const reasonSkipPhysical =
       typeof reason === 'string' && reason.trim().length > 0
diff --git a/BACKEND/app/ultils/templates/show_version.ts b/BACKEND/app/ultils/templates/show_version.ts
index d1dedae..a72d19e 100644
--- a/BACKEND/app/ultils/templates/show_version.ts
+++ b/BACKEND/app/ultils/templates/show_version.ts
@@ -86,6 +86,13 @@ const parseLog = (data: string) => {
     }
   }
 
+  const SOFTWARE_IMAGE = records['SOFTWARE_IMAGE'] || ''
+  if (SOFTWARE_IMAGE?.includes('/')) {
+    const splitIOS =
+      SOFTWARE_IMAGE.split('/')?.length > 0 ? SOFTWARE_IMAGE.split('/')[1] : SOFTWARE_IMAGE
+    records['SOFTWARE_IMAGE'] = splitIOS
+  }
+
   return [records]
 }
 
diff --git a/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx b/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx
index f65c33d..ab888ac 100644
--- a/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx
+++ b/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx
@@ -58,10 +58,13 @@ export default function ModalConfirmRunPhysical({
       size={"xl"}
       style={{ position: "absolute", left: 0 }}
       opened={dataLines.length > 0}
-      onClose={() => {}}
+      onClose={() => {
+        setListLines([]);
+        setDataLines([]);
+      }}
       closeOnClickOutside={false}
       closeOnEscape={false}
-      withCloseButton={false}
+      // withCloseButton={false}
       title="Confirm Run Test Ports"
     >
       <Box>
@@ -72,7 +75,7 @@ export default function ModalConfirmRunPhysical({
               style={{
                 border: "1px #ccc solid",
                 borderTop:
-                  i < dataLines.length - 1 || dataLines.length === 1
+                  i < dataLines.length - 1 || dataLines.length <= 2
                     ? "1px solid #ccc"
                     : 0,
                 borderBottom:
diff --git a/FRONTEND/src/components/Modal/ModalTerminal.tsx b/FRONTEND/src/components/Modal/ModalTerminal.tsx
index 8ee94e7..c8ae84c 100644
--- a/FRONTEND/src/components/Modal/ModalTerminal.tsx
+++ b/FRONTEND/src/components/Modal/ModalTerminal.tsx
@@ -1493,7 +1493,12 @@ const ModalTerminal = ({
               />
               <Button
                 fw={400}
-                disabled={isDisable}
+                disabled={
+                  isDisable ||
+                  (line?.runningScenario && line?.runningScenario?.length > 0
+                    ? true
+                    : false)
+                }
                 variant="outline"
                 color="yellow"
                 style={{ height: "30px", width: "100px" }}
@@ -1504,7 +1509,12 @@ const ModalTerminal = ({
                 Scenario
               </Button>
               <Button
-                disabled={isDisable}
+                disabled={
+                  isDisable ||
+                  (line?.runningScenario && line?.runningScenario?.length > 0
+                    ? true
+                    : false)
+                }
                 fw={400}
                 variant="outline"
                 color="green"
@@ -1517,7 +1527,12 @@ const ModalTerminal = ({
                 Select IOS
               </Button>
               <Button
-                disabled={isDisable}
+                disabled={
+                  isDisable ||
+                  (line?.runningScenario && line?.runningScenario?.length > 0
+                    ? true
+                    : false)
+                }
                 fw={400}
                 variant="outline"
                 color="yellow"