Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Allow multiple user control profiles per controller without replaceme… · ToolboxAid/HTML-JavaScript-Gaming@fcd74bb · GitHub
Skip to content

Commit fcd74bb

Browse files
committed
Allow multiple user control profiles per controller without replacement - PR_26163_065-user-controls-multiple-profiles-per-controller
1 parent fa45a1c commit fcd74bb

6 files changed

Lines changed: 282 additions & 313 deletions

File tree

‎account/user-controls-page.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ export class AccountUserControlsPage {
382382
constfamily=this.profileListFamily(device);
383383
constbaseControllerName=normalizeText(device.controllerName)||family;
384384
constbaseProfileName=normalizeText(device.mappingProfile)||`${baseControllerName} Profile`;
385+
constprofileIds=newSet(this.profiles.map((profile)=>normalizeText(profile.id)));
385386
constprofileNames=newSet(this.profiles
386387
.filter((profile)=>this.profileListFamily(profile)===family)
387388
.map((profile)=>normalizeText(profile.mappingProfile).toLowerCase()));
@@ -393,10 +394,18 @@ export class AccountUserControlsPage {
393394
mappingProfile=`${baseControllerName}${suffix} Profile`;
394395
suffix+=1;
395396
}
397+
constbaseProfileId=this.profileIdFor({controllerId: device.controllerId, mappingProfile });
398+
letprofileId=baseProfileId;
399+
letidSuffix=2;
400+
while(profileIds.has(profileId)){
401+
profileId=`${baseProfileId}-${idSuffix}`;
402+
idSuffix+=1;
403+
}
396404
returnthis.normalizeProfile({
397405
controllerId: device.controllerId,
398406
controllerName,
399407
deviceType: device.deviceType,
408+
id: profileId,
400409
inputMappings: normalizeProfileInputMappings(device.inputs),
401410
inputs: device.inputs,
402411
mappingProfile,
@@ -415,7 +424,7 @@ export class AccountUserControlsPage {
415424
constprofile=this.uniqueProfileForDevice(device);
416425
letcreatedProfile=profile;
417426
if(persistImmediately){
418-
if(!this.saveProfiles([profile,...this.profiles])){
427+
if(!this.saveProfiles([...this.profiles,profile])){
419428
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
420429
return;
421430
}
@@ -1311,7 +1320,7 @@ export class AccountUserControlsPage {
13111320
}
13121321
constnextProfiles=this.editingProfile?.id&&this.profiles.some((candidate)=>candidate.id===this.editingProfile.id)
13131322
? this.profiles.map((candidate)=>(candidate.id===this.editingProfile.id ? profile : candidate))
1314-
: [profile,...this.profiles];
1323+
: [...this.profiles,profile];
13151324
if(!this.saveProfiles(nextProfiles)){
13161325
this.setStatus("FAIL: User Controls could not reach the shared DB adapter.");
13171326
return;
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# PR_26163_065-user-controls-multiple-profiles-per-controller
2+
3+
## Branch Validation
4+
5+
- PASS: Current branch is `main`.
6+
- PASS: Expected branch is `main`.
7+
- Evidence: `git branch --show-current` returned `main`.
8+
9+
## Requirement Checklist
10+
11+
- PASS: Read `docs_build/dev/PROJECT_INSTRUCTIONS.md` before implementation.
12+
- PASS: Every `Create User Control Profile` action for a selected controller creates a brand-new unsaved profile object with a unique generated `id`.
13+
- PASS: Creation no longer reuses, replaces, edits, overwrites, or reopens an existing saved profile for the same controller.
14+
- PASS: Unique profile key/id generation now checks existing profile IDs and suffixes new IDs when the generated base ID is already owned by another saved profile.
15+
- PASS: New profile names still start from generated default names and remain editable before save.
16+
- PASS: Saving a new profile appends it to the current user's profiles instead of replacing an existing record.
17+
- PASS: Existing profiles, including a renamed `1.1 Profile`, remain unchanged when another profile is generated for the same physical controller.
18+
- PASS: A user can create multiple profiles for the same physical controller; Playwright validates two saved profiles with the same `controllerId` and distinct IDs.
19+
- PASS: Preserved the controller dropdown workflow: `[ Refresh Devices ] [ Controller Dropdown ] [ Create User Control Profile ]`.
20+
- PASS: Detection/refresh still creates zero profiles.
21+
- PASS: Did not change `toolbox/controls`; those files remain game-owned Controls and are outside this PR.
22+
23+
## Search And Diff Evidence
24+
25+
- PASS: `git diff --name-only` contains only account User Controls runtime, targeted Playwright coverage, and report artifacts.
26+
- PASS: `git diff --name-only` contains no `toolbox/controls` files.
27+
- PASS: `rg -n "baseProfileId|profileIds|\\.\\.\\.this\\.profiles, profile|1\\.1 Profile|Studio Flight Pad Profile" account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs` shows unique ID generation, append-on-save, and the Playwright 1.1 regression path.
28+
29+
## Changed Files
30+
31+
-`account/user-controls-page.js`
32+
-`tests/playwright/tools/InputMappingV2Tool.spec.mjs`
33+
-`docs_build/dev/reports/playwright_v8_coverage_report.txt`
34+
-`docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md`
35+
-`docs_build/dev/reports/codex_changed_files.txt`
36+
-`docs_build/dev/reports/codex_review.diff`
37+
38+
## Impacted Lane
39+
40+
- Account/User Controls runtime lane.
41+
- Targeted Account/User Controls Playwright lane.
42+
- Required legacy workspace command: `npm run test:workspace-v2`.
43+
44+
Note: `npm run test:workspace-v2` is a legacy command name retained by repo scripts.
45+
46+
## Skipped Lanes
47+
48+
- Full samples smoke: SKIP. Safe because this PR changes only account User Controls profile generation and targeted Playwright coverage; no sample JSON, sample loader, or game runtime sample path changed.
49+
- Engine input lane: SKIP. Safe because `src/engine/input` was consumed but not modified.
50+
- Toolbox Controls lane: SKIP. Safe because no `toolbox/controls` files changed.
51+
52+
## Testing Performed
53+
54+
- PASS: `node --check account/user-controls-page.js`
55+
- PASS: `node --check tests/playwright/tools/InputMappingV2Tool.spec.mjs`
56+
- PASS: `git diff --check -- account/user-controls-page.js tests/playwright/tools/InputMappingV2Tool.spec.mjs`
57+
- PASS: `rg -n "<style| on[a-z]+=" account/user-controls.html` returned no inline style/event handler matches.
58+
- PASS: `npx playwright test tests/playwright/tools/InputMappingV2Tool.spec.mjs --grep "User Controls owns physical input mapping accordions and profiles|selected controller dropdown device" --reporter=line` passed 2 tests.
59+
- PASS: `npm run test:workspace-v2` passed; workspace-contract lane reported 5 passed.
60+
61+
## Playwright Result
62+
63+
- PASS: Targeted Account/User Controls Playwright checks passed.
64+
- PASS: Required `npm run test:workspace-v2` passed.
65+
66+
## V8 Coverage
67+
68+
- PASS: `docs_build/dev/reports/playwright_v8_coverage_report.txt` includes changed runtime JavaScript coverage.
69+
- PASS: `(92%) account/user-controls-page.js - changed runtime JS file with browser V8 coverage`.
70+
71+
## Manual Validation Steps
72+
73+
1. Open `/account/user-controls.html` while signed in.
74+
2. In Game Controllers, click Refresh Devices and select a detected controller from the Controller dropdown.
75+
3. Click Create User Control Profile.
76+
4. Rename the editing profile to `1.1` and save.
77+
5. Confirm `1.1 Profile` remains visible as a saved profile.
78+
6. Select the same controller again and click Create User Control Profile.
79+
7. Confirm a distinct new editable unsaved profile opens with a generated default name.
80+
8. Save it and confirm both `1.1 Profile` and the new profile exist with distinct profile IDs.
81+
9. Refresh/detect devices again and confirm no profile is created until Create User Control Profile is clicked.
82+
83+
## Samples Validation Decision
84+
85+
- SKIP: Full samples smoke was not run because no samples, sample JSON, sample loader, or production game runtime behavior changed.
86+
87+
## ZIP Artifact
88+
89+
- PASS: Repo-structured delta ZIP produced at `tmp/PR_26163_065-user-controls-multiple-profiles-per-controller_delta.zip`.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
account/user-controls.html
21
account/user-controls-page.js
32
tests/playwright/tools/InputMappingV2Tool.spec.mjs
43
docs_build/dev/reports/playwright_v8_coverage_report.txt
5-
docs_build/dev/reports/PR_26163_064-user-controls-controller-dropdown-selection.md
4+
docs_build/dev/reports/PR_26163_065-user-controls-multiple-profiles-per-controller.md
65
docs_build/dev/reports/codex_review.diff
76
docs_build/dev/reports/codex_changed_files.txt

0 commit comments

Comments
 (0)