Merge branch 'view-ui'

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

internal/web/static/assets/pages/history.js

@@ -1,4 +1,4 @@
-import { h, mount, table, toast, confirmDialog, diffView, time, fmtTime, badge, plural } from "../ui.js";
+import { h, mount, table, toast, confirmDialog, diffView, time, fmtTime, badge, plural, backLink, lastList } from "../ui.js";
 import { api, get, useDraft } from "../api.js";
 
 export async function render(el, params) {
@@ -30,10 +30,10 @@ async function detail(el, id) {
   mount(el,
     h("div", { class: "page-head" },
       h("div", { class: "grow" },
+        backLink("History", lastList.history || "#/history"),
         h("h1", null, "Changeset #" + c.id),
         h("div", { class: "muted" }, c.description || "(no description)")),
       h("div", { class: "actions" },
-        h("a", { class: "button", href: "#/history" }, "All changes"),
         c.status === "applied" && c.undoable ? h("button", { onclick: () => revert(c) }, "Revert…") : null)),
     h("div", { class: "panel" }, h("dl", { class: "kv" },
       h("dt", null, "Status"), h("dd", null, badge(c.status, c.status === "applied" ? "ok" : "")),

internal/web/static/assets/pages/views.js

@@ -1,6 +1,6 @@
-import { h, mount, table, field, input, select, textarea, toast, errorBox, confirmDialog, modal, lines, checkbox } from "../ui.js";
+import { h, mount, table, field, input, select, textarea, toast, errorBox, confirmDialog, modal, lines, checkbox, colorPicker, backLink, safeBack, viewHref } from "../ui.js";
 import { amlContext, suggestions } from "../aml.js";
-import { get, change, describeResult } from "../api.js";
+import { api, get, change, describeResult } from "../api.js";
 import { rerender } from "../app.js";
 import { optionsEditor } from "./options.js";
 
@@ -9,6 +9,9 @@ export async function render(el, params, query) {
   const viewless = zones.filter((z) => !z.view_id);
   const optsEl = h("div");
   const selected = query.get("view") ? views.find((v) => String(v.id) === query.get("view")) : null;
+  // Opened from a view link on a zone or the zone list: offer the way back
+  // (kept while picking other views here).
+  const back = safeBack(query.get("back"));
   const move = async (i, d) => {
     const ids = views.map((v) => v.id);
     [ids[i], ids[i + d]] = [ids[i + d], ids[i]];
@@ -20,14 +23,14 @@ export async function render(el, params, query) {
   };
   mount(el,
     h("div", { class: "page-head" },
-      h("div", { class: "grow" }, h("h1", null, "Views"),
+      h("div", { class: "grow" }, back ? backLink(backLabel(back, zones), back) : null, h("h1", null, "Views"),
         h("div", { class: "muted" }, "A client sees the first view it matches (by source address, destination address or TSIG key). Order matters.")),
       h("div", { class: "actions" }, h("button", { class: "primary", onclick: () => viewDialog(null, viewless) }, "New view"))),
     views.length === 0 ? h("div", { class: "msg info" },
       "No views: every client sees the same zones. Views let you serve different answers to different clients, for example an internal view with private records and recursion for your LAN, and an external view with only public records.") : null,
     h("div", { class: "panel" }, table([
       { label: "#", render: (v, i) => String(i + 1) },
-      { label: "View", render: (v) => h("a", { href: "#/views?view=" + v.id }, h("strong", null, v.name)) },
+      { label: "View", render: (v) => h("a", { href: viewHref(v.id, back), class: v.color ? "vc-" + v.color : null }, h("strong", null, v.name)) },
       { label: "Match clients", render: (v) => (v.match_clients || []).join("; ") || h("span", { class: "muted" }, "any"), tdClass: "data" },
       { label: "Match destinations", render: (v) => (v.match_destinations || []).join("; ") || h("span", { class: "muted" }, "any"), tdClass: "data" },
       { label: "Zones", render: (v) => h("a", { href: "#/zones?view=" + encodeURIComponent(v.name) }, String(v.zone_count)) },
@@ -37,10 +40,24 @@ export async function render(el, params, query) {
         h("button", { class: "small", disabled: i === views.length - 1, title: "Move down", onclick: () => move(i, 1) }, "↓"), " ",
         h("button", { class: "small", onclick: () => viewDialog(v, viewless) }, "Edit"), " ",
         h("button", { class: "small danger", onclick: () => deleteView(v) }, "Delete")), tdClass: "actions-cell" },
-    ], views, { empty: "No views." })),
+    ], views, { empty: "No views.", rowClass: (v) => selected && v.id === selected.id ? "selected" : "" })),
     selected ? optsEl : (views.length ? h("p", { class: "muted" }, "Select a view to see its options.") : null));
-  if (selected) await optionsEditor(optsEl, { scope: "view", scope_id: selected.id, catalogScope: "view", title: "Options of view " + selected.name,
-    intro: "View options override the server options for clients in this view (for example recursion and allow-recursion)." });
+  if (selected) {
+    await optionsEditor(optsEl, { scope: "view", scope_id: selected.id, catalogScope: "view", title: "Options of view " + selected.name,
+      intro: "View options override the server options for clients in this view (for example recursion and allow-recursion)." });
+    // With a long list, scroll to the selected view's options.
+    if (views.length > 3) optsEl.scrollIntoView({ block: "start" });
+  }
+}
+
+// backLabel names the page a back address leads to.
+function backLabel(back, zones) {
+  const m = back.match(/^#\/zones\/(\d+)/);
+  if (m) {
+    const z = zones.find((z) => String(z.id) === m[1]);
+    return z ? z.display_name + (z.view ? " (" + z.view + ")" : "") : "Zone";
+  }
+  return /^#\/zones(\?|$)/.test(back) ? "Zones" : "Back";
 }
 
 async function viewDialog(v, viewless) {
@@ -51,13 +68,15 @@ async function viewDialog(v, viewless) {
   const md = textarea(v ? (v.match_destinations || []).join("\n") : "", { class: "mono", rows: 2, placeholder: "(empty = any)" });
   const mro = select([["", "(default: no)"], ["true", "yes"], ["false", "no"]], v && v.match_recursive_only !== undefined && v.match_recursive_only !== null ? String(v.match_recursive_only) : "");
   const comment = input({ value: v ? v.comment : "" });
+  const color = colorPicker(v ? v.color : "");
   const adopt = checkbox("Move the " + viewless.length + " zone(s) that are not in a view into this view", true);
   const body = h("div", null, h("div", { class: "form-grid" },
     field("Name", name),
     field("Match clients", h("div", null, mc, suggestions(mc, ctx)), "One element per line: addresses, prefixes, ACL names, key NAME, any/none/localhost/localnets; !negates. First match wins."),
     field("Match destinations", h("div", null, md, suggestions(md, ctx)), "Server addresses this view answers on (optional)."),
     field("Recursive only", mro, "If yes, only recursive queries match this view."),
-    field("Comment", comment)),
+    field("Comment", comment),
+    field("Colour", color, "How the web UI shows this view, so zones of the same view are easy to spot. Only changes the web UI: it applies at once, with no deploy.")),
     !v && viewless.length ? h("div", { class: "msg warn" }, "Once views exist, named requires every zone to be inside a view. ", adopt) : null,
     err);
   await modal(v ? "Edit view " + v.name : "New view", body, [
@@ -66,9 +85,16 @@ async function viewDialog(v, viewless) {
       const data = { name: name.value.trim(), match_clients: lines(mc.value), match_destinations: lines(md.value), comment: comment.value };
       data.match_recursive_only = mro.value === "" ? null : mro.value === "true";
       if (!v && viewless.length && adopt.input.checked) data.adopt_zones = true;
+      const colorChanged = color.value !== ((v && v.color) || "");
       try {
-        const r = v ? await change("PATCH", "/views/" + v.id, data) : await change("POST", "/views", data);
-        toast(describeResult(r));
+        let r = null;
+        if (!v || configChanged(v, data)) r = v ? await change("PATCH", "/views/" + v.id, data) : await change("POST", "/views", data);
+        const id = v ? v.id : (r.object && r.object.id) || ((r.added || [])[0] || {}).id;
+        if (colorChanged && id) {
+          // A view created in a draft only exists in that draft so far.
+          await api("PUT", "/views/" + id + "/color", { body: { color: color.value }, stage: r && r.staged ? r.changeset_id : undefined });
+        }
+        toast(r ? describeResult(r) : "Colour saved");
         rerender();
         return true;
       } catch (e) { mount(err, errorBox(e)); return false; }
@@ -76,6 +102,15 @@ async function viewDialog(v, viewless) {
   ], { wide: true, sticky: true });
 }
 
+// configChanged tells whether the dialog changed the view's configuration
+// (not just its colour), so a colour change alone stages nothing.
+function configChanged(v, data) {
+  const same = (a, b) => JSON.stringify(a || []) === JSON.stringify(b || []);
+  const mro = v.match_recursive_only === undefined ? null : v.match_recursive_only;
+  return data.name !== v.name || !same(data.match_clients, v.match_clients) || !same(data.match_destinations, v.match_destinations) ||
+    data.match_recursive_only !== mro || data.comment !== (v.comment || "");
+}
+
 async function deleteView(v) {
   let cascade = false;
   if (v.zone_count > 0) {

internal/web/static/assets/pages/zone.js

@@ -1,4 +1,4 @@
-import { h, mount, table, field, input, select, textarea, toast, errorBox, display, badge, confirmDialog, modal, checkbox, time, diffView } from "../ui.js";
+import { h, mount, table, field, input, select, textarea, toast, errorBox, display, badge, confirmDialog, modal, checkbox, time, diffView, backLink, viewLink, lastList } from "../ui.js";
 import { api, get, change, describeResult, rrtypes, state, draftQuery } from "../api.js";
 import { rerender } from "../app.js";
 import { optionsEditor } from "./options.js";
@@ -7,9 +7,12 @@ import { isReverseZone, reverseInfo, ptrOwner, addressOf } from "../names.js";
 import { dnssecTab } from "./dnssec.js";
 import { registrarTab } from "./registrar.js";
 
+let renderSeq = 0;
+
 export async function render(el, params, query) {
   const id = params.id;
-  const zone = await get("/zones/" + id, draftQuery());
+  const [zone, views] = await Promise.all([get("/zones/" + id, draftQuery()), get("/views")]);
+  const view = views.find((v) => v.id === zone.view_id);
   const tab = params.tab || (zone.type === "primary" ? "records" : "settings");
   const tabs = [
     zone.type === "primary" ? ["records", "Records (" + zone.record_count + ")"] : null,
@@ -21,21 +24,30 @@ export async function render(el, params, query) {
     zone.registrar && state.me && state.me.admin ? ["registrar", "Registrar"] : null,
   ].filter(Boolean);
   const body = h("div");
-  mount(el,
-    h("div", { class: "page-head" },
+  const head = h("div", { class: "page-head" },
       h("div", { class: "grow" },
+        backLink("Zones", lastList.zones || "#/zones"),
         h("h1", { class: "mono" }, zone.display_name),
         h("div", { class: "muted" },
           badge(zone.type, "accent"), " ",
           zone.pending ? [pendingBadge(zone.pending), " "] : null,
-          zone.view ? ["view ", h("a", { href: "#/views" }, zone.view), " · "] : null,
+          zone.view ? ["view ", viewLink(view, zone.view, "#/zones/" + id + (params.tab ? "/" + params.tab : "")), " · "] : null,
           zone.type === "primary" ? "serial " + zone.soa.serial + " · " : null,
           zone.dnssec_policy ? [h("a", { href: "#/zones/" + id + "/dnssec" }, badge(zone.dnssec_policy === "insecure" ? "DNSSEC: turning off" : "DNSSEC", zone.dnssec_policy === "insecure" ? "warn" : "ok")), " "] : null,
           zone.zone_file ? h("span", { class: "mono small" }, zone.zone_file) : null)),
       h("div", { class: "actions" },
-        h("button", { class: "danger", onclick: () => deleteZone(zone) }, "Delete zone"))),
-    h("div", { class: "tabs" }, tabs.map(([k, label]) => h("a", { href: "#/zones/" + id + "/" + k, class: k === tab ? "active" : "" }, label))),
-    body);
+        h("button", { class: "danger", onclick: () => deleteZone(zone) }, "Delete zone")));
+  const tabBar = h("div", { class: "tabs" }, tabs.map(([k, label]) => h("a", { href: "#/zones/" + id + "/" + k, class: k === tab ? "active" : "" }, label)));
+  // The header and tabs show at once. Below them, switching tabs keeps the
+  // previous tab's content (faded) until the new one is loaded, rather
+  // than blanking the page; opening the zone shows "Loading…" there.
+  const seq = ++renderSeq;
+  const prev = el.querySelector(`:scope > .zone-body[data-zone="${id}"]`);
+  const holder = prev || h("div", { class: "zone-body" }, h("div", { class: "muted" }, "Loading…"));
+  holder.classList.add("stale");
+  body.className = "zone-body";
+  body.dataset.zone = id;
+  mount(el, head, tabBar, holder);
   if (tab === "records") await recordsTab(body, zone, query);
   else if (tab === "settings") await settingsTab(body, zone);
   else if (tab === "options") await optionsEditor(body, { scope: "zone", scope_id: zone.id, catalogScope: "zone:" + zone.type, title: "Zone options" });
@@ -43,6 +55,11 @@ export async function render(el, params, query) {
   else if (tab === "servers") await serversTab(body, zone);
   else if (tab === "dnssec") await dnssecTab(body, zone);
   else if (tab === "registrar") await registrarTab(body, zone);
+  // A later click (another tab) has taken over the page.
+  if (seq !== renderSeq || !holder.isConnected) return;
+  holder.replaceWith(body);
+  const first = body.querySelector("[data-autofocus]");
+  if (first) first.focus();
 }
 
 // ---- name servers: serials on the other servers, and the delegation
@@ -166,7 +183,7 @@ async function recordsTab(el, zone, query) {
   const reverse = isReverseZone(zone.name);
   const rinfo = reverse ? reverseInfo(zone.name) : null;
   // Add form. In reverse zones records are named by address.
-  const fName = input({ placeholder: reverse && rinfo ? rinfo.example : "@ or www", style: { width: reverse ? "220px" : "180px" }, class: "mono", autocomplete: "off", spellcheck: "false" });
+  const fName = input({ placeholder: reverse && rinfo ? rinfo.example : "@ or www", style: { width: reverse ? "220px" : "180px" }, class: "mono", autocomplete: "off", spellcheck: "false", "data-autofocus": true });
   const fType = select(types.map((t) => [t.type, t.type + (t.common ? "" : "")]), reverse ? "PTR" : "A", { style: { width: "110px" } });
   const fTTL = input({ type: "number", placeholder: "default", min: 0, style: { width: "100px" } });
   const fData = input({ class: "mono", placeholder: typeInfo.A.example });
@@ -388,7 +405,6 @@ async function recordsTab(el, zone, query) {
           (reverse ? "Names are the last part of the address within " + zone.display_name + "." : "Names are relative to " + zone.display_name + "; end a name with '.' to make it absolute."))),
       list));
   draw();
-  fName.focus();
 }
 
 // ---- settings

internal/web/static/assets/pages/zones.js

@@ -1,4 +1,4 @@
-import { h, mount, table, modal, field, input, select, textarea, lines, toast, errorBox, display, badge } from "../ui.js";
+import { h, mount, table, modal, field, input, select, textarea, lines, toast, errorBox, display, badge, viewLink, lastList } from "../ui.js";
 import { get, change, changeMany, describeResult, can, draftQuery } from "../api.js";
 import { rerender } from "../app.js";
 import { checkDomain, reverseZoneFor } from "../names.js";
@@ -8,13 +8,23 @@ export async function render(el, params, query) {
   const filter = input({ type: "search", placeholder: "Filter zones…", value: query.get("q") || "" });
   const viewSel = select([["", "All views"], ...views.map((v) => [v.name, v.name])], query.get("view") || "");
   const typeSel = select([["", "All types"], "primary", "secondary", "forward", "stub", "static-stub", "mirror", "hint", "redirect", "in-view"], query.get("type") || "");
+  const viewsById = new Map(views.map((v) => [v.id, v]));
   const list = h("div");
   const draw = () => {
     const q = filter.value.trim().toLowerCase();
+    // Keep the filters in the address, so going back to the list (or a
+    // breadcrumb) restores them.
+    const qs = new URLSearchParams();
+    if (filter.value.trim()) qs.set("q", filter.value.trim());
+    if (viewSel.value) qs.set("view", viewSel.value);
+    if (typeSel.value) qs.set("type", typeSel.value);
+    const hash = "#/zones" + (qs.toString() ? "?" + qs : "");
+    if (location.hash !== hash && !query.get("new")) history.replaceState(null, "", hash);
+    lastList.zones = hash;
     const rows = zones.filter((z) => (!q || z.name.includes(q)) && (!viewSel.value || z.view === viewSel.value) && (!typeSel.value || z.type === typeSel.value));
     mount(list, table([
       { label: "Zone", render: (z) => [z.pending === "delete" ? h("span", null, z.display_name) : h("a", { href: "#/zones/" + z.id }, z.display_name), z.pending ? [" ", pendingBadge(z.pending)] : null], tdClass: "name" },
-      views.length ? { label: "View", render: (z) => z.view || h("span", { class: "muted" }, "–") } : null,
+      views.length ? { label: "View", render: (z) => viewLink(viewsById.get(z.view_id), z.view, hash) } : null,
       { label: "Type", render: (z) => badge(z.type, z.type === "primary" ? "accent" : "") },
       { label: "Records", render: (z) => z.type === "primary" ? String(z.record_count) : "", class: "right", tdClass: "right" },
       { label: "Serial", render: (z) => z.type === "primary" ? String(z.soa.serial) : "", tdClass: "mono" },