Skip to content
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

FIO-8280: Fixed setting incorrect option label #5582

Merged
merged 1 commit into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/select/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export default class SelectComponent extends ListComponent {
}

get selectData() {
return this.component.selectData || this.selectMetadata;
return this.selectMetadata || this.component.selectData;
}

isEntireObjectDisplay() {
Expand Down
27 changes: 27 additions & 0 deletions src/components/select/Select.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,33 @@ describe('Select Component', () => {
}).catch(done);
});

it('Should set correct label from metadata for ChoicesJS Select with default value', (done) => {
const form = _.cloneDeep(comp22);
form.components[0].widget='choicesjs';
const element = document.createElement('div');

Formio.createForm(element, form).then(form => {
const select = form.getComponent('select');
form.submission = {
data: {
select: 'value2',
},
metadata: {
selectData: {
select: {
label: 'Label 2',
},
},
},
};

setTimeout(()=> {
assert.equal(select.templateData['value2'].label, 'Label 2');
done();
}, 200);
}).catch(done);
});

it('OnBlur validation should work properly with Select component', function(done) {
this.timeout(0);
const element = document.createElement('div');
Expand Down
2 changes: 1 addition & 1 deletion src/components/select/fixtures/comp22.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
tableView: true,
dataSrc: 'url',
data: {
url: 'https://fake_url',
url: 'https://fake_url.com',
headers: [
{
key: '',
Expand Down
Loading