Update User Controls defaults and enforce profile naming rules - PR_26162_050-user-controls-defaults-and-profile-rules

Author: ToolboxAid

account/user-controls-page.js

@@ -11,8 +11,8 @@ import {
 
 const DEVICE_POLL_INTERVAL_MS = 1200;
 const INPUT_CAPTURE_TIMEOUT_MS = 5000;
-const KEYBOARD_INPUTS = Object.freeze(["KeyW", "KeyA", "KeyS", "KeyD", "Space", "Enter", "Escape", "KeyP"]);
-const MOUSE_INPUTS = Object.freeze(["MouseButton0", "MouseButton2", "MouseX", "MouseY"]);
+const KEYBOARD_INPUTS = Object.freeze(["KeyW", "KeyA", "KeyS", "KeyD", "Space", "ShiftLeft", "ControlLeft", "Enter", "Backspace", "KeyP"]);
+const MOUSE_INPUTS = Object.freeze(["MouseButton0", "MouseButton2", "MouseButton1", "MouseWheelUp", "MouseWheelDown", "MouseX-", "MouseX+", "MouseY-", "MouseY+"]);
 const KEYBOARD_MOUSE_EXCLUDED_NORMALIZED_PREFIXES = Object.freeze(["dpad.", "trigger."]);
 const SUPPORTED_CONTROL_TYPES = Object.freeze([
   "Keyboard Key",
@@ -99,8 +99,13 @@ function rangeValueLabel(value, unit = "") {
   return `${value}${unit}`;
 }
 
-function physicalInputSupportsTuning(physicalInput) {
-  return physicalInputIsAnalog(physicalInput) || Boolean(physicalInputSensitivityDescriptor(physicalInput));
+function physicalInputSupportsDeadzoneInvert(physicalInput) {
+  const normalizedInput = normalizeText(physicalInput);
+  const lowerName = normalizedInput.toLowerCase();
+  return physicalInputIsAnalog(normalizedInput)
+    || lowerName.includes("trigger")
+    || normalizedInput === "LT"
+    || normalizedInput === "RT";
 }
 
 function createSliderControl({ ariaLabel, dataName, defaultValue, index, max, min, step, unit, value }) {
@@ -315,7 +320,7 @@ export class AccountUserControlsPage {
       this.profiles = result.profiles.map((profile) => this.normalizeProfile(profile));
       return true;
     }
-    this.setStatus(result?.message || "WARN: Account user controls could not reach the shared DB adapter.");
+    this.setStatus(result?.message || "WARN: User Controls could not reach the shared DB adapter.");
     return false;
   }
 
@@ -330,6 +335,43 @@ export class AccountUserControlsPage {
     });
   }
 
+  uniqueProfileForDevice(device) {
+    const family = this.profileListFamily(device);
+    const baseControllerName = normalizeText(device.controllerName) || family;
+    const baseProfileName = normalizeText(device.mappingProfile) || `${baseControllerName} Profile`;
+    const profileNames = new Set(this.profiles
+      .filter((profile) => this.profileListFamily(profile) === family)
+      .map((profile) => normalizeText(profile.mappingProfile).toLowerCase()));
+    let controllerName = baseControllerName;
+    let mappingProfile = baseProfileName;
+    let suffix = 2;
+    while (profileNames.has(mappingProfile.toLowerCase())) {
+      controllerName = `${baseControllerName} ${suffix}`;
+      mappingProfile = `${baseControllerName} ${suffix} Profile`;
+      suffix += 1;
+    }
+    return this.normalizeProfile({
+      controllerId: device.controllerId,
+      controllerName,
+      deviceType: device.deviceType,
+      inputMappings: normalizeProfileInputMappings(device.inputs),
+      inputs: device.inputs,
+      mappingProfile,
+    });
+  }
+
+  createProfile(device) {
+    const profile = this.uniqueProfileForDevice(device);
+    if (!this.saveProfiles([profile, ...this.profiles])) {
+      this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
+      return;
+    }
+    this.editingProfile = null;
+    this.viewingDefaultFamily = "";
+    this.renderProfiles();
+    this.setStatus(`PASS: Created ${profile.mappingProfile}. Use Edit to change it.`);
+  }
+
   renderDeviceSelect() {
     if (!this.elements.deviceSelect) {
       return;
@@ -661,8 +703,8 @@ export class AccountUserControlsPage {
       return row;
     }
     row.append(
-      tableCell(physicalInputSupportsTuning(inputMapping.physicalInput) ? String(inputMapping.deadzone) : "N/A"),
-      tableCell(physicalInputSupportsTuning(inputMapping.physicalInput) && inputMapping.invert ? "On" : physicalInputSupportsTuning(inputMapping.physicalInput) ? "Off" : "N/A"),
+      tableCell(physicalInputSupportsDeadzoneInvert(inputMapping.physicalInput) ? String(inputMapping.deadzone) : "N/A"),
+      tableCell(physicalInputSupportsDeadzoneInvert(inputMapping.physicalInput) && inputMapping.invert ? "On" : physicalInputSupportsDeadzoneInvert(inputMapping.physicalInput) ? "Off" : "N/A"),
       tableCell(physicalInputSensitivityDescriptor(inputMapping.physicalInput)
         ? rangeValueLabel(inputMapping.sensitivity ?? physicalInputSensitivityDescriptor(inputMapping.physicalInput).defaultValue, physicalInputSensitivityDescriptor(inputMapping.physicalInput).unit)
         : "N/A"),
@@ -830,13 +872,6 @@ export class AccountUserControlsPage {
       });
       positiveSelect.dataset.accountUserControlsInputPositive = String(index);
       stack.append(labeledControl("Negative", negativeSelect), labeledControl("Positive", positiveSelect));
-    } else if (family === "Keyboard") {
-      const value = normalizeText(inputMapping.normalizedInput) || "Unassigned";
-      const readonlyControl = document.createElement("span");
-      readonlyControl.className = "status";
-      readonlyControl.dataset.accountUserControlsInputNormalizedReadonly = String(index);
-      readonlyControl.textContent = value;
-      stack.append(readonlyControl);
     } else {
       const select = selectControl({
         ariaLabel: `${inputMapping.physicalInput} normalized control`,
@@ -857,7 +892,7 @@ export class AccountUserControlsPage {
     }
 
     const deadzoneCell = document.createElement("td");
-    if (physicalInputSupportsTuning(inputMapping.physicalInput)) {
+    if (physicalInputSupportsDeadzoneInvert(inputMapping.physicalInput)) {
       const deadzone = document.createElement("input");
       deadzone.type = "number";
       deadzone.min = "0";
@@ -871,7 +906,7 @@ export class AccountUserControlsPage {
     }
 
     const invertCell = document.createElement("td");
-    if (physicalInputSupportsTuning(inputMapping.physicalInput)) {
+    if (physicalInputSupportsDeadzoneInvert(inputMapping.physicalInput)) {
       const invert = document.createElement("input");
       invert.type = "checkbox";
       invert.checked = Boolean(inputMapping.invert);
@@ -984,37 +1019,13 @@ export class AccountUserControlsPage {
       this.setStatus("WARN: Choose a physical controller before creating a user control profile.");
       return;
     }
-    const existing = this.profiles.find((profile) => profile.deviceType === device.deviceType && profile.controllerId === device.controllerId);
-    if (existing) {
-      this.editingProfile = { id: existing.id, values: existing };
-      this.viewingDefaultFamily = "";
-      this.renderProfiles();
-      this.setStatus(`Editing existing ${existing.mappingProfile}.`);
-      return;
-    }
-    const profile = this.profileFromDevice(device);
-    this.editingProfile = { id: profile.id, values: profile };
-    this.viewingDefaultFamily = "";
-    this.renderProfiles();
-    this.setStatus(`Review ${profile.mappingProfile} before saving.`);
+    this.createProfile(device);
   }
 
   editFamilyMappings(family) {
     const normalizedFamily = family === "Mouse" ? "Mouse" : "Keyboard";
     const device = this.familyDevice(normalizedFamily);
-    const existing = this.profiles.find((profile) => profile.deviceType === device.deviceType && profile.controllerId === device.controllerId);
-    if (existing) {
-      this.editingProfile = { id: existing.id, values: existing };
-      this.viewingDefaultFamily = "";
-      this.renderProfiles();
-      this.setStatus(`Editing existing ${existing.mappingProfile}.`);
-      return;
-    }
-    const profile = this.profileFromDevice(device);
-    this.editingProfile = { id: profile.id, values: profile };
-    this.viewingDefaultFamily = "";
-    this.renderProfiles();
-    this.setStatus(`Review ${profile.mappingProfile} before saving.`);
+    this.createProfile(device);
   }
 
   profileFromEditingRow() {
@@ -1113,6 +1124,19 @@ export class AccountUserControlsPage {
     };
   }
 
+  duplicateProfileName(profile) {
+    const profileName = normalizeText(profile.mappingProfile).toLowerCase();
+    if (!profileName) {
+      return null;
+    }
+    const family = this.profileListFamily(profile);
+    return this.profiles.find((candidate) =>
+      candidate.id !== profile.id
+        && this.profileListFamily(candidate) === family
+        && normalizeText(candidate.mappingProfile).toLowerCase() === profileName,
+    ) || null;
+  }
+
   renderInputValidation(validation) {
     const invalidIndexes = new Set(validation.invalidIndexes || []);
     this.root.querySelectorAll("[data-account-user-controls-input-validation]").forEach((status) => {
@@ -1207,11 +1231,15 @@ export class AccountUserControlsPage {
       this.setStatus(`FAIL: ${validation.message}`);
       return;
     }
+    if (this.duplicateProfileName(profile)) {
+      this.setStatus(`FAIL: ${profile.mappingProfile} already exists for ${this.profileListFamily(profile)}.`);
+      return;
+    }
     const nextProfiles = this.editingProfile?.id && this.profiles.some((candidate) => candidate.id === this.editingProfile.id)
       ? this.profiles.map((candidate) => (candidate.id === this.editingProfile.id ? profile : candidate))
       : [profile, ...this.profiles];
     if (!this.saveProfiles(nextProfiles)) {
-      this.setStatus("FAIL: Account user controls could not reach the shared DB adapter.");
+      this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
       return;
     }
     this.editingProfile = null;

account/user-controls.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Account User Controls - GameFoundryStudio</title>
+    <title>User Controls - GameFoundryStudio</title>
     <meta name="description" content="Map personal physical controls to generic normalized controls.">
     <link rel="icon" href="/favicon.svg">
     <link rel="stylesheet" href="../assets/theme-v2/css/theme.css">
@@ -16,7 +16,7 @@
         <section class="page-title">
             <div class="container">
                 <div class="kicker">Account</div>
-                <h1>Account User Controls</h1>
+                <h1>User Controls</h1>
                 <p class="lede">Map your physical keyboard, mouse, game controller, joystick, or touch controls to generic normalized controls.</p>
             </div>
         </section>
@@ -26,9 +26,9 @@ <h1>Account User Controls</h1>
                 <div class="card">
                     <div class="card-body content-stack">
                         <div>
-                            <div class="kicker">Account User Controls</div>
+                            <div class="kicker">User Controls</div>
                             <h2>Physical Input Mapping</h2>
-                            <p>Account User Controls resolves physical input to normalized controls. Game behavior stays in Game Controls.</p>
+                            <p>User Controls resolves physical input to normalized controls. Game behavior stays in Game Controls.</p>
                         </div>
                         <div class="content-stack content-stack--compact">
                             <h3>Selected Device</h3>
@@ -130,7 +130,7 @@ <h3>Selected Device</h3>
                             <details class="vertical-accordion" open>
                                 <summary>Status</summary>
                                 <div class="accordion-body">
-                                    <div class="status" role="status" data-account-user-controls-status>Account User Controls ready.</div>
+                                    <div class="status" role="status" data-account-user-controls-status>User Controls ready.</div>
                                 </div>
                             </details>
                         </div>

docs_build/dev/reports/codex_changed_files.txt

@@ -4,7 +4,6 @@ docs_build/dev/reports/codex_changed_files.txt
 docs_build/dev/reports/codex_review.diff
 docs_build/dev/reports/coverage_changed_js_guardrail.txt
 docs_build/dev/reports/playwright_v8_coverage_report.txt
-src/dev-runtime/persistence/mock-db-store.js
-src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js
+src/engine/input/NormalizedInputRegistry.js
 tests/playwright/tools/InputMappingV2Tool.spec.mjs
-docs_build/dev/reports/user-controls-selected-device-fallback-report.md
+docs_build/dev/reports/user-controls-defaults-and-profile-rules-report.md

docs_build/dev/reports/codex_review.diff

@@ -8,7 +8,7 @@ Source: Playwright/Chromium built-in V8 coverage from the active Playwright run.
 Changed runtime JS files considered:
 (0%) src/dev-runtime/persistence/mock-db-store.js - WARNING: changed runtime JS file was not collected by Playwright V8 coverage; advisory only
 (0%) src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js - WARNING: changed runtime JS file was not collected by Playwright V8 coverage; advisory only
-(94%) toolbox/controls/controls.js - executed lines 667/667; executed functions 68/72
+(89%) src/engine/input/NormalizedInputRegistry.js - executed lines 341/341; executed functions 24/27
 
 Guardrail warnings:
 (0%) src/dev-runtime/persistence/mock-db-store.js - WARNING: changed runtime JS file missing from coverage; advisory only

docs_build/dev/reports/coverage_changed_js_guardrail.txt

@@ -19,7 +19,7 @@ Exercised tool entry points detected:
 Changed runtime JS files covered:
 (0%) src/dev-runtime/persistence/mock-db-store.js - WARNING: changed runtime JS file was not collected by Playwright V8 coverage; advisory only
 (0%) src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js - WARNING: changed runtime JS file was not collected by Playwright V8 coverage; advisory only
-(94%) toolbox/controls/controls.js - executed lines 667/667; executed functions 68/72
+(89%) src/engine/input/NormalizedInputRegistry.js - executed lines 341/341; executed functions 24/27
 
 Files with executed line/function counts where available:
 (11%) src/engine/input/InputMappingManifest.js - executed lines 78/78; executed functions 1/9
@@ -37,8 +37,8 @@ Files with executed line/function counts where available:
 (64%) assets/theme-v2/js/tool-display-mode.js - executed lines 209/209; executed functions 9/14
 (75%) toolbox/tool-registry-api-client.js - executed lines 152/152; executed functions 21/28
 (80%) src/engine/input/GamepadState.js - executed lines 100/100; executed functions 16/20
-(89%) src/engine/input/NormalizedInputRegistry.js - executed lines 321/321; executed functions 24/27
-(92%) account/user-controls-page.js - executed lines 1217/1217; executed functions 132/144
+(89%) src/engine/input/NormalizedInputRegistry.js - executed lines 341/341; executed functions 24/27
+(93%) account/user-controls-page.js - executed lines 1242/1242; executed functions 137/148
 (94%) toolbox/controls/controls.js - executed lines 667/667; executed functions 68/72
 (100%) account/user-controls.js - executed lines 2/2; executed functions 1/1
 (100%) toolbox/controls/controls-api-client.js - executed lines 12/12; executed functions 2/2
@@ -51,5 +51,5 @@ Changed JS files considered:
 (0%) src/dev-runtime/persistence/mock-db-store.js - changed JS file not collected as browser runtime coverage
 (0%) src/dev-runtime/persistence/tool-repositories/input-mapping-mock-repository.js - changed JS file not collected as browser runtime coverage
 (0%) tests/playwright/tools/InputMappingV2Tool.spec.mjs - changed JS file not collected as browser runtime coverage
-(92%) account/user-controls-page.js - changed JS file with browser V8 coverage
-(94%) toolbox/controls/controls.js - changed JS file with browser V8 coverage
+(89%) src/engine/input/NormalizedInputRegistry.js - changed JS file with browser V8 coverage
+(93%) account/user-controls-page.js - changed JS file with browser V8 coverage