fix(ui): проверять права и сохранять достоверность общей сводки

This commit is contained in:
Denozordec committed 2026-10-03 19:33:10 +07:00
1 parent b109532f33
commit 1999e8160e
9 files changed
+124 -117

No files matched your search

+37 -45
View File
@@ -12,16 +12,16 @@ import {
} from "@/components/ui/sidebar"
import { navigationGroups } from "@/lib/navigation"
import { useDataSource } from "@/lib/data-source"
import { can } from "@/lib/auth"
import { can,ensureAuthConfig } from "@/lib/auth"
import { useEvoBGP } from "@/lib/evobgp-context"
import { requestJson } from "@/shared/api/http-client"
import {getSidebarCounts,getSidebarGreCount} from "@/shared/api/sidebar-counts"
import {
formatSidebarBadgeCount,
mockSidebarBadgesByUrl,
type SidebarCountsDto,
} from "@/lib/sidebar-badges"
type LiveSidebarCounts = SidebarCountsDto & {
type LiveSidebarCounts = Partial<SidebarCountsDto> & {
greTunnels?: number
certificates?: number
wireguard?: number
@@ -36,43 +36,32 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
const { mode, backendUrl, prefsHydrated } = useDataSource()
const evo = useEvoBGP()
const [mounted, setMounted] = React.useState(false)
const [liveCounts, setLiveCounts] = React.useState<LiveSidebarCounts | null>(null)
const [snapshot, setSnapshot] = React.useState<{source:string;counts:LiveSidebarCounts}|null>(null)
const source=JSON.stringify([mode,backendUrl]),liveCounts=snapshot?.source===source?snapshot.counts:null
const countsAllowed=can("mm:dashboard:read"),greAllowed=can("mm:filters:read")
const mockBadges = React.useMemo(() => mockSidebarBadgesByUrl(), [])
React.useEffect(() => {
queueMicrotask(() => {
setMounted(true)
})
let cancelled=false
void ensureAuthConfig().then(()=>{if(!cancelled)setMounted(true)})
return()=>{cancelled=true}
}, [])
React.useEffect(() => {
if (!prefsHydrated || mode !== "live") {
if (mode !== "live") setLiveCounts(null)
return
if(!mounted||!prefsHydrated||mode!=="live")return
let cancelled=false,revision=0,controller:AbortController|null=null
const load=async()=>{
controller?.abort();controller=new AbortController();const request=++revision,signal=AbortSignal.any([controller.signal,AbortSignal.timeout(30_000)])
const publish=(counts:LiveSidebarCounts)=>{if(cancelled||request!==revision)return;setSnapshot(previous=>({source,counts:{...(previous?.source===source?previous.counts:{}),...counts}}))}
await Promise.allSettled([
can("mm:dashboard:read")?getSidebarCounts(backendUrl,signal).then(counts=>{if(can("mm:dashboard:read"))publish(counts)}):Promise.resolve(),
can("mm:filters:read")?getSidebarGreCount(backendUrl,signal).then(greTunnels=>{if(can("mm:filters:read"))publish({greTunnels})}):Promise.resolve(),
])
}
let cancelled = false
const load = async () => {
try {
const [cJson, gJson] = await Promise.all([
requestJson<SidebarCountsDto>(backendUrl, "/api/sidebar-counts"),
requestJson<{ tunnels?: unknown[] }>(backendUrl, "/api/filters/gre-tunnels").catch(
() => ({ tunnels: [] as unknown[] }),
),
])
if (cancelled) return
setLiveCounts({ ...cJson, greTunnels: (gJson.tunnels ?? []).length })
} catch {
if (!cancelled) setLiveCounts(null)
}
}
void load()
const id = window.setInterval(load, 120_000)
return () => {
cancelled = true
window.clearInterval(id)
}
}, [mode, backendUrl, prefsHydrated])
void load();const timer=window.setInterval(load,120_000)
return()=>{cancelled=true;revision++;controller?.abort();window.clearInterval(timer)}
},[mounted,mode,backendUrl,prefsHydrated,source,countsAllowed,greAllowed])
const navGroups = React.useMemo((): NavGroup[] => {
function badgeFor(url: string): string | undefined {
@@ -86,19 +75,22 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
return formatSidebarBadgeCount(evo.snapshot.asns.length)
}
if (!liveCounts) return undefined
if (!liveCounts||(!countsAllowed&&url!=="/gre")) return undefined
const permission=({"/servers":"mm:servers:read","/users":"mm:users:read","/filters":"mm:filters:read","/uptime":"mm:uptime:read","/gre":"mm:filters:read","/certificates":"mm:certificates:read","/wireguard":"mm:network:read","/ipsec":"mm:network:read","/bgp":"mm:bgp:read","/vxlan":"mm:network:read","/containers":"mm:dashboard:read"} as Record<string,string>)[url]
if(permission&&!can(permission))return undefined
const format=(value:number|undefined)=>value===undefined?undefined:formatSidebarBadgeCount(value)
if (url === "/servers") return formatSidebarBadgeCount(liveCounts.servers)
if (url === "/users") return formatSidebarBadgeCount(liveCounts.users ?? 0)
if (url === "/filters") return formatSidebarBadgeCount(liveCounts.filterRules)
if (url === "/uptime") return formatSidebarBadgeCount(liveCounts.monitoringItems)
if (url === "/gre") return formatSidebarBadgeCount(liveCounts.greTunnels ?? 0)
if (url === "/certificates") return formatSidebarBadgeCount(liveCounts.certificates ?? 0)
if (url === "/wireguard") return formatSidebarBadgeCount(liveCounts.wireguard ?? 0)
if (url === "/ipsec") return formatSidebarBadgeCount(liveCounts.ipsec ?? 0)
if (url === "/bgp") return formatSidebarBadgeCount(liveCounts.bgpSessions ?? 0)
if (url === "/vxlan") return formatSidebarBadgeCount(liveCounts.vxlan ?? 0)
if (url === "/containers") return formatSidebarBadgeCount(liveCounts.containers ?? 0)
if (url === "/servers") return format(liveCounts.servers)
if (url === "/users") return format(liveCounts.users )
if (url === "/filters") return format(liveCounts.filterRules)
if (url === "/uptime") return format(liveCounts.monitoringItems)
if (url === "/gre") return format(liveCounts.greTunnels )
if (url === "/certificates") return format(liveCounts.certificates )
if (url === "/wireguard") return format(liveCounts.wireguard )
if (url === "/ipsec") return format(liveCounts.ipsec )
if (url === "/bgp") return format(liveCounts.bgpSessions )
if (url === "/vxlan") return format(liveCounts.vxlan )
if (url === "/containers") return format(liveCounts.containers )
return undefined
}
@@ -112,7 +104,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
badge: mounted ? badgeFor(it.url) : undefined,
})),
}))
}, [mounted, mode, liveCounts, mockBadges, evo.settingsLoaded, evo.enabled, evo.snapshot])
}, [mounted, mode, liveCounts, countsAllowed, mockBadges, evo.settingsLoaded, evo.enabled, evo.snapshot])
return (
<Sidebar collapsible="icon" {...props}>