diff --git a/docs/explanation/features/ADMIN_SETTINGS_IA_REWORK_STATUS.md b/docs/explanation/features/ADMIN_SETTINGS_IA_REWORK_STATUS.md
index 1426a3870..c0493e8be 100644
--- a/docs/explanation/features/ADMIN_SETTINGS_IA_REWORK_STATUS.md
+++ b/docs/explanation/features/ADMIN_SETTINGS_IA_REWORK_STATUS.md
@@ -22,8 +22,8 @@ Development ─── feature/admin-settings-ia ──┬── #1297 stage 1
└──► final PR ──► Development
```
-Current version: **0.260.015**. Fingerprint: **462 field names / 110 card ids**.
-Navigation: **14 groups / 40 tabs / 88 sections**.
+Current version: **0.260.016**. Fingerprint: **462 field names / 110 card ids**.
+Navigation: **14 groups / 44 tabs / 88 sections**. Stage D is complete.
### Shipped
@@ -118,10 +118,39 @@ moved from Scale to Security that way.
| Workflow | **New group**, split out of Workspaces |
| AI Models | → Model Endpoints (carries the legacy modal and its nested Chat Model card), Embeddings, Image Generation |
| Agents & Actions | → Agents, Actions, Inbound MCP (whole tab behind `mcp_ui_enabled`) |
+| Backup & Recovery | → Backup, Migrate, Restore, Cosmos Editor, Jobs |
+
+**Stage D is complete.** 14 groups, 44 tabs, from 17 flat tabs.
+
+### Backup & Recovery: complication I4, resolved
+
+The pane was 1,622 lines and needed three things the tools could not do:
+
+- **The migration card is a `
`, not a ``**, so every div-balancing
+ helper walked straight past it. Its boundaries had to be found by balancing
+ `` instead. This is why the tools reported 5 top-level cards when
+ there were 6.
+- **Eleven dialogs**, six of them opened from JavaScript rather than a button,
+ serving what became five different tabs. All were lifted to the shell.
+ Checked first that none carried a `name=` attribute: the pane's twelve form
+ fields are all radio groups inside the migration card, which stayed put.
+- **Shared controls.** One save button, one status line and one operational
+ warning serve all five tabs.
+
+### Group-shared regions
+
+Shared controls cannot be copied into each pane (duplicate element ids, and the
+JavaScript module would bind to the wrong one) and cannot live in one pane (an
+inactive pane is hidden, so the other four tabs lose the save button). They now
+sit outside the panes in a region marked `data-admin-group-shared=""`,
+revealed only while that group is active.
+
+`syncAdminGroupSharedRegions()` resolves the owning group from **either**
+navigation. Reading only the top tab strip was a real bug: that strip is not
+rendered at all in the sidebar layout, so the Backup & Recovery save button
+would have been hidden permanently. Verified against a simulated DOM in both
+layouts.
-**Only Backup & Recovery is left**, and it is the hardest: complication I4, a
-~985-line migration workflow that must split across Backup / Migrate / Restore
-/ Jobs as one unit.
### Card container ids are not the nav section ids
diff --git a/docs/explanation/release_notes.md b/docs/explanation/release_notes.md
index c89efb87f..44a95b9b7 100644
--- a/docs/explanation/release_notes.md
+++ b/docs/explanation/release_notes.md
@@ -2,6 +2,28 @@
For feature-focused and fix-focused drill-downs by version, see [Features by Version](/explanation/features/) and [Fixes by Version](/explanation/fixes/).
+### **(v0.260.016)**
+
+#### User Interface Enhancements
+
+* **Backup, Migrate & Restore Split Into Five Tabs**
+ * One tab carried the entire backup, migration, restore, Cosmos editing and job history surface — over 1,600 lines in a single scroll.
+ * Backup & Recovery now has **Backup** (readiness, backup, schedule, storage, encryption), **Migrate**, **Restore**, **Cosmos Editor** and **Jobs**.
+ * The save button, status line and operational-hours warning are shared by all five tabs, so they sit above the tabs and stay available wherever you are in the group.
+ * This completes the Admin Settings restructure: **14 groups and 44 tabs**, from an original 17 flat tabs.
+ * (Ref: `backup`, `migrate`, `restore`, `cosmos-editor`, `jobs`)
+
+#### Bug Fixes
+
+* **Backup Dialogs Remain Available From Every Tab**
+ * The eleven Backup & Recovery dialogs are opened from more than one place and several are opened from code rather than a button. Left inside a tab, a dialog cannot appear while a different tab is showing.
+ * They now sit outside the tabs, so restore, migration cancel, job detail, the Cosmos editor dialogs and the five setup guides all open wherever they are triggered from.
+ * (Ref: Backup & Recovery dialogs, `admin_data_management.js`)
+
+* **Shared Controls Work In Both Navigation Layouts**
+ * Shared group controls resolve their group from whichever navigation is on screen, so the Backup & Recovery save button is present in the sidebar layout as well as the tab layout.
+ * (Ref: `data-admin-group-shared`, `admin_sidebar_nav.js`)
+
### **(v0.260.015)**
#### User Interface Enhancements
diff --git a/functional_tests/test_admin_settings_group_shared_regions.py b/functional_tests/test_admin_settings_group_shared_regions.py
new file mode 100644
index 000000000..00a50fd65
--- /dev/null
+++ b/functional_tests/test_admin_settings_group_shared_regions.py
@@ -0,0 +1,166 @@
+#!/usr/bin/env python3
+"""
+Functional test for Admin Settings group-shared control regions.
+Version: 0.260.016
+Implemented in: 0.260.016
+
+Some groups share one set of controls across all of their tabs. Backup &
+Recovery is the case that forced this: five tabs share a single save button,
+one status line and one operational warning, all driven by one JavaScript
+module.
+
+Those controls cannot be copied into each pane, because that repeats element
+ids and the module would bind to the wrong one. They cannot live in a single
+pane either, because an inactive tab pane is hidden, so the other four tabs
+would lose the save button. So they sit outside the panes and are revealed
+only while their group is active.
+
+This test ensures that arrangement holds.
+"""
+
+import os
+import re
+import sys
+import collections
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from test_support.templates import read_admin_settings_template # noqa: E402
+from test_support.nav import iter_tabs # noqa: E402
+
+APP_ROOT = os.path.join(
+ os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+ "application",
+ "single_app",
+)
+SIDEBAR_JS = os.path.join(APP_ROOT, "static", "js", "admin", "admin_sidebar_nav.js")
+
+SHARED_REGION_PATTERN = re.compile(r'data-admin-group-shared="([a-z0-9-]+)"')
+
+
+def _read(path):
+ with open(path, "r", encoding="utf-8") as handle:
+ return handle.read()
+
+
+def test_shared_regions_name_a_real_group():
+ """A shared region must belong to a group that exists in the nav map."""
+ print("Testing group-shared regions reference real groups...")
+
+ markup = read_admin_settings_template()
+ owners = SHARED_REGION_PATTERN.findall(markup)
+ assert owners, "Expected at least one group-shared region"
+
+ known_groups = {group["id"] for group, _ in iter_tabs()}
+ unknown = sorted(set(owners) - known_groups)
+ assert not unknown, f"Shared regions reference groups that do not exist: {unknown}"
+
+ print(f"All {len(owners)} shared region(s) reference a real group.")
+ return True
+
+
+def test_shared_regions_sit_outside_every_pane():
+ """A shared region inside a pane would be hidden with that pane."""
+ print("Testing group-shared regions sit outside the tab panes...")
+
+ markup = read_admin_settings_template()
+ for match in SHARED_REGION_PATTERN.finditer(markup):
+ before = markup[: match.start()]
+ # Every pane opens with a tab-pane div and the tab content container
+ # comes after all shared regions, so a shared region declared after the
+ # container has been opened would be inside it.
+ assert 'id="adminSettingsTabContent"' not in before, (
+ f"Shared region '{match.group(1)}' is declared inside the tab content "
+ "container, where it would be hidden along with the active pane"
+ )
+
+ print("Shared regions are declared before the tab content container.")
+ return True
+
+
+def test_shared_controls_are_not_duplicated():
+ """The whole point is one control serving many tabs, not one per tab."""
+ print("Testing shared controls appear exactly once...")
+
+ markup = read_admin_settings_template()
+ ids = collections.Counter(re.findall(r'\sid="([A-Za-z0-9_-]+)"', markup))
+ duplicates = sorted(element_id for element_id, count in ids.items() if count > 1)
+ assert not duplicates, (
+ "Element ids declared more than once in the composed Admin Settings "
+ f"template: {duplicates}"
+ )
+
+ print(f"All {len(ids)} element ids in Admin Settings are unique.")
+ return True
+
+
+def test_shared_regions_are_synced_on_tab_change():
+ """A region that is never toggled would stay hidden forever."""
+ print("Testing shared regions are synced when the tab changes...")
+
+ source = _read(SIDEBAR_JS)
+ assert "function syncAdminGroupSharedRegions(" in source, (
+ "Expected a helper that reveals the shared region for the active group"
+ )
+ # Called from the programmatic path, the initial-load path, and Bootstrap's
+ # own tab event, so no route into a tab leaves the region stale.
+ call_count = source.count("syncAdminGroupSharedRegions(")
+ assert call_count >= 4, (
+ f"Expected the sync helper to be defined and called from every path "
+ f"that activates a tab, found {call_count} references"
+ )
+ assert "shown.bs.tab" in source, (
+ "Clicking a tab button directly does not go through showAdminTab, so "
+ "Bootstrap's shown.bs.tab event must also sync the shared regions"
+ )
+
+ print("Shared regions are synced from every path that activates a tab.")
+ return True
+
+
+def test_shared_region_lookup_handles_both_navigations():
+ """Only one navigation renders at a time, so both must resolve the group."""
+ print("Testing group lookup works in the tab and sidebar layouts...")
+
+ source = _read(SIDEBAR_JS)
+ match = re.search(r"function syncAdminGroupSharedRegions\(tabId\) \{.*?\n\}", source, re.S)
+ assert match, "Expected the shared region sync helper"
+ body = match.group(0)
+
+ # The top tab strip is skipped entirely in the sidebar layout, so a lookup
+ # that only reads `.admin-tab-item` would leave the region hidden for good
+ # and Backup & Recovery would lose its only save button.
+ assert ".admin-tab-item[data-admin-group]" in body, (
+ "Expected the tab layout lookup"
+ )
+ assert ".admin-nav-tab[data-tab=" in body, (
+ "Expected a sidebar layout fallback so the region resolves when the top "
+ "tab strip is not rendered"
+ )
+
+ print("Both navigation layouts can resolve the owning group.")
+ return True
+
+
+if __name__ == "__main__":
+ tests = [
+ test_shared_regions_name_a_real_group,
+ test_shared_regions_sit_outside_every_pane,
+ test_shared_controls_are_not_duplicated,
+ test_shared_regions_are_synced_on_tab_change,
+ test_shared_region_lookup_handles_both_navigations,
+ ]
+ results = []
+ for test in tests:
+ print(f"\nRunning {test.__name__}...")
+ try:
+ results.append(bool(test()))
+ except Exception as error: # noqa: BLE001 - report and continue
+ print(f"Test failed: {error}")
+ import traceback
+
+ traceback.print_exc()
+ results.append(False)
+
+ print(f"\nResults: {sum(results)}/{len(results)} tests passed")
+ sys.exit(0 if all(results) else 1)
diff --git a/functional_tests/test_data_management_security_patterns.py b/functional_tests/test_data_management_security_patterns.py
index 284c123be..982adfcca 100644
--- a/functional_tests/test_data_management_security_patterns.py
+++ b/functional_tests/test_data_management_security_patterns.py
@@ -414,8 +414,13 @@ def test_admin_ui_exposes_data_management_without_external_assets():
sidebar = read_text(SIDEBAR_TEMPLATE)
for marker in [
- 'id="data-management"',
- 'id="data-management" role="tabpanel" aria-labelledby="data-management-tab" data-testid="data-management-tab-pane" data-ignore-settings-change="true"',
+ # Backup, Migrate & Restore is now five tabs rather than one, so each
+ # pane is asserted individually.
+ 'id="backup" role="tabpanel" aria-labelledby="backup-tab" data-testid="backup-tab-pane" data-ignore-settings-change="true"',
+ 'id="migrate" role="tabpanel" aria-labelledby="migrate-tab" data-testid="migrate-tab-pane" data-ignore-settings-change="true"',
+ 'id="restore" role="tabpanel" aria-labelledby="restore-tab" data-testid="restore-tab-pane" data-ignore-settings-change="true"',
+ 'id="cosmos-editor" role="tabpanel" aria-labelledby="cosmos-editor-tab" data-testid="cosmos-editor-tab-pane" data-ignore-settings-change="true"',
+ 'id="jobs" role="tabpanel" aria-labelledby="jobs-tab" data-testid="jobs-tab-pane" data-ignore-settings-change="true"',
'id="data-management-save-settings-btn"',
'id="data-management-save-settings-btn" disabled aria-disabled="true"',
'id="data-management-operational-warning"',
@@ -564,27 +569,32 @@ def test_admin_ui_exposes_data_management_without_external_assets():
assert "window.updateAdminSettingsSaveButtonState = updateSaveButtonState;" in admin_settings_js
assert 'Target Cosmos' not in sidebar
# Sidebar labels now come from the navigation map, which both the sidebar
- # and the top tab strip render from.
+ # and the top tab strip render from. Backup, Migrate & Restore is spread
+ # across the Backup & Recovery group's tabs, so scope by group rather than
+ # by a single tab id.
+ backup_recovery_tabs = [
+ tab for group, tab in iter_tabs() if group["id"] == "backup-recovery"
+ ]
+ assert backup_recovery_tabs, "Backup & Recovery group missing from the navigation map"
+
data_management_sections = {
section["label"]
- for _, tab in iter_tabs()
- if tab["id"] == "data-management"
+ for tab in backup_recovery_tabs
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"
+
+ tab_labels = {tab["label"] for tab in backup_recovery_tabs}
+ for expected_label in ("Backup", "Migrate", "Restore", "Jobs"):
+ assert expected_label in tab_labels, (
+ f"Backup & Recovery is missing the {expected_label} tab"
+ )
assert 'cdn.jsdelivr.net' not in read_text(ADMIN_JS)
- 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 tab in backup_recovery_tabs
for section in tab["sections"]
}
for expected_section in (