Skip to content

Commit b56d3ca

Browse files
author
Jose Chirivella
committed
FOUR-4875 Added check if the unselected option was selected and the returned value type was an object
1 parent 792960e commit b56d3ca

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/components/inspector/options-list.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,15 +510,22 @@ export default {
510510
},
511511
setDefaultValue() {
512512
if (this.valueTypeReturned === 'single') {
513-
this.selectedControl.config.defaultValue = {
513+
return this.selectedControl.config.defaultValue = {
514514
mode: 'basic',
515515
value: this.defaultOptionKey
516516
};
517517
}
518-
if (this.valueTypeReturned === 'object') {
518+
// if the Unselected option was selected
519+
if (this.valueTypeReturned === 'object' && this.defaultOptionKey === '') {
520+
return this.selectedControl.config.defaultValue = {
521+
mode: 'basic',
522+
value: this.defaultOptionKey
523+
}
524+
}
525+
if (this.valueTypeReturned === 'object' && this.defaultOptionKey !== '') {
519526
this.optionsList.find(option => {
520527
if (option.value === this.defaultOptionKey) {
521-
this.selectedControl.config.defaultValue = {
528+
return this.selectedControl.config.defaultValue = {
522529
mode: 'js',
523530
value: `return ${JSON.stringify(option)}`
524531
}

tests/e2e/specs/SelectListDefaultOption.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('Select List with Default Option selected', () => {
7171
cy.get('[data-cy="screen-field-form_select_list_1"] .multiselect__single').contains('False');
7272
});
7373
});
74-
describe('Should defaultValue to be false even if rolledback to single returned value', function () {
74+
describe('Should defaultValue to be false even if rolledback to single returned value', () => {
7575
it('should go back to design mode', () => {
7676
cy.get('[data-cy="mode-editor"]').click();
7777
});

0 commit comments

Comments
 (0)