From fd16d501074f186acefb7f30fd019cbb80feb1bc Mon Sep 17 00:00:00 2001 From: Alex Hope-O'Connor Date: Mon, 9 Mar 2026 23:22:13 +1000 Subject: [PATCH] Add DNS Records and Filters pages; unify effective config layout - Add EffectiveConfigContext.DnsRecords and .Filters; map in EffectiveConfigViews - Add DnsRecords.razor and Filters.razor with context-scoped effective config - Add nav links for DNS records and Filters (icons: diagram-3-fill, funnel-fill) - Put effective config block at top of Hosts, DHCP, DNS Records, Filters (no config file list on sub-pages) - Hosts view: add expand-hosts to allow-list. Filters view: add domain-needed, bogus-priv, filterwin2k, no-round-robin - Page titles: Hosts Configuration, DHCP Configuration, DNS Records Configuration, Filters Configuration - Remove 'Config affecting...' subheadings and page intro text; add .page-intro and .page-chip styles --- .../Components/Layout/NavMenu.razor | 10 +++ src/DnsmasqWebUI/Components/Pages/Dhcp.razor | 10 +-- .../Components/Pages/DnsRecords.razor | 64 +++++++++++++++++++ .../Components/Pages/Filters.razor | 63 ++++++++++++++++++ src/DnsmasqWebUI/Components/Pages/Hosts.razor | 3 +- .../Helpers/Config/EffectiveConfigViews.cs | 35 ++++++++++ .../EffectiveConfig/EffectiveConfigContext.cs | 6 ++ src/DnsmasqWebUI/wwwroot/app.css | 35 ++++++++++ 8 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 src/DnsmasqWebUI/Components/Pages/DnsRecords.razor create mode 100644 src/DnsmasqWebUI/Components/Pages/Filters.razor diff --git a/src/DnsmasqWebUI/Components/Layout/NavMenu.razor b/src/DnsmasqWebUI/Components/Layout/NavMenu.razor index 0cee9eb..239880b 100644 --- a/src/DnsmasqWebUI/Components/Layout/NavMenu.razor +++ b/src/DnsmasqWebUI/Components/Layout/NavMenu.razor @@ -39,6 +39,16 @@ DHCP +
+ + DNS records + +
+
+ + Filters + +
Project diff --git a/src/DnsmasqWebUI/Components/Pages/Dhcp.razor b/src/DnsmasqWebUI/Components/Pages/Dhcp.razor index 4127af8..26324dc 100644 --- a/src/DnsmasqWebUI/Components/Pages/Dhcp.razor +++ b/src/DnsmasqWebUI/Components/Pages/Dhcp.razor @@ -13,7 +13,7 @@ DHCP | @AppTitle -

DHCP

+

DHCP Configuration

@if (_status == null) { @@ -24,6 +24,10 @@ } else { +
+ +
+ @* ---- Static hosts (dhcp-host= in managed file) ---- *@

Static hosts

@@ -323,10 +327,6 @@ else }
-
-

Config affecting DHCP

