v0.33.7

scripts/tests/dashboard_layout_0331_browser_test.py

@@ -7,6 +7,7 @@ not a Rust server integration test.
 import json
 import re
 from pathlib import Path
+from panel_html import render_admin_index
 from playwright.sync_api import sync_playwright
 
 ROOT = Path(__file__).resolve().parents[2]
@@ -41,7 +42,7 @@ assert set(PRESET['dashboard_hidden_widgets']).issubset(set(PRESET['dashboard_wi
 assert PRESET['dashboard_density'] == 'compact' and PRESET['overview_samples'] == 600
 assert sum(w['id'].startswith('www_') and w['id'] in PRESET['dashboard_hidden_widgets'] for w in REGISTRY) == 12
 
-HTML = (ROOT / 'src/admin/web/index.html').read_text()
+HTML = render_admin_index(ROOT)
 CSS = (ROOT / 'src/admin/web/style.css').read_text()
 BUNDLE = app_bundle()
 assert BUNDLE.index('const ADMIN_DASHBOARD_DEFAULTS =') < BUNDLE.index('window.rustProxyOverviewSamples =')
@@ -94,6 +95,8 @@ with sync_playwright() as p:
                 return window.__savedDashboard;
             };
             applyAdminPreferences(window.__savedDashboard);
+            api = async path => { if (path === '/api/dashboard-presets') return []; throw new Error('unexpected API ' + path); };
+            appConfirm = async () => true;
             return {
                 order: ADMIN_DASHBOARD_WIDGETS,
                 hidden: ADMIN_DEFAULT_HIDDEN_WIDGETS,
@@ -166,13 +169,12 @@ with sync_playwright() as p:
             window.rustProxyStreamDashboard.render(status);
         }''')
         assert_visible(page, ['backend_health'], ['backend_traffic'])
-        # Restore defaults in the modal after a custom layout was saved.
+        # Restore factory layout through the new named-presets modal.
         page.locator('#overview-layout-open').evaluate('(node) => node.hidden = false')
         page.locator('#overview-layout-open').click()
-        page.wait_for_function("document.getElementById('overview-layout-dialog').open")
-        page.locator('#overview-layout-default').click()
-        page.locator('#overview-layout-save').click()
-        page.wait_for_function("!document.getElementById('overview-layout-dialog').open")
+        page.wait_for_function("document.getElementById('overview-presets-dialog').open")
+        page.locator('#overview-presets-factory').click()
+        page.wait_for_function("!document.getElementById('overview-presets-dialog').open")
         assert_visible(page, ['backend_traffic'], ['backend_health', 'stream_sessions', 'www_status'])
         assert page.evaluate('window.__savedDashboard.dashboard_widgets') == PRESET['dashboard_widgets']
         assert page.evaluate('window.__savedDashboard.dashboard_hidden_widgets') == PRESET['dashboard_hidden_widgets']