From 146cb5e69e2f10a48fa5a92453e447a0b8bb0335 Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Tue, 28 Apr 2026 19:06:07 +0100
Subject: [PATCH] Simplify monitoring v2 filters

---
 .../monitoring-platform-v2/index.html         | 166 +++++++-----------
 .../rewrite-proposal.md                       |  27 ++-
 2 files changed, 85 insertions(+), 108 deletions(-)

diff --git a/docs/prototypes/monitoring-platform-v2/index.html b/docs/prototypes/monitoring-platform-v2/index.html
index 217d6782b..497755517 100644
--- a/docs/prototypes/monitoring-platform-v2/index.html
+++ b/docs/prototypes/monitoring-platform-v2/index.html
@@ -134,6 +134,11 @@
         margin-bottom: 8px;
       }
 
+      .search-row {
+        display: flex;
+        gap: 7px;
+      }
+
       .toolbar input {
         width: 100%;
         border: 1px solid var(--line);
@@ -165,6 +170,10 @@
         flex-wrap: wrap;
       }
 
+      .reset-button {
+        flex: 0 0 auto;
+      }
+
       .table-card {
         overflow: hidden;
       }
@@ -493,11 +502,11 @@
           <div class="big-number"><span id="platformCount">0</span><span class="note">supported</span></div>
         </article>
         <article class="card summary-card">
-          <div class="label">Top Level</div>
+          <div class="label">Hosts & Clusters</div>
           <div class="big-number"><span id="topLevelCount">0</span><span class="note">resources</span></div>
         </article>
         <article class="card summary-card">
-          <div class="label">Workloads</div>
+          <div class="label">VMs / Containers / Pods</div>
           <div class="big-number"><span id="workloadCount">0</span><span class="note">guests, pods, containers</span></div>
         </article>
         <article class="card summary-card">
@@ -505,7 +514,7 @@
           <div class="big-number"><span id="storageCount">0</span><span class="note">items</span></div>
         </article>
         <article class="card summary-card">
-          <div class="label">Recovery</div>
+          <div class="label">Backups</div>
           <div class="big-number"><span id="recoveryCount">0</span><span class="note">policies</span></div>
         </article>
         <article class="card summary-card">
@@ -515,19 +524,18 @@
       </section>
 
       <section class="card toolbar" aria-label="Monitoring controls">
-        <input id="search" type="search" placeholder="Search resources, platforms, hosts, guests, storage, backup jobs..." />
+        <div class="search-row">
+          <input id="search" type="search" placeholder="Search hosts, clusters, VMs, containers, pods, storage, backups..." />
+          <button id="resetFilters" class="reset-button" type="button">Reset</button>
+        </div>
         <div class="filter-row">
           <span class="filter-label">Platform</span>
           <div id="platformButtons" class="filter-buttons"></div>
         </div>
         <div class="filter-row">
-          <span class="filter-label">Focus</span>
+          <span class="filter-label">Show</span>
           <div id="viewButtons" class="filter-buttons"></div>
         </div>
-        <div class="filter-row">
-          <span class="filter-label">Include</span>
-          <div id="layerButtons" class="filter-buttons"></div>
-        </div>
       </section>
 
       <article class="card table-card">
@@ -543,24 +551,17 @@
     </main>
 
     <script>
