1})}"
+ )
+
+ for group in ADMIN_NAV:
+ for key in ("id", "label", "icon", "tabs"):
+ assert key in group, f"Group {group.get('id')} is missing '{key}'"
+ assert group["tabs"], f"Group {group['id']} has no tabs"
+
+ tab_ids = get_tab_ids()
+ duplicate_tabs = sorted({t for t in tab_ids if tab_ids.count(t) > 1})
+ assert not duplicate_tabs, f"Tabs listed in more than one group: {duplicate_tabs}"
+
+ section_ids = get_section_ids()
+ duplicate_sections = sorted({s for s in section_ids if section_ids.count(s) > 1})
+ assert not duplicate_sections, (
+ f"Sections listed under more than one tab: {duplicate_sections}"
+ )
+
+ for _, tab in iter_tabs():
+ for key in ("id", "label", "icon", "sections"):
+ assert key in tab, f"Tab {tab.get('id')} is missing '{key}'"
+
+ print(
+ f"Map is well formed: {len(ADMIN_NAV)} groups, "
+ f"{len(tab_ids)} tabs, {len(section_ids)} sections."
+ )
+
+
+def test_every_nav_destination_exists():
+ """A destination with nothing behind it is a dead end for the admin."""
+ print("Testing Admin Settings nav destinations...")
+
+ composed = read_admin_settings_template()
+ panes = set(re.findall(r'
Target Cosmos' not in sidebar
- assert 'Migration' in sidebar
- assert 'Backup, Migrate & Restore' in sidebar
+ # Sidebar labels now come from the navigation map, which both the sidebar
+ # and the top tab strip render from.
+ data_management_sections = {
+ section["label"]
+ for _, tab in iter_tabs()
+ if tab["id"] == "data-management"
+ for section in tab["sections"]
+ }
+ assert "Target Cosmos" not in data_management_sections
+ assert "Migration" in data_management_sections
+ assert any(
+ tab["id"] == "data-management" and tab["label"] == "Backup, Migrate & Restore"
+ for _, tab in iter_tabs()
+ ), "Data Management tab label missing from the navigation map"
assert 'cdn.jsdelivr.net' not in read_text(ADMIN_JS)
- assert 'data-tab="data-management"' in sidebar
- assert 'data-section="data-management-readiness-section"' in sidebar
- assert 'data-section="data-management-backup-section"' in sidebar
- assert 'data-section="data-management-cosmos-editor-section"' in sidebar
- assert 'data-section="data-management-backup-inventory-section"' in sidebar
- assert 'data-section="data-management-migration-section"' in sidebar
+ assert any(tab["id"] == "data-management" for _, tab in iter_tabs()), (
+ "Data Management tab missing from the navigation map"
+ )
+ data_management_section_ids = {
+ section["id"]
+ for _, tab in iter_tabs()
+ if tab["id"] == "data-management"
+ for section in tab["sections"]
+ }
+ for expected_section in (
+ "data-management-readiness-section",
+ "data-management-backup-section",
+ "data-management-cosmos-editor-section",
+ "data-management-backup-inventory-section",
+ "data-management-migration-section",
+ ):
+ assert expected_section in data_management_section_ids, (
+ f"Navigation map is missing {expected_section}"
+ )
if __name__ == "__main__":
diff --git a/functional_tests/test_inbound_mcp_admin_ui.py b/functional_tests/test_inbound_mcp_admin_ui.py
index 2717e5751..4dafbf5f7 100644
--- a/functional_tests/test_inbound_mcp_admin_ui.py
+++ b/functional_tests/test_inbound_mcp_admin_ui.py
@@ -39,7 +39,9 @@
import sys
from pathlib import Path
from test_support.versioning import assert_app_version_at_least
+from test_support.nav import iter_tabs
from test_support.templates import compose_if_admin_settings
+from test_support.nav import iter_tabs
ROOT_DIR = Path(__file__).resolve().parents[1]
@@ -177,9 +179,26 @@ def test_admin_settings_mcp_ui_is_gated_and_minimal():
assert f"'{operational_setting}'," in admin_route_source
assert f"INBOUND_MCP_SETTINGS_DEFAULTS['{operational_setting}']" in admin_route_source
- assert "{% if mcp_ui_enabled %}" in sidebar_template
- assert 'data-section="inbound-mcp-configuration"' in sidebar_template
- assert "Inbound MCP" in sidebar_template
+ # The Inbound MCP navigation entry is gated by the same flag as its card,
+ # declared in the navigation map rather than inline in the sidebar.
+ inbound_section = next(
+ (
+ section
+ for _, tab in iter_tabs()
+ for section in tab["sections"]
+ if section["id"] == "inbound-mcp-configuration"
+ ),
+ None,
+ )
+ assert inbound_section is not None, (
+ "Inbound MCP navigation entry missing from the navigation map"
+ )
+ assert inbound_section.get("condition") == "mcp_ui_enabled", (
+ "Inbound MCP navigation entry must be gated by mcp_ui_enabled"
+ )
+ assert inbound_section["label"] == "Inbound MCP", (
+ f"Unexpected Inbound MCP navigation label: {inbound_section['label']}"
+ )
def test_inbound_mcp_auth_uses_settings_runtime_config():
diff --git a/functional_tests/test_support/nav.py b/functional_tests/test_support/nav.py
new file mode 100644
index 000000000..ed847b2ef
--- /dev/null
+++ b/functional_tests/test_support/nav.py
@@ -0,0 +1,34 @@
+# nav.py
+"""Access to the Admin Settings navigation map from functional tests.
+
+``admin_settings_nav`` lives in ``application/single_app``, which is not on the
+test path by default. Centralising the import here keeps individual tests from
+each manipulating ``sys.path``, and gives them one place to read navigation
+structure from.
+"""
+
+import sys
+from pathlib import Path
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+APP_ROOT = REPO_ROOT / "application" / "single_app"
+
+if str(APP_ROOT) not in sys.path:
+ sys.path.insert(0, str(APP_ROOT))
+
+from admin_settings_nav import ( # noqa: E402
+ ADMIN_NAV,
+ get_group_for_tab,
+ get_section_ids,
+ get_tab_ids,
+ iter_tabs,
+)
+
+__all__ = [
+ "ADMIN_NAV",
+ "get_group_for_tab",
+ "get_section_ids",
+ "get_tab_ids",
+ "iter_tabs",
+]
diff --git a/functional_tests/test_support_menu_user_feature.py b/functional_tests/test_support_menu_user_feature.py
index 236a26d0e..1d653c895 100644
--- a/functional_tests/test_support_menu_user_feature.py
+++ b/functional_tests/test_support_menu_user_feature.py
@@ -16,6 +16,7 @@
import sys
import importlib.util
from test_support.templates import compose_if_admin_settings
+from test_support.nav import iter_tabs
CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -261,7 +262,6 @@ def test_support_menu_navigation_and_routes():
support_route_content = read_text(SUPPORT_ROUTE)
sidebar_markers = [
- 'data-section="support-menu-section"',
'id="support-menu-toggle"',
"url_for('frontend_support.support_latest_features')",
"url_for('frontend_support.support_send_feedback')",
@@ -270,6 +270,13 @@ def test_support_menu_navigation_and_routes():
missing_sidebar = [marker for marker in sidebar_markers if marker not in sidebar_content]
assert not missing_sidebar, f'Missing support menu sidebar markers: {missing_sidebar}'
+ # The admin destination for the Support card comes from the navigation map.
+ assert any(
+ section["id"] == "support-menu-section"
+ for _, tab in iter_tabs()
+ for section in tab["sections"]
+ ), 'Support menu admin destination missing from the navigation map'
+
assert sidebar_content.index('id="support-menu-toggle"') < sidebar_content.index('id="external-links-toggle"'), 'Support menu should render before external links in the sidebar'
short_sidebar_markers = [
diff --git a/functional_tests/test_workflow_access_controls.py b/functional_tests/test_workflow_access_controls.py
index 544e858da..3c455da17 100644
--- a/functional_tests/test_workflow_access_controls.py
+++ b/functional_tests/test_workflow_access_controls.py
@@ -12,7 +12,9 @@
import json
from pathlib import Path
from test_support.versioning import assert_app_version_at_least
+from test_support.nav import iter_tabs
from test_support.templates import compose_if_admin_settings
+from test_support.nav import iter_tabs
ROOT = Path(__file__).resolve().parents[1]
@@ -118,9 +120,11 @@ def test_workflow_access_control_wiring():
assert 'id="require_member_of_workflow_user"' in admin_template_content, (
"Expected admin WorkflowUser requirement toggle markup."
)
- assert 'data-section="workflow-settings-section"' in sidebar_template_content, (
- "Expected Admin Settings sidebar navigation to link to Workflow settings."
- )
+ assert any(
+ section["id"] == "workflow-settings-section"
+ for _, tab in iter_tabs()
+ for section in tab["sections"]
+ ), "Expected Admin Settings navigation to link to Workflow settings."
assert '{% if settings.allow_user_workflows %}' in workspace_template_content, (
"Expected workspace workflow tab and modals to be gated by effective workflow access."