Skip to content

Commit

Permalink
FIO-8280: fixed setting incorrect option label (#5582)
Browse files Browse the repository at this point in the history
  • Loading branch information
roma-formio authored Apr 30, 2024
1 parent 4238d13 commit d9d5c3e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
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

0 comments on commit d9d5c3e

Please sign in to comment.