fix(config): добавить новые зависимости и обновить конфигурацию компонентов
Docker images / prepare-release (push) Successful in 5s
Docker images / backend-image (push) Successful in 2m37s
Docker images / frontend-image (push) Successful in 2m22s
Docker images / updater-image (push) Successful in 38s
Docker images / notify-webhook (push) Has been skipped
Docker images / publish-release (push) Successful in 8s

This commit is contained in:
Denozordec
2026-06-30 21:30:40 +07:00
parent 009011a917
commit a1a9124f3d
80 changed files with 13310 additions and 1587 deletions
+144
View File
@@ -0,0 +1,144 @@
import re
from pathlib import Path
path = Path(__file__).resolve().parents[2] / "app" / "(main)" / "servers" / "page.tsx"
text = path.read_text(encoding="utf-8")
text = text.replace(
'import { Fragment, useEffect, useMemo, useState } from "react"\n'
'import { PageHeader } from "@/components/page-header"\n'
'import { StatusBadge } from "@/components/status-badge"',
'import { useEffect, useMemo, useState } from "react"\n'
'import { PageHeader } from "@/components/page-header"\n'
'import { FormField, FormToggle, SectionTitle, SegmentedControl } from "@/components/form-kit"\n'
'import { DataPageToolbar } from "@/components/data-page-toolbar"\n'
'import { ServersDataGrid } from "@/components/data-grids/servers-data-grid"',
1,
)
text = text.replace(
"""import {
DropdownMenu, DropdownMenuTrigger, DropdownMenuContent,
DropdownMenuItem, DropdownMenuSeparator, DropdownMenuLabel, DropdownMenuGroup,
} from "@/components/ui/dropdown-menu"
""",
"""import {
Stepper,
StepperContent,
StepperIndicator,
StepperItem,
StepperNav,
StepperPanel,
StepperSeparator,
StepperTitle,
StepperTrigger,
} from "@/components/reui/stepper"
""",
1,
)
text = text.replace(
"""import {
SearchIcon, RefreshCwIcon, DownloadIcon, PlusIcon, TrashIcon,
MoreHorizontalIcon, EyeIcon, EyeOffIcon,
ChevronRightIcon, ChevronDownIcon,
CheckCircleIcon, XCircleIcon, LoaderCircleIcon,
ShieldIcon, WifiIcon, PencilIcon, PowerIcon, Trash2Icon, ExternalLinkIcon,
HomeIcon, ServerIcon, NetworkIcon,
} from "lucide-react\"""",
"""import {
RefreshCwIcon, DownloadIcon, PlusIcon, TrashIcon,
EyeIcon, EyeOffIcon,
ChevronRightIcon, ChevronDownIcon,
CheckCircleIcon, XCircleIcon, LoaderCircleIcon,
ShieldIcon, WifiIcon,
HomeIcon, ServerIcon, NetworkIcon,
} from "lucide-react\"""",
1,
)
text = re.sub(
r"// ─── RouterOS version utilities.*?// ─── Countries ─",
"// ─── Countries ─",
text,
count=1,
flags=re.S,
)
text = re.sub(
r"// ─── Type config ─.*?// ─── Shared small components ─",
"// ─── Shared small components ─",
text,
count=1,
flags=re.S,
)
text = re.sub(
r"function Field\(\{ label, hint, required, children \}:.*?^}\n\n// ─── Country field",
"// ─── Country field",
text,
count=1,
flags=re.S | re.M,
)
text = text.replace(
"const [expandedId, setExpandedId] = useState<string | null>(null)",
"const [sheetStep, setSheetStep] = useState(1)",
1,
)
text = text.replace(
'setForm(defaultForm); setTestState("idle"); setTestMsg("")\n setOpen(true)',
'setForm(defaultForm); setTestState("idle"); setTestMsg("")\n setSheetStep(1)\n setOpen(true)',
1,
)
text = text.replace(
'setTestState("idle"); setTestMsg(""); setOpen(true)',
'setTestState("idle"); setTestMsg(""); setSheetStep(1); setOpen(true)',
1,
)
text = re.sub(r"<Field\b", "<FormField", text)
text = re.sub(r"</Field>", "</FormField>", text)
text = re.sub(r"<Toggle\b", "<FormToggle", text)
new_table = """ {/* Table */}
<Card>
<DataPageToolbar
segmented={{
value: typeFilter,
onChange: setTypeFilter,
options: tabs.map((tab) => ({
value: tab.value,
label: tab.label,
count: tab.value === "all" ? counts.all : counts[tab.value as ServerType],
})),
}}
search={search}
onSearchChange={setSearch}
searchPlaceholder="Поиск по имени, хосту…"
countLabel={`${filtered.length} серверов`}
/>
<ServersDataGrid
servers={filtered}
isLive={isLive}
pollingIds={pollingIds}
onPoll={handlePoll}
onEdit={openEdit}
onDelete={handleDelete}
onToggleStatus={handleToggleStatus}
/>
</Card>
"""
text = re.sub(
r" \{/\* Table \*/\}\n <Card>.*?</Card>\n",
new_table,
text,
count=1,
flags=re.S,
)
path.write_text(text, encoding="utf-8")
print("patched", path)
+144
View File
@@ -0,0 +1,144 @@
import re
from pathlib import Path
path = Path(__file__).resolve().parents[2] / "app" / "(main)" / "servers" / "page.tsx"
text = path.read_text(encoding="utf-8")
# Wrap sheet form in stepper
text = text.replace(
""" <div className="flex-1 overflow-y-auto px-6 py-5 flex flex-col gap-5">
{/* 1. Основные */}
<div className="flex flex-col gap-4">
<SectionTitle>Основные</SectionTitle>""",
""" <Stepper value={sheetStep} onValueChange={setSheetStep} className="flex-1 flex flex-col min-h-0 px-6 py-5">
<StepperNav className="mb-5">
<StepperItem step={1}>
<StepperTrigger>
<StepperIndicator>1</StepperIndicator>
<StepperTitle className="sr-only">Основные</StepperTitle>
</StepperTrigger>
<StepperSeparator />
</StepperItem>
<StepperItem step={2}>
<StepperTrigger>
<StepperIndicator>2</StepperIndicator>
<StepperTitle className="sr-only">WAN</StepperTitle>
</StepperTrigger>
<StepperSeparator />
</StepperItem>
<StepperItem step={3}>
<StepperTrigger>
<StepperIndicator>3</StepperIndicator>
<StepperTitle className="sr-only">API</StepperTitle>
</StepperTrigger>
<StepperSeparator />
</StepperItem>
<StepperItem step={4}>
<StepperTrigger>
<StepperIndicator>4</StepperIndicator>
<StepperTitle className="sr-only">Дополнительно</StepperTitle>
</StepperTrigger>
</StepperItem>
</StepperNav>
<StepperPanel className="flex-1 overflow-y-auto">
<StepperContent value={1} className="flex flex-col gap-4">""",
1,
)
text = text.replace(
""" </div>
{/* 2. WAN-аплинки (только для home-router) */}
{isHomeRouter && (
<div className="flex flex-col gap-4">
<SectionTitle>WAN-аплинки</SectionTitle>""",
""" </StepperContent>
<StepperContent value={2} className="flex flex-col gap-4">
<SectionTitle>WAN-аплинки</SectionTitle>""",
1,
)
text = text.replace(
""" </div>
)}
{/* 3. Подключение (API) */}
<div className="flex flex-col gap-4">
<SectionTitle>Подключение (RouterOS REST API)</SectionTitle>""",
""" </StepperContent>
<StepperContent value={3} className="flex flex-col gap-4">
<SectionTitle>Подключение (RouterOS REST API)</SectionTitle>""",
1,
)
text = text.replace(
""" </div>
{/* 4. Дополнительно */}
<div className="flex flex-col gap-4">
<button type="button" onClick={() => set("showAdvanced", !form.showAdvanced)}""",
""" </StepperContent>
<StepperContent value={4} className="flex flex-col gap-4">
<button type="button" onClick={() => set("showAdvanced", !form.showAdvanced)}""",
1,
)
text = text.replace(
""" </div>
</div>
<SheetFooter className="px-6 py-4 border-t shrink-0 flex-row gap-2">
<SheetClose render={<Button variant="outline" className="flex-1" />}>Отмена</SheetClose>
<Button className="flex-1" onClick={handleSave}>
{sheetMode === "edit" ? "Сохранить" : "Добавить сервер"}
</Button>
</SheetFooter>""",
""" </StepperContent>
</StepperPanel>
</Stepper>
<SheetFooter className="px-6 py-4 border-t shrink-0 flex-row gap-2">
<SheetClose render={<Button variant="outline" />}>Отмена</SheetClose>
{sheetStep > 1 && (
<Button variant="outline" onClick={() => setSheetStep((s) => s - 1)}>Назад</Button>
)}
{sheetStep < 4 ? (
<Button className="ml-auto" onClick={() => setSheetStep((s) => s + 1)}>Далее</Button>
) : (
<Button className="ml-auto" onClick={handleSave}>
{sheetMode === "edit" ? "Сохранить" : "Добавить сервер"}
</Button>
)}
</SheetFooter>""",
1,
)
# WAN step 2: show message when not home router
text = text.replace(
""" <StepperContent value={2} className="flex flex-col gap-4">
<SectionTitle>WAN-аплинки</SectionTitle>
<WanUplinkEditor""",
""" <StepperContent value={2} className="flex flex-col gap-4">
<SectionTitle>WAN-аплинки</SectionTitle>
{!isHomeRouter ? (
<p className="text-sm text-muted-foreground">WAN-аплинки доступны только для типа Home Router.</p>
) : (
<WanUplinkEditor""",
1,
)
text = text.replace(
""" />
</StepperContent>
<StepperContent value={3}""",
""" />
)}
</StepperContent>
<StepperContent value={3}""",
1,
)
path.write_text(text, encoding="utf-8")
print("stepper patched")