-      const focusOptions = [
-        { id: "overview", label: "Everything", layers: ["top", "workload", "storage", "recovery"] },
-        { id: "hosts", label: "Top Level", layers: ["top"] },
-        { id: "workloads", label: "Workloads", layers: ["top", "workload"] },
+      const viewOptions = [
+        { id: "overview", label: "All resources", layers: ["top", "workload", "storage", "recovery"] },
+        { id: "hosts", label: "Hosts & clusters", layers: ["top"] },
+        { id: "workloads", label: "VMs / containers / pods", layers: ["top", "workload"] },
         { id: "storage", label: "Storage", layers: ["top", "workload", "storage"] },
-        { id: "recovery", label: "Recovery", layers: ["top", "workload", "recovery"] },
+        { id: "recovery", label: "Backups", layers: ["top", "workload", "recovery"] },
         { id: "problems", label: "Problems", layers: ["top", "workload", "storage", "recovery"] },
       ];
 
-      const layerOptions = [
-        { id: "top", label: "Top Level" },
-        { id: "workload", label: "Workloads" },
-        { id: "storage", label: "Storage" },
-        { id: "recovery", label: "Recovery" },
-      ];
-
       // Displayed fields stay inside unified resource model concerns: identity,
-      // kind, placement, liveness state, metrics, recovery state, and health signals.
+      // kind, placement, liveness state, metrics, protection state, and health signals.
       const columns = {
         overview: [
           { key: "name", label: "Resource", width: 260, type: "resource" },
@@ -569,17 +570,17 @@
           { key: "cpu", label: "CPU", width: 100, type: "metric" },
           { key: "memory", label: "Memory", width: 100, type: "metric" },
           { key: "disk", label: "Disk", width: 100, type: "metric" },
-          { key: "recovery", label: "Recovery", width: 110 },
+          { key: "recovery", label: "Backup", width: 110 },
           { key: "signals", label: "Signals", width: 330, type: "signals" },
         ],
         workloads: [
-          { key: "name", label: "Workload", width: 270, type: "resource" },
+          { key: "name", label: "VM / Container / Pod", width: 270, type: "resource" },
           { key: "kind", label: "Kind", width: 125 },
           { key: "placement", label: "Placement", width: 180 },
           { key: "cpu", label: "CPU", width: 100, type: "metric" },
           { key: "memory", label: "Memory", width: 100, type: "metric" },
           { key: "disk", label: "Disk", width: 100, type: "metric" },
-          { key: "recovery", label: "Recovery", width: 120 },
+          { key: "recovery", label: "Backup", width: 120 },
           { key: "signals", label: "Signals", width: 340, type: "signals" },
         ],
         storage: [
@@ -589,7 +590,7 @@
           { key: "disk", label: "Used", width: 100, type: "metric" },
           { key: "size", label: "Size", width: 120 },
           { key: "temp", label: "Temp", width: 90 },
-          { key: "recovery", label: "Recovery", width: 120 },
+          { key: "recovery", label: "Backup", width: 120 },
           { key: "signals", label: "Signals", width: 340, type: "signals" },
         ],
         backups: [
@@ -599,17 +600,9 @@
           { key: "target", label: "Target", width: 220 },
           { key: "lastRun", label: "Last Run", width: 130 },
           { key: "verification", label: "Verification", width: 145 },
-          { key: "recovery", label: "Recovery", width: 120 },
+          { key: "recovery", label: "Backup", width: 120 },
           { key: "signals", label: "Signals", width: 360, type: "signals" },
         ],
-        problems: [
-          { key: "name", label: "Resource", width: 290, type: "resource" },
-          { key: "platformLabel", label: "Platform", width: 125 },
-          { key: "kind", label: "Kind", width: 130 },
-          { key: "placement", label: "Placement", width: 220 },
-          { key: "recovery", label: "Recovery", width: 120 },
-          { key: "signal", label: "Signal", width: 420 },
-        ],
       };
 
       const data = {
@@ -737,7 +730,6 @@
       const state = {
         view: "overview",
         selectedPlatforms: new Set(),
-        layers: new Set(focusOptions[0].layers),
         query: "",
       };
 
@@ -745,35 +737,31 @@
         return Object.keys(data);
       }
 
-      function focusOption(view) {
-        return focusOptions.find((option) => option.id === view) || focusOptions[0];
+      function viewOption(view) {
+        return viewOptions.find((option) => option.id === view) || viewOptions[0];
       }
 
-      function primaryLayerForView(view) {
-        if (view === "hosts") return "top";
-        if (view === "workloads") return "workload";
-        if (view === "storage") return "storage";
-        if (view === "recovery") return "recovery";
-        return "";
-      }
-
-      function applyFocusDefaults(view) {
+      function applyView(view) {
         state.view = view;
-        state.layers = new Set(focusOption(view).layers);
       }
 
-      function ensureFocusState() {
-        if (!focusOptions.some((option) => option.id === state.view)) {
-          applyFocusDefaults("overview");
-          return;
-        }
-        const primary = primaryLayerForView(state.view);
-        if (primary) state.layers.add(primary);
-        if (state.layers.size === 0) applyFocusDefaults("overview");
+      function ensureViewState() {
+        if (!viewOptions.some((option) => option.id === state.view)) applyView("overview");
+      }
+
+      function activeLayers() {
+        return new Set(viewOption(state.view).layers);
       }
 
       function layerEnabled(layer) {
-        return state.layers.has(layer);
+        return activeLayers().has(layer);
+      }
+
+      function resetFilters() {
+        state.selectedPlatforms.clear();
+        state.query = "";
+        applyView("overview");
+        document.getElementById("search").value = "";
       }
 
       function selectedPlatformIds() {
@@ -846,8 +834,6 @@
       function globalRows() {
         if (state.view === "overview") return segmentedOverviewRows(selectedPlatformIds(), true);
         if (state.view === "problems") return globalProblemRows();
-        if (state.view === "recovery") return recoveryRows();
-
         const rows = [];
         for (const platformId of selectedPlatformIds()) {
           const result = platformRows(platformId);
@@ -867,7 +853,6 @@
       function columnsForFocus() {
         if (state.view === "storage") return columns.storage;
         if (state.view === "recovery") return columns.backups;
-        if (state.view === "problems") return columns.problems;
         return columns.overview;
       }
 
@@ -928,19 +913,18 @@
         if (layerEnabled("top")) rows.push(topRow);
 
         if (visibleWorkloads.length) {
-          const workloadCount = model.workloads.length;
-          rows.push(section("Workloads", laneMeta(model.workloads.map((entry) => entry.workload), "resource"), "lane lane-workload"));
+          rows.push(section("VMs / Containers / Pods", laneMeta(model.workloads.map((entry) => entry.workload), "resource"), "lane lane-workload"));
           for (const entry of visibleWorkloads) {
             rows.push(entry.workload, ...entry.storage, ...entry.recovery);
           }
         }
 
         if (visibleHostStorage.length) {
-          rows.push(section("Host Storage", laneMeta(model.hostStorage, "item"), "lane lane-storage"), ...visibleHostStorage);
+          rows.push(section("System Storage", laneMeta(model.hostStorage, "item"), "lane lane-storage"), ...visibleHostStorage);
         }
 
         if (visibleHostRecovery.length) {
-          rows.push(section("Recovery", laneMeta(model.hostRecovery, "policy"), "lane lane-recovery"), ...visibleHostRecovery);
+          rows.push(section("Backups", laneMeta(model.hostRecovery, "policy"), "lane lane-recovery"), ...visibleHostRecovery);
         }
       }
 
@@ -1032,14 +1016,15 @@
         const storage = platform.storage.filter(byTop).map((row) => normalizeRow(platformId, "storage", row));
         const recovery = platform.backups.map((row) => normalizeRow(platformId, "recovery", row)).filter(byTop);
         return [
-          { id: "workload", title: "Workloads", meta: laneMeta(workloads, "resource"), rows: workloads },
+          { id: "workload", title: "VMs / Containers / Pods", meta: laneMeta(workloads, "resource"), rows: workloads },
           { id: "storage", title: "Storage", meta: laneMeta(storage, "item"), rows: storage },
-          { id: "recovery", title: "Recovery", meta: laneMeta(recovery, "policy"), rows: recovery },
+          { id: "recovery", title: "Backups", meta: laneMeta(recovery, "policy"), rows: recovery },
         ];
       }
 
       function laneMeta(rows, noun) {
-        return `${rows.length} ${rows.length === 1 ? noun : `${noun}s`}`;
+        if (rows.length === 1) return `1 ${noun}`;
+        return `${rows.length} ${noun.endsWith("y") ? `${noun.slice(0, -1)}ies` : `${noun}s`}`;
       }
 
       function platformRows(platformId) {
@@ -1066,7 +1051,7 @@
           rows.push(section(top.name, top.info, "top"), topRow);
           if (!layerEnabled("top")) rows.pop();
           if (!entries.length) continue;
-          rows.push(section("Workloads", laneMeta(entries.map((entry) => entry.workload), "resource"), "lane lane-workload"));
+          rows.push(section("VMs / Containers / Pods", laneMeta(entries.map((entry) => entry.workload), "resource"), "lane lane-workload"));
           for (const entry of entries) rows.push(entry.workload, ...entry.storage, ...entry.recovery);
         }
         return { columns: columns.overview, rows };
@@ -1092,7 +1077,7 @@
             rows.push(section("Attached Storage", laneMeta(guestStorage.flatMap((entry) => entry.storage), "item"), "lane lane-storage"));
             for (const entry of guestStorage) rows.push(...(layerEnabled("workload") ? [entry.workload] : []), ...entry.storage);
           }
-          if (hostStorage.length) rows.push(section("Host Storage", laneMeta(hostStorage, "item"), "lane lane-storage"), ...hostStorage);
+          if (hostStorage.length) rows.push(section("System Storage", laneMeta(hostStorage, "item"), "lane lane-storage"), ...hostStorage);
         }
         return { columns: columns.storage, rows };
       }
@@ -1114,10 +1099,10 @@
           rows.push(section(top.name, top.info, "top"), topRow);
           if (!layerEnabled("top")) rows.pop();
           if (protectedWorkloads.length) {
-            rows.push(section("Protected Workloads", laneMeta(protectedWorkloads.flatMap((entry) => entry.recovery), "policy"), "lane lane-recovery"));
+            rows.push(section("Protected VMs / Containers / Pods", laneMeta(protectedWorkloads.flatMap((entry) => entry.recovery), "policy"), "lane lane-recovery"));
             for (const entry of protectedWorkloads) rows.push(...(layerEnabled("workload") ? [entry.workload] : []), ...entry.recovery);
           }
-          if (hostRecovery.length) rows.push(section("Host Recovery", laneMeta(hostRecovery, "policy"), "lane lane-recovery"), ...hostRecovery);
+          if (hostRecovery.length) rows.push(section("System Backups", laneMeta(hostRecovery, "policy"), "lane lane-recovery"), ...hostRecovery);
         }
         return { columns: columns.backups, rows };
       }
