Skip to content

Commit

Permalink
Fixed: Disabled select option still selectable
Browse files Browse the repository at this point in the history
(cherry picked from commit 063dba22a803295adee4fdcbe42718af3e85ca78)

Closes #3362
  • Loading branch information
markus101 authored and mynameisbogdan committed Mar 15, 2024
1 parent 1aa746b commit 77f1e8f
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion frontend/src/Author/Editor/AuthorEditorFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class AuthorEditorFooter extends Component {
} = this.state;

const monitoredOptions = [
{ key: NO_CHANGE, value: translate('NoChange'), disabled: true },
{ key: NO_CHANGE, value: translate('NoChange'), isDisabled: true },
{ key: 'monitored', value: translate('Monitored') },
{ key: 'unmonitored', value: translate('Unmonitored') }
];
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Book/Editor/BookEditorFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class BookEditorFooter extends Component {
} = this.state;

const monitoredOptions = [
{ key: NO_CHANGE, value: translate('NoChange'), disabled: true },
{ key: NO_CHANGE, value: translate('NoChange'), isDisabled: true },
{ key: 'monitored', value: translate('Monitored') },
{ key: 'unmonitored', value: translate('Unmonitored') }
];
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/BookFile/Editor/BookFileEditorTableContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class BookFileEditorTableContent extends Component {
});

return acc;
}, [{ key: 'selectQuality', value: 'Select Quality', disabled: true }]);
}, [{ key: 'selectQuality', value: translate('SelectQuality'), isDisabled: true }]);

const hasSelectedFiles = this.getSelectedIds().length > 0;

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/Bookshelf/BookshelfFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class BookshelfFooter extends Component {
} = this.state;

const monitoredOptions = [
{ key: NO_CHANGE, value: translate('NoChange'), disabled: true },
{ key: NO_CHANGE, value: translate('NoChange'), isDisabled: true },
{ key: 'monitored', value: translate('Monitored') },
{ key: 'unmonitored', value: translate('Unmonitored') }
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ function createMapStateToProps() {
values.unshift({
key: 'noChange',
value: translate('NoChange'),
disabled: includeNoChangeDisabled
isDisabled: includeNoChangeDisabled
});
}

if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
isDisabled: true
});
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/Components/Form/MonitorBooksSelectInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ function MonitorBooksSelectInput(props) {
values.unshift({
key: 'noChange',
value: translate('NoChange'),
disabled: true
isDisabled: true
});
}

if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
isDisabled: true
});
}

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/Components/Form/MonitorNewItemsSelectInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ function MonitorNewItemsSelectInput(props) {
values.unshift({
key: 'noChange',
value: translate('NoChange'),
disabled: true
isDisabled: true
});
}

if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
isDisabled: true
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ function createMapStateToProps() {
values.unshift({
key: 'noChange',
value: translate('NoChange'),
disabled: includeNoChangeDisabled
isDisabled: includeNoChangeDisabled
});
}

if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
isDisabled: true
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const enableOptions = [
get value() {
return translate('NoChange');
},
disabled: true,
isDisabled: true,
},
{
key: 'enabled',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const autoAddOptions = [
get value() {
return translate('NoChange');
},
disabled: true,
isDisabled: true,
},
{
key: 'enabled',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const enableOptions = [
get value() {
return translate('NoChange');
},
disabled: true,
isDisabled: true,
},
{
key: 'enabled',
Expand Down

0 comments on commit 77f1e8f

Please sign in to comment.