merge storage and disk health into one card with two sections

Volume capacity and physical drive health were two adjacent cards, and the operator reading a full disk is usually the operator reading a dying disk in the same minute. They are now one Storage card with two sections. Visual grouping only - the two tables share no key, storage being per volume and health per physical device, and one drive can back several volumes or none the operator sees. Nothing is reconciled across the sections; this is not the mapped-drive merge where two sources described the same drive and the worse status won. The tabs render type was the only sections-in-one-card mechanism and emitted label/value fields with no table path, so it now takes table sections too. That is the renderer every plugin uses, so both behaviour changes in it are mutation-tested. Two things only surfaced on contact: the empty-section filter had to grow a table branch, because a table section declares columns up front and dropping it when it has no rows takes its tab with it and reads as no disks rather than nothing reported; and full-width span was keyed off the declared render type, but a tabs panel holding a six-column table needs the same span and that is only knowable from fetched data. The diskhealth route stays. It no longer backs a panel, but it is a stable read for callers outside the renderer and removing it for a UI-only change would break them.

plugins/endpoints/api/routes.py

@@ -636,19 +636,15 @@ def panel_osinfo(asset_id: int):
     return success_response({'fields': fields})
 
 
-@endpoints_bp.route('/asset/<int:asset_id>/storage', methods=['GET'])
-@require_permission('endpoints.view')
-def panel_storage(asset_id: int):
-    """Table panel: fixed disks with capacity and free space.
+def _storage_rows(disks):
+    """Turn the agent's volume list into display rows.
 
     freepercent is computed by the agent from 1.7.0; for a snapshot written
     by an older agent it is derived here from the byte counts so the column
     is not empty for the one field an operator actually scans.
     """
-    state = EndpointState.query.filter_by(assetid=asset_id).first()
-    disks = _state_json(state, 'disksjson') if state else None
     if not isinstance(disks, list):
-        return success_response([])
+        return []
 
     rows = []
     for disk in disks:
@@ -668,7 +664,62 @@ def panel_storage(asset_id: int):
             'free': _format_bytes(disk.get('freebytes')),
             'freepercent': '{}%'.format(freepercent) if freepercent is not None else None,
         })
-    return success_response(rows)
+    return rows
+
+
+_STORAGE_COLUMNS = [
+    {'key': 'drive', 'label': 'Drive'},
+    {'key': 'label', 'label': 'Label'},
+    {'key': 'filesystem', 'label': 'Filesystem'},
+    {'key': 'size', 'label': 'Size'},
+    {'key': 'free', 'label': 'Free'},
+    {'key': 'freepercent', 'label': 'Free %'},
+]
+
+_DISKHEALTH_COLUMNS = [
+    {'key': 'model', 'label': 'Drive'},
+    {'key': 'mediatype', 'label': 'Media'},
+    {'key': 'bustype', 'label': 'Bus'},
+    {'key': 'healthstatus', 'label': 'Health'},
+    {'key': 'verdict', 'label': 'Verdict'},
+    {'key': 'source', 'label': 'Source'},
+]
+
+
+@endpoints_bp.route('/asset/<int:asset_id>/storage', methods=['GET'])
+@require_permission('endpoints.view')
+def panel_storage(asset_id: int):
+    """Tabs panel: volume capacity and physical drive health as two sections.
+
+    One card because an operator looking at a full disk and an operator looking
+    at a dying disk are usually the same person in the same minute. TWO
+    SECTIONS because the two do not share a key: storage is per volume (C:, D:)
+    and health is per physical device, and one drive can back several volumes
+    or none the operator sees. Nothing is reconciled across the sections -
+    this is not the mapped-drive merge, where two sources described the same
+    drive and the worse status won.
+
+    Both sections are emitted even when empty so the section keeps its own
+    empty message; a dropped section would take its tab with it and read as
+    "no disks" rather than "nothing reported".
+    """
+    state = EndpointState.query.filter_by(assetid=asset_id).first()
+    disks = _state_json(state, 'disksjson') if state else None
+    drives = _state_json(state, 'diskhealthjson') if state else None
+    return success_response({'sections': [
+        {
+            'label': 'Volumes',
+            'columns': _STORAGE_COLUMNS,
+            'rows': _storage_rows(disks),
+            'empty': 'No disks reported.',
+        },
+        {
+            'label': 'Disk health',
+            'columns': _DISKHEALTH_COLUMNS,
+            'rows': _diskhealth_rows(drives),
+            'empty': 'No disk health reported.',
+        },
+    ]})
 
 
 def _diskhealth_rows(drives):
@@ -717,11 +768,11 @@ def _diskhealth_rows(drives):
 @endpoints_bp.route('/asset/<int:asset_id>/diskhealth', methods=['GET'])
 @require_permission('endpoints.view')
 def panel_diskhealth(asset_id: int):
-    """Table panel: physical drive health.
+    """Physical drive health rows.
 
-    Separate from the storage panel because the two do not share a key. Storage
-    is per volume (C:, D:), this is per physical device, and one physical drive
-    can back several volumes or none the operator can see.
+    No longer backs a panel of its own - the Storage card renders it as a
+    section. Kept as a route because it is a stable read for callers outside
+    the panel renderer and removing it would break them for a UI-only change.
 
     Rows are ordered so anything predicting failure sorts first: a failing
     drive must not be below the fold on a machine with several disks.