fix(ui): перенести таблицы Firewall и проверить порядок правил

This commit is contained in:
Denozordec committed 2026-09-14 13:39:47 +07:00
1 parent 45530cdb99
commit f81b35308b
4 files changed
+154 -23

No files matched your search

@@ -1,18 +1,19 @@
"use client"
import { dataGridFeatures, type DataGridFeatures } from "@/components/reui/data-grid"
import { useMemo } from "react"
import {
type ColumnDef,
getCoreRowModel,
useReactTable,
} from "@tanstack/react-table-v8"
useTable,
} from "@tanstack/react-table"
import { ActionBadge, ChainBadge } from "@/components/data-grids/firewall-rules-data-grid"
import { DataGridShell } from "@/components/data-grids/shared/legacy-data-grid-shell"
import { DataGridShell } from "@/components/data-grids/shared/data-grid-shell"
import {
DATA_GRID_CELL_PAD,
DATA_GRID_CELL_PAD_FIRST,
DATA_GRID_CELL_PAD_LAST,
} from "@/components/data-grids/shared/legacy-data-grid-layout"
} from "@/components/data-grids/shared/data-grid-layout"
import { cn } from "@/lib/utils"
import { PowerIcon, Trash2Icon } from "lucide-react"
@@ -53,7 +54,7 @@ function FirewallScenarioRulesDataGrid({
[rules],
)
const columns = useMemo<ColumnDef<ScenarioRuleRow & { _index: number }>[]>(
const columns = useMemo<ColumnDef<DataGridFeatures, ScenarioRuleRow & { _index: number }>[]>(
() => [
{
id: "index",
@@ -154,7 +155,7 @@ function FirewallScenarioRulesDataGrid({
cell: ({ row }) => {
const index = row.original._index - 1
return (
<div className="flex items-center gap-0.5 justify-end opacity-0 group-hover/row:opacity-100 transition-opacity">
<div className="flex items-center gap-0.5 justify-end opacity-0 group-hover/row:opacity-100 focus-within:opacity-100 transition-opacity">
<button
type="button"
onClick={() => onToggleEnabled(row.original.id)}
@@ -166,6 +167,7 @@ function FirewallScenarioRulesDataGrid({
<button
type="button"
onClick={() => onMoveUp(row.original.id)}
aria-label={`Поднять правило ${index + 1}`}
disabled={index === 0}
className="p-0.5 text-muted-foreground/40 hover:text-foreground disabled:opacity-20 transition-colors"
>
@@ -174,6 +176,7 @@ function FirewallScenarioRulesDataGrid({
<button
type="button"
onClick={() => onMoveDown(row.original.id)}
aria-label={`Опустить правило ${index + 1}`}
disabled={index === rules.length - 1}
className="p-0.5 text-muted-foreground/40 hover:text-foreground disabled:opacity-20 transition-colors"
>
@@ -182,6 +185,7 @@ function FirewallScenarioRulesDataGrid({
<button
type="button"
onClick={() => onRemove(row.original.id)}
aria-label={`Удалить правило ${index + 1}`}
className="p-0.5 ml-0.5 text-muted-foreground/40 hover:text-red-500 transition-colors"
>
<Trash2Icon className="size-3.5" />
@@ -195,10 +199,12 @@ function FirewallScenarioRulesDataGrid({
[onMoveDown, onMoveUp, onRemove, onToggleEnabled, rules.length],
)
const table = useReactTable({
const table = useTable({
features: dataGridFeatures,
manualPagination: true,
manualSorting: true,
data: indexedRules,
columns,
getCoreRowModel: getCoreRowModel(),
getRowId: (row) => row.id,
})