the connections page has been slightly revised.

src/components/connection/connection-table.tsx

@@ -1,15 +1,14 @@
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
-import React, { useMemo, useState, useEffect, RefObject } from "react";
+import React, { useMemo, useState, useEffect, useRef } from "react";
 import {
   ColumnDef,
   flexRender,
   getCoreRowModel,
   useReactTable,
-  Row,
+  Header,
   ColumnSizingState,
 } from "@tanstack/react-table";
-import { TableVirtuoso, TableComponents } from "react-virtuoso";
 
 import {
   Table,
@@ -27,7 +26,30 @@ import { cn } from "@root/lib/utils";
 
 dayjs.extend(relativeTime);
 
-// Интерфейс для строки данных, которую использует react-table
+interface IConnectionsItem {
+  id: string;
+  metadata: {
+    host: string;
+    destinationIP: string;
+    destinationPort: string;
+    remoteDestination: string;
+    process?: string;
+    processPath?: string;
+    sourceIP: string;
+    sourcePort: string;
+    type: string;
+    network: string;
+  };
+  rule: string;
+  rulePayload?: string;
+  chains: string[];
+  download: number;
+  upload: number;
+  curDownload?: number;
+  curUpload?: number;
+  start: string;
+}
+
 interface ConnectionRow {
   id: string;
   host: string;
@@ -45,29 +67,81 @@ interface ConnectionRow {
   connectionData: IConnectionsItem;
 }
 
-// Интерфейс для пропсов, которые компонент получает от родителя
 interface Props {
   connections: IConnectionsItem[];
   onShowDetail: (data: IConnectionsItem) => void;
   scrollerRef: (element: HTMLElement | Window | null) => void;
 }
 
+const ColumnResizer = ({ header }: { header: Header<ConnectionRow, unknown> }) => {
+  return (
+      <div
+          onMouseDown={header.getResizeHandler()}
+          onTouchStart={header.getResizeHandler()}
+          className={cn(
+              "absolute right-0 top-0 h-full w-1 cursor-col-resize select-none touch-none",
+              "bg-transparent hover:bg-primary/50 active:bg-primary",
+              "transition-colors duration-150",
+              header.column.getIsResizing() && "bg-primary"
+          )}
+          style={{
+            transform: header.column.getIsResizing() ? `translateX(0px)` : "",
+          }}
+      />
+  );
+};
+
 export const ConnectionTable = (props: Props) => {
   const { connections, onShowDetail, scrollerRef } = props;
+  const tableContainerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (tableContainerRef.current && scrollerRef) {
+      scrollerRef(tableContainerRef.current);
+    }
+  }, [scrollerRef]);
 
   const [columnSizing, setColumnSizing] = useState<ColumnSizingState>(() => {
     try {
       const saved = localStorage.getItem("connection-table-widths");
-      return saved ? JSON.parse(saved) : {};
+      return saved
+          ? JSON.parse(saved)
+          : {
+            host: 220,
+            download: 88,
+            upload: 88,
+            dlSpeed: 88,
+            ulSpeed: 88,
+            chains: 340,
+            rule: 280,
+            process: 220,
+            time: 120,
+            source: 200,
+            remoteDestination: 200,
+            type: 160,
+          };
     } catch {
-      return {};
+      return {
+        host: 220,
+        download: 88,
+        upload: 88,
+        dlSpeed: 88,
+        ulSpeed: 88,
+        chains: 340,
+        rule: 280,
+        process: 220,
+        time: 120,
+        source: 200,
+        remoteDestination: 200,
+        type: 160,
+      };
     }
   });
 
   useEffect(() => {
     localStorage.setItem(
         "connection-table-widths",
-      JSON.stringify(columnSizing),
+        JSON.stringify(columnSizing)
     );
   }, [columnSizing]);
 
@@ -107,13 +181,16 @@ export const ConnectionTable = (props: Props) => {
           header: () => t("Host"),
           size: columnSizing?.host || 220,
           minSize: 180,
+          maxSize: 400,
         },
         {
           accessorKey: "download",
           header: () => t("Downloaded"),
           size: columnSizing?.download || 88,
+          minSize: 80,
+          maxSize: 150,
           cell: ({ getValue }) => (
-          <div className="text-right">
+              <div className="text-right font-mono text-sm">
                 {parseTraffic(getValue<number>()).join(" ")}
               </div>
           ),
@@ -122,8 +199,10 @@ export const ConnectionTable = (props: Props) => {
           accessorKey: "upload",
           header: () => t("Uploaded"),
           size: columnSizing?.upload || 88,
+          minSize: 80,
+          maxSize: 150,
           cell: ({ getValue }) => (
-          <div className="text-right">
+              <div className="text-right font-mono text-sm">
                 {parseTraffic(getValue<number>()).join(" ")}
               </div>
           ),
@@ -132,8 +211,10 @@ export const ConnectionTable = (props: Props) => {
           accessorKey: "dlSpeed",
           header: () => t("DL Speed"),
           size: columnSizing?.dlSpeed || 88,
+          minSize: 80,
+          maxSize: 150,
           cell: ({ getValue }) => (
-          <div className="text-right">
+              <div className="text-right font-mono text-sm">
                 {parseTraffic(getValue<number>()).join(" ")}/s
               </div>
           ),
@@ -142,8 +223,10 @@ export const ConnectionTable = (props: Props) => {
           accessorKey: "ulSpeed",
           header: () => t("UL Speed"),
           size: columnSizing?.ulSpeed || 88,
+          minSize: 80,
+          maxSize: 150,
           cell: ({ getValue }) => (
-          <div className="text-right">
+              <div className="text-right font-mono text-sm">
                 {parseTraffic(getValue<number>()).join(" ")}/s
               </div>
           ),
@@ -153,26 +236,30 @@ export const ConnectionTable = (props: Props) => {
           header: () => t("Chains"),
           size: columnSizing?.chains || 340,
           minSize: 180,
+          maxSize: 500,
         },
         {
           accessorKey: "rule",
           header: () => t("Rule"),
           size: columnSizing?.rule || 280,
           minSize: 180,
+          maxSize: 400,
         },
         {
           accessorKey: "process",
           header: () => t("Process"),
           size: columnSizing?.process || 220,
           minSize: 180,
+          maxSize: 350,
         },
         {
           accessorKey: "time",
           header: () => t("Time"),
           size: columnSizing?.time || 120,
           minSize: 100,
+          maxSize: 180,
           cell: ({ getValue }) => (
-          <div className="text-right">
+              <div className="text-right font-mono text-sm">
                 {dayjs(getValue<string>()).fromNow()}
               </div>
           ),
@@ -182,21 +269,24 @@ export const ConnectionTable = (props: Props) => {
           header: () => t("Source"),
           size: columnSizing?.source || 200,
           minSize: 130,
+          maxSize: 300,
         },
         {
           accessorKey: "remoteDestination",
           header: () => t("Destination"),
           size: columnSizing?.remoteDestination || 200,
           minSize: 130,
+          maxSize: 300,
         },
         {
           accessorKey: "type",
           header: () => t("Type"),
           size: columnSizing?.type || 160,
           minSize: 100,
+          maxSize: 220,
         },
       ],
-    [columnSizing],
+      [columnSizing]
   );
 
   const table = useReactTable({
@@ -206,92 +296,91 @@ export const ConnectionTable = (props: Props) => {
     onColumnSizingChange: setColumnSizing,
     getCoreRowModel: getCoreRowModel(),
     columnResizeMode: "onChange",
+    enableColumnResizing: true,
   });
 
-  const VirtuosoTableComponents = useMemo<TableComponents<Row<ConnectionRow>>>(
+  const totalTableWidth = useMemo(() => {
-    () => ({
+    return table.getCenterTotalSize();
-      // Явно типизируем `ref` для каждого компонента
+  }, [table.getState().columnSizing]);
-      Scroller: React.forwardRef<HTMLDivElement>((props, ref) => (
+
-        <div className="h-full" {...props} ref={ref} />
+  if (connRows.length === 0) {
-      )),
-      Table: (props) => <Table {...props} className="w-full border-collapse" />,
-      TableHead: React.forwardRef<HTMLTableSectionElement>((props, ref) => (
-        <TableHeader {...props} ref={ref} />
-      )),
-      // Явно типизируем пропсы и `ref` для TableRow
-      TableRow: React.forwardRef<
-        HTMLTableRowElement,
-        { item: Row<ConnectionRow> } & React.HTMLAttributes<HTMLTableRowElement>
-      >(({ item: row, ...props }, ref) => {
-        // `Virtuoso` передает нам готовую строку `row` в пропсе `item`.
-        // Больше не нужно искать ее по индексу!
     return (
-          <TableRow
+        <div className="flex h-full items-center justify-center">
-            {...props}
+          <p className="text-muted-foreground">{t("No connections")}</p>
-            ref={ref}
+        </div>
-            data-state={row.getIsSelected() && "selected"}
-            className="cursor-pointer hover:bg-muted/50"
-            onClick={() => onShowDetail(row.original.connectionData)}
-          />
-        );
-      }),
-      TableBody: React.forwardRef<HTMLTableSectionElement>((props, ref) => (
-        <TableBody {...props} ref={ref} />
-      )),
-    }),
-    [],
     );
+  }
 
   return (
-    <div className="h-full rounded-md border overflow-hidden">
+      <div className="rounded-md border relative bg-background">
-      {connRows.length > 0 ? (
+        <Table
-        <TableVirtuoso
+            className="w-full border-collapse table-fixed"
-          scrollerRef={scrollerRef}
+            style={{
-          data={table.getRowModel().rows}
+              width: totalTableWidth,
-          components={VirtuosoTableComponents}
+              minWidth: "100%",
-          fixedHeaderContent={() =>
+            }}
-            table.getHeaderGroups().map((headerGroup) => (
+        >
+          <TableHeader>
+            {table.getHeaderGroups().map((headerGroup) => (
                 <TableRow
                     key={headerGroup.id}
-                className="hover:bg-transparent bg-background/95 backdrop-blur"
+                    className="hover:bg-transparent border-b-0 h-10"
                 >
                   {headerGroup.headers.map((header) => (
                       <TableHead
                           key={header.id}
-                    style={{ width: header.getSize() }}
+                          className={cn(
-                    className="p-2"
+                              "sticky top-0 z-10",
+                              "p-2 text-xs font-semibold select-none border-r last:border-r-0 bg-background h-10"
+                          )}
+                          style={{
+                            width: header.getSize(),
+                            minWidth: header.column.columnDef.minSize,
+                            maxWidth: header.column.columnDef.maxSize,
+                          }}
                       >
+                        <div className="flex items-center justify-between h-full">
                           {header.isPlaceholder
                               ? null
                               : flexRender(
                                   header.column.columnDef.header,
-                          header.getContext(),
+                                  header.getContext()
+                              )}
+                        </div>
+                        {header.column.getCanResize() && (
+                            <ColumnResizer header={header} />
                         )}
                       </TableHead>
                   ))}
                 </TableRow>
-            ))
+            ))}
-          }
+          </TableHeader>
-          itemContent={(index, row) => (
+
-            <>
+          <TableBody>
+            {table.getRowModel().rows.map((row) => (
+                <TableRow
+                    key={row.id}
+                    data-state={row.getIsSelected() && "selected"}
+                    className="cursor-pointer hover:bg-muted/50 transition-colors"
+                    onClick={() => onShowDetail(row.original.connectionData)}
+                >
                   {row.getVisibleCells().map((cell) => (
                       <TableCell
                           key={cell.id}
-                  style={{ width: cell.column.getSize() }}
+                          className="p-2 whitespace-nowrap overflow-hidden text-ellipsis text-sm border-r last:border-r-0"
-                  className="p-2 whitespace-nowrap"
+                          style={{
-                  onClick={() => onShowDetail(row.original.connectionData)}
+                            width: cell.column.getSize(),
+                            minWidth: cell.column.columnDef.minSize,
+                            maxWidth: cell.column.columnDef.maxSize,
+                          }}
                       >
                         {flexRender(cell.column.columnDef.cell, cell.getContext())}
                       </TableCell>
                   ))}
-            </>
+                </TableRow>
-          )}
+            ))}
-        />
+          </TableBody>
-      ) : (
+        </Table>
-        <div className="flex h-full items-center justify-center">
-          <p>No results.</p>
-        </div>
-      )}
       </div>
   );
 };

src/pages/connections.tsx

@@ -49,18 +49,37 @@ import {
   PauseCircle,
   ArrowDown,
   ArrowUp,
-  Menu,
 } from "lucide-react";
 import {SidebarTrigger} from "@/components/ui/sidebar";
 
+interface IConnectionsItem {
+  id: string;
+  metadata: {
+    host: string;
+    destinationIP: string;
+    process?: string;
+  };
+  start?: string;
+  curUpload?: number;
+  curDownload?: number;
+}
+
+interface IConnections {
+  uploadTotal: number;
+  downloadTotal: number;
+  connections: IConnectionsItem[];
+  data: IConnectionsItem[];
+}
+
+type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
+
 const initConn: IConnections = {
   uploadTotal: 0,
   downloadTotal: 0,
   connections: [],
+  data: [],
 };
 
-type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
-
 const ConnectionsPage = () => {
   const { t } = useTranslation();
   const pageVisible = useVisibility();
@@ -77,9 +96,9 @@ const ConnectionsPage = () => {
                 new Date(b.start || "0").getTime()! -
                 new Date(a.start || "0").getTime()!,
         ),
-    "Upload Speed": (list) => list.sort((a, b) => b.curUpload! - a.curUpload!),
+    "Upload Speed": (list) => list.sort((a, b) => (b.curUpload ?? 0) - (a.curUpload ?? 0)),
     "Download Speed": (list) =>
-      list.sort((a, b) => b.curDownload! - a.curDownload!),
+        list.sort((a, b) => (b.curDownload ?? 0) - (a.curDownload ?? 0)),
   };
 
   const [isPaused, setIsPaused] = useState(false);
@@ -91,6 +110,7 @@ const ConnectionsPage = () => {
       uploadTotal: connections.uploadTotal,
       downloadTotal: connections.downloadTotal,
       connections: connections.data,
+      data: connections.data,
     };
     if (isPaused) return frozenData ?? currentData;
     return currentData;
@@ -147,6 +167,7 @@ const ConnectionsPage = () => {
           uploadTotal: connections.uploadTotal,
           downloadTotal: connections.downloadTotal,
           connections: connections.data,
+          data: connections.data,
         });
       } else {
         setFrozenData(null);
@@ -155,13 +176,13 @@ const ConnectionsPage = () => {
     });
   }, [connections]);
 