@@ -1152,11 +1137,11 @@
           rows.push(section(top.name, top.info, "top"), topRow);
           if (!layerEnabled("top")) rows.pop();
           if (affectedWorkloads.length) {
-            rows.push(section("Affected Workloads", laneMeta(affectedWorkloads.map((entry) => entry.workload), "resource"), "lane lane-workload"));
+            rows.push(section("Affected VMs / Containers / Pods", laneMeta(affectedWorkloads.map((entry) => entry.workload), "resource"), "lane lane-workload"));
             for (const entry of affectedWorkloads) rows.push(...(layerEnabled("workload") ? [entry.workload] : []), ...entry.related);
           }
-          if (hostStorage.length) rows.push(section("Host Storage", laneMeta(hostStorage, "item"), "lane lane-storage"), ...hostStorage);
-          if (hostRecovery.length) rows.push(section("Recovery", laneMeta(hostRecovery, "policy"), "lane lane-recovery"), ...hostRecovery);
+          if (hostStorage.length) rows.push(section("System Storage", laneMeta(hostStorage, "item"), "lane lane-storage"), ...hostStorage);
+          if (hostRecovery.length) rows.push(section("Backups", laneMeta(hostRecovery, "policy"), "lane lane-recovery"), ...hostRecovery);
         }
         return { columns: columns.overview, rows };
       }
