diff --git a/FRONTEND/src/App.tsx b/FRONTEND/src/App.tsx index e4cc563..a5995a8 100644 --- a/FRONTEND/src/App.tsx +++ b/FRONTEND/src/App.tsx @@ -490,21 +490,34 @@ function App() { ); if (data?.isSkipPhysical && !data?.reasonSkipPhysical) { const valueLine = findLineByLineId(data?.lineId, data?.stationId); - if (valueLine) setLinesConfirmSkipPort((pre) => [...pre, valueLine]); + if ( + valueLine && + openModalTerminal && + selectedLine?.id === valueLine?.id + ) + setLinesConfirmSkipPort((pre) => [...pre, valueLine]); } if ( !data?.listFeatureTested?.includes("PHYSICAL") && data?.listFeatureTested?.includes("DPELP") ) { const valueLine = findLineByLineId(data?.lineId, data?.stationId); - if (valueLine && openModalTerminal) + if ( + valueLine && + openModalTerminal && + selectedLine?.id === valueLine?.id + ) setLinesConfirmRunPhysical((pre) => [...pre, valueLine]); } } }); socket?.on("summary_tested", (data) => { - if (data?.body && openModalTerminal) { + if ( + data?.body && + openModalTerminal && + selectedLine?.id === data?.lineId + ) { setDataSummaryTested({ body: data?.body || "", title: data?.title || "", diff --git a/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx b/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx index aa621dc..ffb7a69 100644 --- a/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx +++ b/FRONTEND/src/components/Modal/ModalConfirmRunPhysicalTest.tsx @@ -64,7 +64,7 @@ export default function ModalConfirmRunPhysical({ }} closeOnClickOutside={false} closeOnEscape={false} - // withCloseButton={false} + centered title="Confirm Run Test Ports" > diff --git a/FRONTEND/src/components/Modal/ModalConfirmSkipTestPort.tsx b/FRONTEND/src/components/Modal/ModalConfirmSkipTestPort.tsx index 76ad64e..318fbbb 100644 --- a/FRONTEND/src/components/Modal/ModalConfirmSkipTestPort.tsx +++ b/FRONTEND/src/components/Modal/ModalConfirmSkipTestPort.tsx @@ -65,10 +65,11 @@ export default function ModalConfirmSkipTestPort({ closeOnClickOutside={false} closeOnEscape={false} withCloseButton={false} + centered title="Confirm Skip Test Ports" > - + {dataLines.map((line, i) => (