+  const headerHeight = "7rem";
+
   return (
-    <div className="h-full w-full relative">
+      <div className="relative h-full w-full">
         <div
-        className={cn(
+            className="absolute top-0 left-0 right-0 z-20 p-4 bg-background/80 backdrop-blur-sm"
-          "absolute top-0 left-0 right-0 z-10 p-4 transition-all duration-200",
+            style={{ height: headerHeight }}
-          { "bg-background/80 backdrop-blur-sm shadow-sm": isScrolled },
-        )}
         >
           <div className="flex justify-between items-center">
             <div className="w-10">
@@ -255,11 +276,15 @@ const ConnectionsPage = () => {
           </div>
         </div>
 
-      <div className="absolute top-0 left-0 right-0 bottom-0 pt-28">
+        <div
+            ref={scrollerRefCallback}
+            className="absolute left-0 right-0 bottom-0 overflow-y-auto"
+            style={{ top: headerHeight }}
+        >
           {filterConn.length === 0 ? (
               <BaseEmpty />
           ) : isTableLayout ? (
-          <div className="p-4 pt-0 h-full w-full">
+              <div className="p-4 pt-0">
                 <ConnectionTable
                     connections={filterConn}
                     onShowDetail={(detail) => detailRef.current?.open(detail)}

src/services/types.d.ts

@@ -154,7 +154,7 @@ interface IConnectionsItem {
   start: string;
   chains: string[];
   rule: string;
-  rulePayload: string;
+  rulePayload?: string;
   curUpload?: number; // upload speed, calculate at runtime
   curDownload?: number; // download speed, calculate at runtime
 }