forked from DSpace/dspace-angular
-
Notifications
You must be signed in to change notification settings - Fork 2
UFAL/Resolve duplicate html IDs in submission form #1234
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Kasinhou
wants to merge
3
commits into
dtq-dev
Choose a base branch
from
ufal/html-ids-fix
base: dtq-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+139
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
src/app/shared/form/builder/ds-dynamic-form-ui/unique-id-registry.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /** | ||
| * Static registry for generating unique HTML element IDs across dynamic form components. | ||
| * | ||
| * When the same form model ID appears multiple times in the DOM (e.g., scrollable dropdowns | ||
| * for mediaType/detailedType in different type-bound form groups), this registry ensures | ||
| * each rendered instance receives a unique HTML ID. | ||
| * | ||
| * - First occurrence: keeps the original base ID (backward compatible). | ||
| * - Subsequent occurrences: appends a numeric suffix (`_1`, `_2`, etc.). | ||
| * | ||
| * Components must call `register()` during initialization and `release()` during destruction. | ||
| */ | ||
| export class UniqueIdRegistry { | ||
|
|
||
| /** | ||
| * Monotonic counter per base ID. Always increments, never decrements, | ||
| * so released suffixes are never reissued to a different instance. | ||
| * Key = base element ID, Value = next suffix to assign. | ||
| */ | ||
| private static nextSuffix: Map<string, number> = new Map<string, number>(); | ||
|
|
||
| /** | ||
| * Tracks the assigned suffix for each component instance. | ||
| * Key = a unique instance token (component + model-based), Value = the suffix index assigned. | ||
| */ | ||
| private static instanceSuffixes: Map<string, number> = new Map<string, number>(); | ||
|
|
||
| /** | ||
| * Register a base ID and return a unique ID for this instance. | ||
| * The first occurrence returns the base ID unchanged. | ||
| * Subsequent occurrences return `baseId_N` where N is the occurrence index (1, 2, ...). | ||
| * | ||
| * @param baseId The base element ID (from getElementId). | ||
| * @param instanceKey A unique key identifying this specific component instance. | ||
| * @returns The unique element ID to use in the DOM. | ||
| */ | ||
| static register(baseId: string, instanceKey: string): string { | ||
| // If this instance was already registered, return its existing ID | ||
| if (this.instanceSuffixes.has(instanceKey)) { | ||
| const suffix = this.instanceSuffixes.get(instanceKey); | ||
| return suffix === 0 ? baseId : `${baseId}_${suffix}`; | ||
| } | ||
|
|
||
| const suffix = this.nextSuffix.get(baseId) || 0; | ||
| this.nextSuffix.set(baseId, suffix + 1); | ||
| this.instanceSuffixes.set(instanceKey, suffix); | ||
| return suffix === 0 ? baseId : `${baseId}_${suffix}`; | ||
| } | ||
Kasinhou marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * Release the unique ID when a component is destroyed. | ||
| * | ||
| * @param instanceKey The unique key used during registration. | ||
| */ | ||
| static release(instanceKey: string): void { | ||
| this.instanceSuffixes.delete(instanceKey); | ||
| } | ||
|
|
||
| /** | ||
| * Clear the entire registry. Used in tests to reset state between specs. | ||
| */ | ||
| static clear(): void { | ||
| this.nextSuffix.clear(); | ||
| this.instanceSuffixes.clear(); | ||
| } | ||
| } | ||
Kasinhou marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.