mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-24 07:10:57 +00:00
Code Issues Releases Wiki Activity

Fixed: Quality cutoff updating in UI when adding/removing qualities

Browse source 
Closes #7879

(cherry picked from commit fea66cb7bccc7e94523614db38b157fa38f55ea5)
This commit is contained in:
Mark McDowall 2022-12-10 16:04:06 -08:00 committed by Qstick
parent 72552b8084
commit 2947b244e4
3 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frontend/src/Components/Form/EnhancedSelectInput.js
View file

@ -113,10 +113,12 @@ class EnhancedSelectInput extends Component {
this._scheduleUpdate(); this._scheduleUpdate();
} }
if (!Array.isArray(this.props.value) && prevProps.value !== this.props.value) { if (!Array.isArray(this.props.value)) {
this.setState({ if (prevProps.value !== this.props.value || prevProps.values !== this.props.values) {
selectedIndex: getSelectedIndex(this.props) this.setState({
}); selectedIndex: getSelectedIndex(this.props)
});
}
} }
} }
@ -332,6 +334,11 @@ class EnhancedSelectInput extends Component {
const isMultiSelect = Array.isArray(value); const isMultiSelect = Array.isArray(value);
const selectedOption = getSelectedOption(selectedIndex, values); const selectedOption = getSelectedOption(selectedIndex, values);
let selectedValue = value;
if (!values.length) {
selectedValue = isMultiSelect ? [] : '';
}
return ( return (
<div> <div>
@ -372,15 +379,17 @@ class EnhancedSelectInput extends Component {
onPress={this.onPress} onPress={this.onPress}
> >
{ {
isFetching && isFetching ?
<LoadingIndicator <LoadingIndicator
className={styles.loading} className={styles.loading}
size={20} size={20}
/> /> :
null
} }
{ {
!isFetching && isFetching ?
null :
<Icon <Icon
name={icons.CARET_DOWN} name={icons.CARET_DOWN}
/> />
@ -400,7 +409,7 @@ class EnhancedSelectInput extends Component {
onPress={this.onPress} onPress={this.onPress}
> >
<SelectedValueComponent <SelectedValueComponent
value={value} value={selectedValue}
values={values} values={values}
{...selectedValueOptions} {...selectedValueOptions}
{...selectedOption} {...selectedOption}
@ -418,15 +427,17 @@ class EnhancedSelectInput extends Component {
> >
{ {
isFetching && isFetching ?
<LoadingIndicator <LoadingIndicator
className={styles.loading} className={styles.loading}
size={20} size={20}
/> /> :
null
} }
{ {
!isFetching && isFetching ?
null :
<Icon <Icon
name={icons.CARET_DOWN} name={icons.CARET_DOWN}
/> />
@ -506,7 +517,7 @@ class EnhancedSelectInput extends Component {
</Manager> </Manager>
{ {
isMobile && isMobile ?
<Modal <Modal
className={styles.optionsModal} className={styles.optionsModal}
size={sizes.EXTRA_SMALL} size={sizes.EXTRA_SMALL}
@ -557,7 +568,8 @@ class EnhancedSelectInput extends Component {
} }
</Scroller> </Scroller>
</ModalBody> </ModalBody>
</Modal> </Modal> :
null
} }
</div> </div>
); );

14
frontend/src/Components/Form/HintedSelectInputSelectedValue.js
View file

@ -24,7 +24,7 @@ function HintedSelectInputSelectedValue(props) {
> >
<div className={styles.valueText}> <div className={styles.valueText}>
{ {
isMultiSelect && isMultiSelect ?
value.map((key, index) => { value.map((key, index) => {
const v = valuesMap[key]; const v = valuesMap[key];
return ( return (
@ -32,26 +32,28 @@ function HintedSelectInputSelectedValue(props) {
{v ? v.value : key} {v ? v.value : key}
</Label> </Label>
); );
}) }) :
null
} }
{ {
!isMultiSelect && value isMultiSelect ? null : value
} }
</div> </div>
{ {
hint != null && includeHint && hint != null && includeHint ?
<div className={styles.hintText}> <div className={styles.hintText}>
{hint} {hint}
</div> </div> :
null
} }
</EnhancedSelectInputSelectedValue> </EnhancedSelectInputSelectedValue>
); );
} }
HintedSelectInputSelectedValue.propTypes = { HintedSelectInputSelectedValue.propTypes = {
value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired, value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number]))]).isRequired,
values: PropTypes.arrayOf(PropTypes.object).isRequired, values: PropTypes.arrayOf(PropTypes.object).isRequired,
hint: PropTypes.string, hint: PropTypes.string,
isMultiSelect: PropTypes.bool.isRequired, isMultiSelect: PropTypes.bool.isRequired,

2
frontend/src/Components/Form/RootFolderSelectInputOption.js
View file

@ -68,7 +68,7 @@ RootFolderSelectInputOption.propTypes = {
value: PropTypes.string.isRequired, value: PropTypes.string.isRequired,
freeSpace: PropTypes.number, freeSpace: PropTypes.number,
movieFolder: PropTypes.string, movieFolder: PropTypes.string,
isMissing: PropTypes.boolean, isMissing: PropTypes.bool,
isMobile: PropTypes.bool.isRequired, isMobile: PropTypes.bool.isRequired,
isWindows: PropTypes.bool isWindows: PropTypes.bool
}; };