feat(ui): Service-Badges + Routen-Toggle

Firewall: nftables-Status im Tab-Bar (tabBarExtraContent).
DNS: unbound-Status im Tab-Bar.
Routes: inline Switch statt on/off-Tags.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Debian
2026-05-24 11:44:02 +02:00
parent ba907f5403
commit dd3e001312
3 changed files with 75 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
import { useState } from 'react' import { useState } from 'react'
import { Alert, Button, Drawer, Form, Input, InputNumber, Modal, Select, Space, Switch, Tabs, Tag, Typography, message } from 'antd' import { Alert, Button, Drawer, Form, Input, InputNumber, Modal, Select, Space, Switch, Tabs, Tag, Typography, message } from 'antd'
import type { ColumnsType } from 'antd/es/table' import type { ColumnsType } from 'antd/es/table'
import { GlobalOutlined, NodeIndexOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons' import { CheckCircleOutlined, CloseCircleOutlined, GlobalOutlined, NodeIndexOutlined, PlusOutlined, SettingOutlined } from '@ant-design/icons'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
@@ -71,8 +71,21 @@ async function listSystemInterfaces(): Promise<SystemIface[]> {
return (r.data.data as { interfaces?: SystemIface[] }).interfaces ?? [] return (r.data.data as { interfaces?: SystemIface[] }).interfaces ?? []
} }
interface ServiceStatus { label: string; unit: string; active: boolean; state: string }
export default function DNSPage() { export default function DNSPage() {
const { t } = useTranslation() const { t } = useTranslation()
const { data: services } = useQuery({
queryKey: ['system', 'services'],
queryFn: async () => {
const r = await apiClient.get('/system/services')
return isEnvelope(r.data) ? (r.data.data as { services: ServiceStatus[] }).services : []
},
refetchInterval: 30_000,
})
const unbound = services?.find(s => s.unit === 'unbound.service' || s.unit === 'unbound')
return ( return (
<div> <div>
<PageHeader <PageHeader
@@ -82,6 +95,17 @@ export default function DNSPage() {
/> />
<Tabs <Tabs
defaultActiveKey="zones" defaultActiveKey="zones"
tabBarExtraContent={unbound && (
<Tag
icon={unbound.active ? <CheckCircleOutlined /> : <CloseCircleOutlined />}
color={unbound.active ? 'green' : 'red'}
>
<Space size={4}>
<span>unbound</span>
<span style={{ fontWeight: 400, opacity: 0.85 }}>{unbound.state}</span>
</Space>
</Tag>
)}
items={[ items={[
{ key: 'zones', label: <span><NodeIndexOutlined /> {t('dns.tabs.zones')}</span>, children: <ZonesTab /> }, { key: 'zones', label: <span><NodeIndexOutlined /> {t('dns.tabs.zones')}</span>, children: <ZonesTab /> },
{ key: 'settings', label: <span><SettingOutlined /> {t('dns.tabs.settings')}</span>, children: <SettingsTab /> }, { key: 'settings', label: <span><SettingOutlined /> {t('dns.tabs.settings')}</span>, children: <SettingsTab /> },

View File

@@ -1,7 +1,9 @@
import { Tabs } from 'antd' import { Space, Tag, Tabs } from 'antd'
import { FireOutlined } from '@ant-design/icons' import { CheckCircleOutlined, CloseCircleOutlined, FireOutlined } from '@ant-design/icons'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useQuery } from '@tanstack/react-query'
import apiClient, { isEnvelope } from '../../api/client'
import PageHeader from '../../components/PageHeader' import PageHeader from '../../components/PageHeader'
import AddressObjectsTab from './AddressObjects' import AddressObjectsTab from './AddressObjects'
import AddressGroupsTab from './AddressGroups' import AddressGroupsTab from './AddressGroups'
@@ -12,9 +14,21 @@ import NATRulesTab from './NATRules'
import SystemRulesCard from './SystemRules' import SystemRulesCard from './SystemRules'
import ZonesTab from './Zones' import ZonesTab from './Zones'
interface ServiceStatus { label: string; unit: string; active: boolean; state: string }
export default function FirewallPage() { export default function FirewallPage() {
const { t } = useTranslation() const { t } = useTranslation()
const { data: services } = useQuery({
queryKey: ['system', 'services'],
queryFn: async () => {
const r = await apiClient.get('/system/services')
return isEnvelope(r.data) ? (r.data.data as { services: ServiceStatus[] }).services : []
},
refetchInterval: 30_000,
})
const nftables = services?.find(s => s.unit === 'nftables.service' || s.unit === 'nftables')
const tabs = [ const tabs = [
{ key: 'rules', label: t('fw.tabs.rules'), children: <RulesTab /> }, { key: 'rules', label: t('fw.tabs.rules'), children: <RulesTab /> },
{ key: 'nat', label: t('fw.tabs.nat'), children: <NATRulesTab /> }, { key: 'nat', label: t('fw.tabs.nat'), children: <NATRulesTab /> },
@@ -33,7 +47,21 @@ export default function FirewallPage() {
title={t('fw.title')} title={t('fw.title')}
subtitle={t('fw.intro')} subtitle={t('fw.intro')}
/> />
<Tabs items={tabs} defaultActiveKey="rules" /> <Tabs
items={tabs}
defaultActiveKey="rules"
tabBarExtraContent={nftables && (
<Tag
icon={nftables.active ? <CheckCircleOutlined /> : <CloseCircleOutlined />}
color={nftables.active ? 'green' : 'red'}
>
<Space size={4}>
<span>nftables</span>
<span style={{ fontWeight: 400, opacity: 0.85 }}>{nftables.state}</span>
</Space>
</Tag>
)}
/>
</div> </div>
) )
} }

View File

@@ -99,6 +99,14 @@ export default function RoutesTab() {
onSuccess: () => { qc.invalidateQueries({ queryKey: ['routes'] }) }, onSuccess: () => { qc.invalidateQueries({ queryKey: ['routes'] }) },
onError: (e: Error) => message.error(e.message), onError: (e: Error) => message.error(e.message),
}) })
const quickToggle = useMutation({
mutationFn: async ({ id, row, checked }: { id: number; row: ManagedRoute; checked: boolean }) => {
const { id: _id, ...body } = row
await apiClient.put(`/routes/${id}`, { ...body, active: checked })
},
onSuccess: () => { qc.invalidateQueries({ queryKey: ['routes'] }) },
onError: (e: Error) => message.error(e.message),
})
const managedColumns: ColumnsType<ManagedRoute> = [ const managedColumns: ColumnsType<ManagedRoute> = [
{ {
@@ -115,8 +123,17 @@ export default function RoutesTab() {
render: (v?: string) => v ? <Tag>{v}</Tag> : '—' }, render: (v?: string) => v ? <Tag>{v}</Tag> : '—' },
{ title: t('routes.col.metric'), dataIndex: 'metric', width: 80 }, { title: t('routes.col.metric'), dataIndex: 'metric', width: 80 },
{ title: t('routes.col.table'), dataIndex: 'table_name', width: 90 }, { title: t('routes.col.table'), dataIndex: 'table_name', width: 90 },
{ title: t('routes.col.active'), dataIndex: 'active', width: 80, {
render: (v: boolean) => v ? <Tag color="green">on</Tag> : <Tag>off</Tag> }, title: t('routes.col.active'), dataIndex: 'active', width: 80,
render: (v: boolean, row: ManagedRoute) => (
<Switch
size="small"
checked={v}
loading={quickToggle.isPending && quickToggle.variables?.id === row.id}
onChange={(checked) => quickToggle.mutate({ id: row.id, row, checked })}
/>
),
},
{ title: t('routes.col.comment'), dataIndex: 'comment', { title: t('routes.col.comment'), dataIndex: 'comment',
render: (v?: string) => v || <Text type="secondary"></Text> }, render: (v?: string) => v || <Text type="secondary"></Text> },
{ {