@@ -1248,25 +1233,16 @@
       }
 
       function renderControls() {
-        ensureFocusState();
+        ensureViewState();
 
         document.getElementById("platformButtons").innerHTML = [
           `<button class="platform ${state.selectedPlatforms.size === 0 ? "active" : ""}" type="button" data-platform="any">All Platforms</button>`,
           ...platformIds().map((id) => `<button class="platform ${state.selectedPlatforms.has(id) ? "active" : ""}" type="button" data-platform="${id}">${data[id].label}</button>`),
         ].join("");
 
-        document.getElementById("viewButtons").innerHTML = focusOptions
+        document.getElementById("viewButtons").innerHTML = viewOptions
           .map((view) => `<button class="view ${state.view === view.id ? "active" : ""}" type="button" data-view="${view.id}">${view.label}</button>`)
           .join("");
-
-        const primaryLayer = primaryLayerForView(state.view);
-        document.getElementById("layerButtons").innerHTML = layerOptions
-          .map((layer) => {
-            const active = layerEnabled(layer.id);
-            const required = primaryLayer === layer.id;
-            return `<button class="layer ${active ? "active" : ""}" type="button" data-layer="${layer.id}" aria-pressed="${active}" ${required ? 'aria-disabled="true"' : ""}>${layer.label}</button>`;
-          })
-          .join("");
       }
 
       function renderTable() {
@@ -1334,25 +1310,17 @@
         });
         document.querySelectorAll(".view").forEach((button) => {
           button.addEventListener("click", () => {
-            applyFocusDefaults(button.dataset.view);
-            render();
-          });
-        });
-        document.querySelectorAll(".layer").forEach((button) => {
-          button.addEventListener("click", () => {
-            const layer = button.dataset.layer;
-            if (primaryLayerForView(state.view) === layer) return;
-            if (state.layers.has(layer) && state.layers.size > 1) {
-              state.layers.delete(layer);
-            } else {
-              state.layers.add(layer);
-            }
-            ensureFocusState();
+            applyView(button.dataset.view);
             render();
           });
         });
       }
 
