Repository navigation
Keep duplicated repeaters linked to their own child forms #3722
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
Merged
Merged
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* oxlint-disable import/no-nodejs-modules -- Tests run with the Node test runner. */ | ||
| import assert from 'node:assert/strict'; | ||
| import { test } from 'node:test'; | ||
| import { restoreFieldSettingValues } from '../../js/src/admin/duplicateFieldSettings.js'; | ||
|
|
||
| function restoreSettings( repeat ) { | ||
| const controls = [ 'form_select', 'name', 'field_key', 'field_order', 'form_id' ]; | ||
| const targets = controls.map( key => ( { | ||
| name: `field_options[${ key }_202]`, | ||
| value: `new-${ key }`, | ||
| checked: false, | ||
| } ) ); | ||
| const snapshot = { | ||
| fieldId: '101', | ||
| controls: controls.map( key => ( { | ||
| name: `field_options[${ key }_101]`, | ||
| value: `original-${ key }`, | ||
| type: 'hidden', | ||
| checked: false, | ||
| disabled: false, | ||
| select: null, | ||
| } ) ), | ||
| }; | ||
| const settings = { | ||
| dataset: { fid: '202' }, | ||
| querySelectorAll: () => targets, | ||
| querySelector: () => repeat === null ? null : { value: repeat }, | ||
| }; | ||
|
|
||
| restoreFieldSettingValues( snapshot, settings ); | ||
| return targets.map( target => target.value ); | ||
| } | ||
|
|
||
| test( 'duplicated repeaters keep their new child form and generated identities', () => { | ||
| assert.deepEqual( restoreSettings( '1' ), [ | ||
| 'new-form_select', 'original-name', 'new-field_key', 'new-field_order', 'new-form_id', | ||
| ] ); | ||
| } ); | ||
|
|
||
| test( 'non-repeating fields still copy an unsaved form or field selection', () => { | ||
| for ( const repeat of [ '0', '', null ] ) { | ||
| assert.deepEqual( restoreSettings( repeat ), [ | ||
| 'original-form_select', 'original-name', 'new-field_key', 'new-field_order', 'new-form_id', | ||
| ] ); | ||
| } | ||
| } ); | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Non-blocking: this stub returns the same object for any selector, so the test would still pass if the source queried a different class or element. The live run above covered the real selector, but the unit test cannot catch a rename. Make the stub answer only for the selector the code uses (I ran this: 2/2 still pass):