Group user control profile selection by device type - PR_26163_067-user-controls-profile-radio-groups

Author: ToolboxAid

account/user-controls-page.js

@@ -139,7 +139,7 @@ export class AccountUserControlsPage {
     this.captureService = new InputCaptureService({ inputService: this.inputService });
     this.profiles = [];
     this.editingProfile = null;
-    this.selectedInputDevice = null;
+    this.selectedInputDevices = new Map();
     this.sessionUserKey = "";
     this.viewingDefaultFamily = "";
     this.devicePollingTimer = null;
@@ -162,7 +162,7 @@ export class AccountUserControlsPage {
     this.inputService.attach();
     this.sessionUserKey = this.currentSessionUserKey();
     this.profiles = this.readProfiles();
-    this.selectedInputDevice = this.readSelectedInputDevice();
+    this.selectedInputDevices = this.readSelectedInputDevices();
     this.renderDeviceSelect();
     this.renderDefaultFallbacks();
     this.renderTypes();
@@ -215,7 +215,7 @@ export class AccountUserControlsPage {
     this.repository = createControlsToolApiRepository();
     this.sessionUserKey = this.currentSessionUserKey();
     this.profiles = this.readProfiles();
-    this.selectedInputDevice = this.readSelectedInputDevice();
+    this.selectedInputDevices = this.readSelectedInputDevices();
     this.editingProfile = null;
     this.viewingDefaultFamily = "";
     this.renderDeviceSelect();
@@ -317,16 +317,46 @@ export class AccountUserControlsPage {
     return Array.isArray(result) ? result.map((profile) => this.normalizeProfile(profile)) : [];
   }
 
-  readSelectedInputDevice() {
+  selectionFamily(selection = {}) {
+    const deviceType = normalizeText(selection.deviceType);
+    if (deviceType === "Keyboard" || deviceType === "Mouse") {
+      return deviceType;
+    }
+    return "Gamepad";
+  }
+
+  selectedInputDeviceForFamily(family) {
+    return this.selectedInputDevices.get(this.selectionFamily({ deviceType: family })) || null;
+  }
+
+  selectedInputDeviceMapFromList(selections = []) {
+    const selectedInputDevices = new Map();
+    (Array.isArray(selections) ? selections : []).forEach((selection) => {
+      if (selection?.selectionKey) {
+        selectedInputDevices.set(this.selectionFamily(selection), selection);
+      }
+    });
+    return selectedInputDevices;
+  }
+
+  readSelectedInputDevices() {
     if (!this.currentSessionUserKey()) {
-      return null;
+      return new Map();
+    }
+    let result = this.repository.listSelectedInputDevices();
+    if (result?.error) {
+      this.repository = createControlsToolApiRepository();
+      result = this.repository.listSelectedInputDevices();
     }
-    let result = this.repository.getSelectedInputDevice();
+    if (Array.isArray(result)) {
+      return this.selectedInputDeviceMapFromList(result);
+    }
+    result = this.repository.getSelectedInputDevice();
     if (result?.error) {
       this.repository = createControlsToolApiRepository();
       result = this.repository.getSelectedInputDevice();
     }
-    return result && !result.error ? result : null;
+    return result && !result.error ? this.selectedInputDeviceMapFromList([result]) : new Map();
   }
 
   saveSelectedInputDevice(selection) {
@@ -339,8 +369,13 @@ export class AccountUserControlsPage {
       this.repository = createControlsToolApiRepository();
       result = this.repository.saveSelectedInputDevice(selection);
     }
+    if (Array.isArray(result?.selectedInputDevices)) {
+      this.selectedInputDevices = this.selectedInputDeviceMapFromList(result.selectedInputDevices);
+      this.renderSelectedInputDevices();
+      return true;
+    }
     if (result?.selectedInputDevice) {
-      this.selectedInputDevice = result.selectedInputDevice;
+      this.selectedInputDevices.set(this.selectionFamily(result.selectedInputDevice), result.selectedInputDevice);
       this.renderSelectedInputDevices();
       return true;
     }
@@ -552,14 +587,21 @@ export class AccountUserControlsPage {
     if (!this.elements.selectedDeviceStatus) {
       return;
     }
-    if (!this.selectedInputDevice?.selectionKey) {
+    const selections = ["Keyboard", "Mouse", "Gamepad"]
+      .map((family) => this.selectedInputDeviceForFamily(family))
+      .filter(Boolean);
+    if (!selections.length) {
       this.elements.selectedDeviceStatus.textContent = "Default Profile";
       return;
     }
-    const connected = this.selectedInputDeviceConnected(this.selectedInputDevice);
-    this.elements.selectedDeviceStatus.textContent = connected
-      ? `Selected Device: ${this.selectedInputDevice.label || this.selectedInputDevice.deviceType}.`
-      : "Selected device not connected. Using Default Profile.";
+    const labels = selections.map((selection) => (
+      this.selectedInputDeviceConnected(selection)
+        ? selection.label || selection.deviceType
+        : `${selection.deviceType} selected device not connected. Using Default Profile`
+    ));
+    this.elements.selectedDeviceStatus.textContent = labels.length === 1
+      ? `Selected Device: ${labels[0]}.`
+      : `Selected Devices: ${labels.join("; ")}.`;
   }
 
   renderSelectedInputDevices() {
@@ -742,11 +784,12 @@ export class AccountUserControlsPage {
   selectedDeviceCell(choice) {
     const cell = document.createElement("td");
     const input = document.createElement("input");
+    const family = this.selectionFamily(choice);
     input.type = "radio";
-    input.name = "account-user-controls-selected-device";
+    input.name = `account-user-controls-selected-device-${family.toLowerCase()}`;
     input.value = choice.selectionKey;
     input.dataset.accountUserControlsSelectedDevice = choice.selectionKey;
-    input.checked = this.selectedInputDevice?.selectionKey === choice.selectionKey;
+    input.checked = this.selectedInputDeviceForFamily(family)?.selectionKey === choice.selectionKey;
     input.setAttribute("aria-label", `Select ${choice.label}`);
     cell.append(input);
     return cell;

docs_build/dev/reports/PR_26163_067-user-controls-profile-radio-groups.md

@@ -0,0 +1,77 @@
+# PR_26163_067-user-controls-profile-radio-groups
+
+## Branch Validation
+- PASS: Current branch is `main`.
+- Expected branch: `main`.
+
+## Summary
+- Updated Account > User Controls selected profile radios so Keyboard, Mouse, and Gamepad selections each use an independent radio group.
+- Persisted active profile selection by device type through the shared mock DB adapter.
+- Kept detected controller rows profile-free; controller detection continues to feed the dropdown workflow only.
+
+## Requirement Checklist
+- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before edits.
+- PASS: Verified current branch is `main` before changes.
+- PASS: Keyboard profiles use radio group `account-user-controls-selected-device-keyboard`.
+- PASS: Mouse profiles use radio group `account-user-controls-selected-device-mouse`.
+- PASS: Gamepad profiles use radio group `account-user-controls-selected-device-gamepad`.
+- PASS: Selecting a Gamepad profile does not deselect the active Keyboard profile.
+- PASS: Selecting a Mouse profile does not deselect the active Gamepad profile.
+- PASS: One active profile is persisted per device type for Keyboard, Mouse, and Gamepad.
+- PASS: Default profiles participate in their device-type groups.
+- PASS: User-created profiles participate in their device-type groups.
+- PASS: Detection rows remain profile-free and contain no radios.
+- PASS: Active profile selection persists by device type for the current user.
+- PASS: Scope stayed limited to Account/User Controls profile selection behavior, mock DB selection persistence, targeted tests, and required reports.
+
+## Changed Files
+- `account/user-controls-page.js`
+- `src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js`
+- `tests/playwright/tools/InputMappingV2Tool.spec.mjs`
+- `docs_build/dev/reports/playwright_v8_coverage_report.txt`
+- `docs_build/dev/reports/PR_26163_067-user-controls-profile-radio-groups.md`
+- `docs_build/dev/reports/codex_changed_files.txt`
+- `docs_build/dev/reports/codex_review.diff`
+
+## Impacted Lane
+- Account/User Controls profile selection.
+- Shared mock DB adapter persistence for selected input device/profile records.
+- Targeted Account/User Controls Playwright coverage.
+
+## Validation Performed
+- PASS: `node --check account/user-controls-page.js`
+- PASS: `node --check src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js`
+- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
+- PASS: `rg -n '<style| on[a-z]+=' account/user-controls.html account/user-controls-page.js src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` returned no matches.
+- PASS: `git diff --check -- account/user-controls-page.js src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
+- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|User Controls creates one profile from only the selected controller dropdown device" --reporter=line`
+  - Result: 2 passed.
+- PASS: `npm run test:workspace-v2`
+  - Result: 5 passed in the workspace-contract lane.
+
+## Playwright Result
+- PASS: Targeted Account/User Controls Playwright checks passed.
+- PASS: Required `npm run test:workspace-v2` passed.
+
+## V8 Coverage
+- PASS: `account/user-controls-page.js` collected browser V8 coverage at 92%.
+- WARN: `src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js` is exercised through the local dev-runtime/server path, but Chromium browser V8 coverage does not collect that server-side module.
+- Report: `docs_build/dev/reports/playwright_v8_coverage_report.txt`.
+
+## Manual Validation Steps
+1. Open `account/user-controls.html` as a signed-in user.
+2. Select Keyboard Default Profile, Mouse Default Profile, and Gamepad Default Profile; confirm all three stay selected and the status lists all selected devices.
+3. Create and save Keyboard, Mouse, and Gamepad user profiles.
+4. Select one user-created profile in each device type; confirm selecting one device type does not clear the other device type selections.
+5. Refresh detected controllers; confirm detected controllers appear in the controller dropdown and no detected row radios are rendered.
+6. Reload the page; confirm active Keyboard, Mouse, and Gamepad selections persist for the current user.
+
+## Skipped Lanes
+- SKIP: Full samples smoke test. Safe to skip because this PR only changes Account/User Controls profile selection and mock DB persistence, and the user explicitly requested no full samples smoke test.
+- SKIP: Unrelated Toolbox/Game Controls lanes. Safe to skip because no Toolbox/Game Controls runtime behavior changed.
+
+## Samples Validation
+- SKIP: Full samples smoke test was not run by request.
+
+## Packaging
+- PASS: Repo-structured delta ZIP produced under `tmp/PR_26163_067-user-controls-profile-radio-groups_delta.zip`.

docs_build/dev/reports/codex_changed_files.txt

@@ -1,7 +1,8 @@
-account/user-controls.html
-assets/theme-v2/css/layout.css
-assets/theme-v2/css/typography.css
+account/user-controls-page.js
+src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js
 tests/playwright/tools/InputMappingV2Tool.spec.mjs
-docs_build/dev/reports/PR_26163_066-user-controls-layout-polish.md
+docs_build/dev/reports/playwright_v8_coverage_report.txt
+docs_build/dev/reports/PR_26163_067-user-controls-profile-radio-groups.md
 docs_build/dev/reports/codex_review.diff
 docs_build/dev/reports/codex_changed_files.txt
+tmp/PR_26163_067-user-controls-profile-radio-groups_delta.zip