+      document.getElementById("resetFilters").addEventListener("click", () => {
+        resetFilters();
+        render();
+      });
+
       document.getElementById("search").addEventListener("input", (event) => {
         state.query = event.currentTarget.value.trim().toLowerCase();
         renderTable();
diff --git a/docs/prototypes/monitoring-platform-v2/rewrite-proposal.md b/docs/prototypes/monitoring-platform-v2/rewrite-proposal.md
index 627cf2453..357ee9231 100644
--- a/docs/prototypes/monitoring-platform-v2/rewrite-proposal.md
+++ b/docs/prototypes/monitoring-platform-v2/rewrite-proposal.md
@@ -39,7 +39,7 @@ Adding a role should be treated as a contract change, not a frontend convention.
 2. First-class cluster resources for platform-level state across Proxmox, Kubernetes, vSphere, Ceph, and equivalent cluster-capable sources.
 3. Metrics-history API schema for row trends, detail drawers, storage growth, and anomaly context.
 4. First-class liveness fields separate from incidental `LastSeen`.
-5. Recovery/protection fields for target, last run, verification state, and protected-resource linkage.
+5. Backup/protection fields for target, last run, verification state, and protected-resource linkage.
 
 ## Prototype Field Mapping
 
@@ -50,7 +50,7 @@ The current v2 prototype should be read through this mapping:
 - `Info`: compact source-backed facet summary, not product narration
 - resource state indicator: shown directly before the resource name, derived from first-class liveness plus health state. `On` is green, `Off` is red, and `Issue` is yellow.
 - `CPU`, `Memory`, `Disk`: latest resource metrics, with history supplied by the metrics API later
-- `Recovery`: canonical recovery/protection posture
+- `Backup`: canonical backup/protection posture
 - `Signals`: incidents, alerts, or canonical health signals
 - `Placement`: `ParentID` plus typed edges such as `runs_on`, `member_of`, or `contains`
 - `Target`: typed recovery/replication target via `backed_up_by` or `replicates_to`
@@ -58,18 +58,27 @@ The current v2 prototype should be read through this mapping:
 
 ## Platform Rule
 
-The rewrite must not bias one platform. Proxmox, Docker, Kubernetes, TrueNAS, vSphere, and future first-class platforms should all project into the same Monitoring primitives: identity, type, status, metrics, typed relationships, liveness, storage, recovery, and health signals.
+The rewrite must not bias one platform. Proxmox, Docker, Kubernetes, TrueNAS, vSphere, and future first-class platforms should all project into the same Monitoring primitives: identity, type, status, metrics, typed relationships, liveness, storage, backup/protection state, and health signals.
 
 ## Layout Rule
 
-The Monitoring page should keep one platform selection model. Do not split platform choice into duplicate concepts such as workspace and focus.
+The Monitoring page should keep one platform selection model. Do not split platform choice into duplicate concepts that both mean "which estate am I looking at?"
 
-The default surface should remain a dense, segmented table. Visual grouping should come from canonical resource structure and typed relationships: platform, primary/top-level resource, then operational lanes such as workloads, storage, and recovery. If those relationships are not available from the unified resource model, the production UI should wait for the model contract rather than inventing a frontend-only hierarchy.
+The UI vocabulary should be literal resource vocabulary, not abstract architecture vocabulary and not inherited page names. Use words that tell the operator what rows they will see:
 
-When a platform is focused, the primary layout should become relationship-first rather than type-first. A user looking at a host should see the workloads on that host, and any attached storage, network devices, recovery jobs, or protection state should appear under the workload or host they belong to. Type filters can narrow the view, but they must not be the main organizing principle because they separate related resources and force the user to reconstruct the topology mentally.
+- `All resources` for the full relationship-preserving table.
+- `Hosts & clusters` for top-level systems, appliances, and equivalent source roots.
+- `VMs / containers / pods` for runtime units.
+- `Storage` for disks, pools, datastores, volumes, PVCs, datasets, and mounted storage.
+- `Backups` for backups, replication, snapshots, restore verification, and protected-resource state.
+- `Problems` for incident-led triage.
 
-Each filter state should be treated as a monitoring intent with its own view model. Overview should emphasize topology. Workload views should emphasize runtime units and their attachments. Storage views should emphasize ownership and attachment points. Recovery views should emphasize protected resources and backup/replication policies. Problem views should preserve enough context to explain what is affected. A single generic grouping algorithm is not sufficient.
+The default surface should remain a dense, segmented table. Visual grouping should come from canonical resource structure and typed relationships: platform, primary host or cluster, then operational lanes such as VMs/containers/pods, storage, and backups. If those relationships are not available from the unified resource model, the production UI should wait for the model contract rather than inventing a frontend-only hierarchy.
 
-Users should also be able to compose the density of the page. The Monitoring surface needs layer toggles for top-level resources, workloads, storage, and recovery so an operator can choose "hosts only", "hosts plus workloads", or "hosts plus workloads plus storage" without losing the hierarchy.
+When a platform is selected, the primary layout should become relationship-first rather than type-first. A user looking at a host should see the VMs, containers, or pods running on that host, and any attached storage, network devices, backup jobs, snapshot jobs, replication jobs, or backup status should appear under the resource they belong to. Type filters can narrow the view, but they must not be the main organizing principle because they separate related resources and force the user to reconstruct the topology mentally.
 
-The filter controls should be preset-first, not combination-first. Platform selection answers "which estate am I looking at?", Focus answers "what monitoring job am I doing?", and Include answers "which related layers should stay visible for context?" Focus choices should apply sensible layer defaults such as Top Level only, Workloads with owners, Storage with owners and attached workloads, Recovery with protected resources, and Problems with enough context to explain impact. Operators can then adjust Include toggles, but they should not have to know hidden layer dependencies to get a useful view.
+Each filter state should be treated as a monitoring intent with its own view model. All resources should emphasize estate topology. VMs/containers/pods should emphasize runtime units and their attachments. Storage should emphasize ownership and attachment points. Backups should emphasize protected resources, backup jobs, replication, snapshots, and verification state. Problems should preserve enough context to explain what is affected. A single generic grouping algorithm is not sufficient.
+
+Users should also be able to change the density of the page without learning a second control model. The Monitoring surface should use one `Show` row with concrete resource filters such as `All resources`, `Hosts & clusters`, `VMs / containers / pods`, `Storage`, `Backups`, and `Problems`.
+
+The filter controls should be preset-first, not combination-first. Platform selection answers "which estate am I looking at?" and Show answers "which resource rows should I see?" Each option owns its hierarchy and row mix, so operators do not need to combine abstract density modes with layer toggles. A reset control should always return to the neutral All resources / All Platforms state.