fix: various fixes for new tags feature (#1369)

* fix(backend): fix movie override tags check

* fix(lang): fix 'no tags' and 'anime tags' strings

* fix(logging): correct capitalization of Radarr/Sonarr

* fix(ui): consistently disable tag select / display loading placeholder
This commit is contained in:
TheCatLady
2021-04-05 18:56:21 -04:00
committed by GitHub
parent 7a5c4a30b5
commit b4450a308c
5 changed files with 32 additions and 23 deletions

View File

@@ -35,7 +35,7 @@ const messages = defineMessages({
languageprofile: 'Language Profile',
tags: 'Tags',
selecttags: 'Select tags',
notagoptions: 'No Tags',
notagoptions: 'No tags.',
});
export type RequestOverrides = {
@@ -466,7 +466,12 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
value: tag.id,
}))}
isMulti
placeholder={intl.formatMessage(messages.selecttags)}
isDisabled={isValidating || !serverData}
placeholder={
isValidating || !serverData
? intl.formatMessage(globalMessages.loading)
: intl.formatMessage(messages.selecttags)
}
className="react-select-container react-select-container-dark"
classNamePrefix="react-select"
value={selectedTags.map((tagId) => {

View File

@@ -59,6 +59,7 @@ const messages = defineMessages({
testFirstQualityProfiles: 'Test connection to load quality profiles',
loadingrootfolders: 'Loading root folders…',
testFirstRootFolders: 'Test connection to load root folders',
loadingTags: 'Loading tags…',
testFirstTags: 'Test connection to load tags',
tags: 'Tags',
preventSearch: 'Disable Auto-Search',
@@ -66,7 +67,7 @@ const messages = defineMessages({
validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
validationBaseUrlLeadingSlash: 'Base URL must have a leading slash',
validationBaseUrlTrailingSlash: 'Base URL must not end in a trailing slash',
notagoptions: 'No Tags',
notagoptions: 'No tags.',
selecttags: 'Select tags',
});
@@ -631,10 +632,12 @@ const RadarrModal: React.FC<RadarrModalProps> = ({
: []
}
isMulti
isDisabled={!isValidated}
isDisabled={!isValidated || isTesting}
placeholder={
!isValidated
? intl.formatMessage(messages.testFirstTags)
: isTesting
? intl.formatMessage(messages.loadingTags)
: intl.formatMessage(messages.selecttags)
}
className="react-select-container"

View File

@@ -72,8 +72,8 @@ const messages = defineMessages({
validationBaseUrlLeadingSlash: 'Base URL must have a leading slash',
validationBaseUrlTrailingSlash: 'Base URL must not end in a trailing slash',
tags: 'Tags',
animeTags: 'Tags',
notagoptions: 'No Tags',
animeTags: 'Anime Tags',
notagoptions: 'No tags.',
selecttags: 'Select tags',
});
@@ -685,7 +685,7 @@ const SonarrModal: React.FC<SonarrModalProps> = ({
: []
}
isMulti
isDisabled={!isValidated}
isDisabled={!isValidated || isTesting}
placeholder={
!isValidated
? intl.formatMessage(messages.testFirstTags)