Update

BACKEND/database/migrations/1762822728281_create_tickets_table.ts

@@ -0,0 +1,23 @@
+import { BaseSchema } from '@adonisjs/lucid/schema'
+
+export default class extends BaseSchema {
+  protected tableName = 'tickets'
+
+  async up() {
+    this.schema.createTable(this.tableName, (table) => {
+      table.increments('id')
+      table.string('description').notNullable()
+      table.string('model').notNullable()
+      table.string('sn').notNullable()
+      table.integer('line_id').notNullable()
+      table.integer('station_id').notNullable()
+      table.string('status').notNullable()
+      table.text('history').notNullable()
+      table.timestamps()
+    })
+  }
+
+  async down() {
+    this.schema.dropTable(this.tableName)
+  }
+}

BACKEND/providers/socket_io_provider.ts

@@ -159,15 +159,15 @@ export class WebSocketIo {
       socket.on('open_cli', async (data) => {
         const { lineId, userEmail, userName: name, stationId } = data
         const line = this.lineMap.get(lineId)
-        if (line) {
+        if (line && line?.userOpenCLI) {
-          line.userOpenCLI({ userEmail, userName: name })
+          line?.userOpenCLI({ userEmail, userName: name })
         } else {
           if (this.lineConnecting.includes(lineId)) return
           const linesData = await Line.findBy('id', lineId)
           const stationData = await Station.findBy('id', stationId)
           if (linesData && stationData) {
             this.lineConnecting.push(lineId)
-            await this.connectLine(io, [linesData], stationData)
+            await this.connectLine(io, [linesData], stationData, line?.config?.output || '')
             const lineReconnect = this.lineMap.get(lineId)
             if (lineReconnect) {
               lineReconnect.userOpenCLI({ userEmail, userName: name })
@@ -179,15 +179,15 @@ export class WebSocketIo {
       socket.on('close_cli', async (data) => {
         const { lineId, stationId } = data
         const line = this.lineMap.get(lineId)
-        if (line) {
+        if (line && line?.userCloseCLI) {
-          line.userCloseCLI()
+          line?.userCloseCLI()
         } else {
           if (this.lineConnecting.includes(lineId)) return
           const linesData = await Line.findBy('id', lineId)
           const stationData = await Station.findBy('id', stationId)
           if (linesData && stationData) {
             this.lineConnecting.push(lineId)
-            await this.connectLine(io, [linesData], stationData)
+            await this.connectLine(io, [linesData], stationData, line?.config?.output || '')
             const lineReconnect = this.lineMap.get(lineId)
             if (lineReconnect) {
               lineReconnect.userCloseCLI()
@@ -422,7 +422,7 @@ export class WebSocketIo {
     return io
   }
 
-  private async connectLine(socket: any, lines: Line[], station: Station) {
+  private async connectLine(socket: any, lines: Line[], station: Station, output = '') {
     try {
       this.stationMap.set(station.id, station)
       for (const line of lines) {
@@ -435,7 +435,7 @@ export class WebSocketIo {
             stationId: station.id,
             apcName: line.apcName,
             outlet: line.outlet,
-            output: '',
+            output: output,
             status: '',
             openCLI: false,
             userEmailOpenCLI: '',
@@ -505,7 +505,7 @@ export class WebSocketIo {
 
           if (linesData && stationData) {
             this.lineConnecting.push(lineId)
-            await this.connectLine(io, [linesData], stationData)
+            await this.connectLine(io, [linesData], stationData, line?.config?.output || '')
             this.lineConnecting = this.lineConnecting.filter((el) => el !== lineId)
 
             const lineReconnect = this.lineMap.get(lineId)

FRONTEND/src/components/CardLine.tsx

@@ -138,6 +138,20 @@ const CardLine = ({
             onDoubleClick={() => {
               openTerminal(line);
             }}
+            onFocus={() => {
+              socket?.emit("open_cli", {
+                lineId: line.id,
+                stationId: line.stationId || line.station_id,
+                userEmail: user?.email,
+                userName: user?.userName,
+              });
+            }}
+            onBlur={() => {
+              socket?.emit("close_cli", {
+                lineId: line?.id,
+                stationId: line.stationId || line.station_id,
+              });
+            }}
           />
         </Box>
         <Box>

FRONTEND/src/components/DrawerControl.tsx

@@ -810,6 +810,7 @@ export const DrawerSwitchControl: React.FC<DrawerProps> = ({
   useEffect(() => {
     if (!open) {
       setListPortsSelected([]);
+      setLoading(true);
     }
   }, [open]);
 

FRONTEND/src/components/TerminalXTerm.tsx

@@ -22,6 +22,8 @@ interface TerminalCLIProps {
     paddingLeft?: string;
   };
   onDoubleClick?: () => void;
+  onFocus?: () => void;
+  onBlur?: () => void;
   fontSize?: number;
   miniSize?: boolean;
   loadingContent?: boolean;
@@ -40,6 +42,8 @@ const TerminalCLI: React.FC<TerminalCLIProps> = ({
   miniSize = false,
   initContent = "",
   loadingContent = false,
+  onFocus,
+  onBlur,
 }) => {
   const xtermRef = useRef<HTMLDivElement>(null);
   const terminal = useRef<Terminal>(null);
@@ -182,6 +186,17 @@ const TerminalCLI: React.FC<TerminalCLIProps> = ({
         }}
       >
         <div
+          onClick={(event) => {
+            event.preventDefault();
+            event.stopPropagation();
+            if (!isDisabled) {
+              terminal.current?.focus();
+              if (onFocus) onFocus();
+            }
+          }}
+          onBlurCapture={() => {
+            if (onBlur) onBlur();
+          }}
           ref={xtermRef}
           style={{
             width: "100%",