From ec55c169ba6bd1d9ec5ecaa4464e3156d5502ee0 Mon Sep 17 00:00:00 2001
From: Truong Vo <41848815+vmtruong301296@users.noreply.github.com>
Date: Fri, 12 Dec 2025 15:13:24 +0700
Subject: [PATCH] =?UTF-8?q?Di=20chuy=E1=BB=83n=20button=20BAUN=20trong=20c?=
 =?UTF-8?q?hi=20ti=E1=BA=BFt=20line?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Modal/ModalTerminal.tsx    | 150 ++++++++----------
 1 file changed, 70 insertions(+), 80 deletions(-)

diff --git a/FRONTEND/src/components/Modal/ModalTerminal.tsx b/FRONTEND/src/components/Modal/ModalTerminal.tsx
index 7626668..4eb0a2c 100644
--- a/FRONTEND/src/components/Modal/ModalTerminal.tsx
+++ b/FRONTEND/src/components/Modal/ModalTerminal.tsx
@@ -525,13 +525,76 @@ const ModalTerminal = ({
                     <IconCircleCheckFilled color="green" fontSize={"18px"} />
                   )}
                 </Flex>
-                <Flex mt="4px">
-                  <Text size="md" mr="6px">
-                    BAUD:
-                  </Text>
-                  <Text size="md">
-                    <strong>{line?.baud || ""}</strong>
-                  </Text>
+                <Flex
+                  mt="4px"
+                  align="center"
+                  justify="space-between"
+                  style={{ width: "100%" }}
+                >
+                  <Flex align="center" gap="xs">
+                    <Text size="md" mr="6px">
+                      BAUD:
+                    </Text>
+                    <Text size="md">
+                      <strong>{line?.baud || ""}</strong>
+                    </Text>
+                  </Flex>
+                  <Menu
+                    closeOnItemClick={false}
+                    closeOnClickOutside={false}
+                    trigger="hover"
+                    shadow="md"
+                    position="right"
+                  >
+                    <Menu.Target>
+                      <Button
+                        fw={400}
+                        disabled={isDisable}
+                        variant="filled"
+                        size="xs"
+                        style={{
+                          height: "26px",
+                          width: "80px",
+                          marginRight: "20px",
+                        }}
+                        onClick={() => {}}
+                      >
+                        BAUD
+                      </Button>
+                    </Menu.Target>
+                    <Menu.Dropdown style={{ width: "110px" }}>
+                      <Flex
+                        justify={"space-between"}
+                        direction={"column"}
+                        style={{
+                          gap: "8px",
+                        }}
+                      >
+                        {listBaudDefault.map((el, i) => (
+                          <Button
+                            key={i}
+                            disabled={isDisable}
+                            variant="outline"
+                            size="xs"
+                            onClick={() => {
+                              if (!line) return;
+                              socket?.emit("change_baud", {
+                                stationId: line?.stationId || line?.station_id,
+                                lineId: line?.id,
+                                baud: el,
+                              });
+                              setIsDisable(true);
+                              setTimeout(() => {
+                                setIsDisable(false);
+                              }, 5000);
+                            }}
+                          >
+                            {el}
+                          </Button>
+                        ))}
+                      </Flex>
+                    </Menu.Dropdown>
+                  </Menu>
                 </Flex>
                 <Flex mt="4px" align="center">
                   <Text size="md" mr="6px">
@@ -874,79 +937,6 @@ const ModalTerminal = ({
                   </Box>
                 </Menu.Dropdown>
               </Menu>
-              <Menu
-                closeOnItemClick={false}
-                closeOnClickOutside={false}
-                trigger="hover"
-                shadow="md"
-                position="top"
-              >
-                <Menu.Target>
-                  <Button
-                    fw={400}
-                    disabled={isDisable}
-                    variant="filled"
-                    size="xs"
-                    style={{ height: "30px", width: "100px" }}
-                    onClick={() => {}}
-                  >
-                    BAUD
-                  </Button>
-                </Menu.Target>
-                <Menu.Dropdown style={{ width: "110px" }}>
-                  <Flex
-                    justify={"space-between"}
-                    direction={"column"}
-                    style={{
-                      gap: "8px",
-                    }}
-                  >
-                    {listBaudDefault.map((el, i) => (
-                      <Button
-                        key={i}
-                        disabled={isDisable}
-                        variant="outline"
-                        size="xs"
-                        fw={400}
-                        onClick={(e) => {
-                          e.preventDefault();
-                          e.stopPropagation();
-                          socket?.emit("set_baud", {
-                            lineId: line?.id,
-                            baud: el,
-                            stationId: Number(stationItem?.id),
-                          });
-                          setIsDisable(true);
-                          setTimeout(() => {
-                            setIsDisable(false);
-                          }, 5000);
-                        }}
-                      >
-                        {el}
-                      </Button>
-                    ))}
-                    <Input
-                      placeholder="Custom"
-                      value={valueBaud}
-                      onChange={(e) => setValueBaud(e.target.value)}
-                      onKeyDown={(e) => {
-                        if (e.key === "Enter") {
-                          socket?.emit("set_baud", {
-                            lineId: line?.id,
-                            baud: Number(valueBaud),
-                            stationId: Number(stationItem?.id),
-                          });
-                          setValueBaud("");
-                          setIsDisable(true);
-                          setTimeout(() => {
-                            setIsDisable(false);
-                          }, 5000);
-                        }
-                      }}
-                    />
-                  </Flex>
-                </Menu.Dropdown>
-              </Menu>
               <Button
                 disabled={true}
                 fw={400}