- -
} @code { diff --git a/src/DnsmasqWebUI/Components/Pages/DnsRecords.razor b/src/DnsmasqWebUI/Components/Pages/DnsRecords.razor new file mode 100644 index 0000000..758e6a5 --- /dev/null +++ b/src/DnsmasqWebUI/Components/Pages/DnsRecords.razor @@ -0,0 +1,64 @@ +@page "/dns-records" +@rendermode InteractiveServer +@namespace DnsmasqWebUI.Components.Pages +@inject IStatusClient StatusClient +@inject IOptions AppOptions + +DNS records | @AppTitle + +

DNS Records Configuration

+ +@if (_status == null) +{ +

+ + Loading... +

+} +else +{ +
+ +
+
+ All + CNAME + MX / SRV + PTR + TXT + A / AAAA + Other +
+} + +@code { + private string AppTitle => AppOptions!.Value!.EffectiveTitle; + private DnsmasqServiceStatus? _status; + + protected override async Task OnInitializedAsync() + { + await Load(); + } + + private async Task RefreshStatusAsync() + { + try + { + _status = await StatusClient.GetStatusAsync(); + await InvokeAsync(StateHasChanged); + } + catch { /* ignore */ } + } + + private async Task Load() + { + try + { + _status = await StatusClient.GetStatusAsync(); + } + catch + { + // Status will stay null; UI shows loading or empty + } + } +} diff --git a/src/DnsmasqWebUI/Components/Pages/Filters.razor b/src/DnsmasqWebUI/Components/Pages/Filters.razor new file mode 100644 index 0000000..d27d39f --- /dev/null +++ b/src/DnsmasqWebUI/Components/Pages/Filters.razor @@ -0,0 +1,63 @@ +@page "/filters" +@rendermode InteractiveServer +@namespace DnsmasqWebUI.Components.Pages +@inject IStatusClient StatusClient +@inject IOptions AppOptions + +Filters | @AppTitle + +

Filters Configuration

+ +@if (_status == null) +{ +

+ + Loading... +

+} +else +{ +
+ +
+
+ All + Blocking / sinkhole + Split DNS + Safety + Response shaping + Firewall +
+} + +@code { + private string AppTitle => AppOptions!.Value!.EffectiveTitle; + private DnsmasqServiceStatus? _status; + + protected override async Task OnInitializedAsync() + { + await Load(); + } + + private async Task RefreshStatusAsync() + { + try + { + _status = await StatusClient.GetStatusAsync(); + await InvokeAsync(StateHasChanged); + } + catch { /* ignore */ } + } + + private async Task Load() + { + try + { + _status = await StatusClient.GetStatusAsync(); + } + catch + { + // Status will stay null; UI shows loading or empty + } + } +} diff --git a/src/DnsmasqWebUI/Components/Pages/Hosts.razor b/src/DnsmasqWebUI/Components/Pages/Hosts.razor index f49be32..513e28c 100644 --- a/src/DnsmasqWebUI/Components/Pages/Hosts.razor +++ b/src/DnsmasqWebUI/Components/Pages/Hosts.razor @@ -6,7 +6,7 @@ @inject IOptions AppOptions Hosts | @AppTitle -

Hosts file

+

Hosts Configuration

@if (_status == null) { @@ -18,7 +18,6 @@ else {
-

Config affecting hosts

@if (string.IsNullOrEmpty(_status.ManagedHostsFilePath)) diff --git a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs b/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs index 298b690..197914c 100644 --- a/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs +++ b/src/DnsmasqWebUI/Infrastructure/Helpers/Config/EffectiveConfigViews.cs @@ -20,6 +20,8 @@ public static class EffectiveConfigViews EffectiveConfigContext.All => GetAllSections(), EffectiveConfigContext.Hosts => GetHostsView(), EffectiveConfigContext.Dhcp => GetDhcpView(), + EffectiveConfigContext.DnsRecords => GetDnsRecordsView(), + EffectiveConfigContext.Filters => GetFiltersView(), _ => [], }; } @@ -38,6 +40,7 @@ public static class EffectiveConfigViews DnsmasqConfKeys.AddnHosts, DnsmasqConfKeys.Hostsdir, DnsmasqConfKeys.ReadEthers, + DnsmasqConfKeys.ExpandHosts, ]), ]; @@ -47,6 +50,38 @@ public static class EffectiveConfigViews new(EffectiveConfigSections.SectionTftpPxe, "TFTP / PXE", null), ]; + private static IReadOnlyList GetDnsRecordsView() => + [ + new(EffectiveConfigSections.SectionDnsRecords, "DNS records", null), + ]; + + private static IReadOnlyList GetFiltersView() => + [ + new(EffectiveConfigSections.SectionResolver, "Resolver / DNS", [ + DnsmasqConfKeys.DomainNeeded, + DnsmasqConfKeys.Local, + DnsmasqConfKeys.Server, + DnsmasqConfKeys.RevServer, + DnsmasqConfKeys.Address, + DnsmasqConfKeys.BogusPriv, + DnsmasqConfKeys.BogusNxdomain, + DnsmasqConfKeys.IgnoreAddress, + DnsmasqConfKeys.Alias, + DnsmasqConfKeys.Filterwin2k, + DnsmasqConfKeys.FilterA, + DnsmasqConfKeys.FilterAaaa, + DnsmasqConfKeys.FilterRr, + DnsmasqConfKeys.StopDnsRebind, + DnsmasqConfKeys.RebindLocalhostOk, + DnsmasqConfKeys.RebindDomainOk, + DnsmasqConfKeys.Ipset, + DnsmasqConfKeys.Nftset, + DnsmasqConfKeys.ConnmarkAllowlistEnable, + DnsmasqConfKeys.ConnmarkAllowlist, + DnsmasqConfKeys.NoRoundRobin, + ]), + ]; + /// /// For each section in the view, returns the context-visible descriptors for that section. /// Does not apply search; component applies search to each section's list and hides sections with no matches. diff --git a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigContext.cs b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigContext.cs index ef5bb07..9999fd3 100644 --- a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigContext.cs +++ b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigContext.cs @@ -13,4 +13,10 @@ public enum EffectiveConfigContext /// DHCP page: DHCP and TFTP/PXE sections. Dhcp, + + /// DNS records page: only DNS records section. + DnsRecords, + + /// Filters page: resolver options for blocking, split DNS, safety, ipset/nftset. + Filters, } diff --git a/src/DnsmasqWebUI/wwwroot/app.css b/src/DnsmasqWebUI/wwwroot/app.css index 3ac73c3..f382ec3 100644 --- a/src/DnsmasqWebUI/wwwroot/app.css +++ b/src/DnsmasqWebUI/wwwroot/app.css @@ -165,6 +165,41 @@ h1:focus { margin-bottom: var(--app-spacing-sm); } +/* Page intro – short description under the h1 */ +.page-intro { + color: var(--bs-secondary); + font-size: 0.9375rem; + margin-bottom: var(--app-spacing-md); + max-width: var(--app-content-max-width); +} + +/* Category/record-type chips – visual grouping, optional filter later */ +.page-chips { + display: flex; + flex-wrap: wrap; + gap: var(--app-spacing-xs); + margin-bottom: var(--app-spacing-md); +} + +.page-chip { + display: inline-flex; + align-items: center; + padding: 0.25rem 0.5rem; + font-size: 0.8125rem; + font-weight: 500; + border-radius: 9999px; + border: 1px solid var(--bs-border-color); + background: var(--bs-body-bg); + color: var(--bs-body-color); + cursor: default; +} + +.page-chip.active { + border-color: var(--app-link-color); + background: rgba(13, 110, 253, 0.08); + color: var(--app-link-color); +} + /* Wrap text instead of horizontal scroll (WCAG-friendly, better on mobile). pre-wrap keeps newlines so line-by-line is clear. */ .pre-block { font-family: var(--app-font-mono);