Fixed: Use selected BaseUrl for external link

Fixes #1310
pull/1319/head
Qstick 2 years ago
parent bd3408f170
commit 50331c61ae

@ -79,6 +79,7 @@ class IndexerIndexRow extends Component {
privacy, privacy,
priority, priority,
status, status,
fields,
appProfile, appProfile,
added, added,
capabilities, capabilities,
@ -96,6 +97,8 @@ class IndexerIndexRow extends Component {
isIndexerInfoModalOpen isIndexerInfoModalOpen
} = this.state; } = this.state;
const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
return ( return (
<> <>
{ {
@ -250,7 +253,7 @@ class IndexerIndexRow extends Component {
className={styles.externalLink} className={styles.externalLink}
name={icons.EXTERNAL_LINK} name={icons.EXTERNAL_LINK}
title={translate('Website')} title={translate('Website')}
to={indexerUrls[0].replace('api.', '')} to={baseUrl.replace('api.', '')}
/> : null /> : null
} }
@ -299,6 +302,7 @@ IndexerIndexRow.propTypes = {
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
enable: PropTypes.bool.isRequired, enable: PropTypes.bool.isRequired,
redirect: PropTypes.bool.isRequired, redirect: PropTypes.bool.isRequired,
fields: PropTypes.arrayOf(PropTypes.object).isRequired,
appProfile: PropTypes.object.isRequired, appProfile: PropTypes.object.isRequired,
status: PropTypes.object, status: PropTypes.object,
capabilities: PropTypes.object, capabilities: PropTypes.object,

@ -20,11 +20,14 @@ function IndexerInfoModalContent(props) {
encoding, encoding,
language, language,
indexerUrls, indexerUrls,
fields,
protocol, protocol,
capabilities, capabilities,
onModalClose onModalClose
} = props; } = props;
const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
@ -57,7 +60,7 @@ function IndexerInfoModalContent(props) {
/> />
<DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle> <DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle>
<DescriptionListItemDescription> <DescriptionListItemDescription>
<Link to={indexerUrls[0]}>{indexerUrls[0]}</Link> <Link to={baseUrl}>{baseUrl}</Link>
</DescriptionListItemDescription> </DescriptionListItemDescription>
<DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle> <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
<DescriptionListItemDescription> <DescriptionListItemDescription>
@ -114,6 +117,7 @@ IndexerInfoModalContent.propTypes = {
encoding: PropTypes.string.isRequired, encoding: PropTypes.string.isRequired,
language: PropTypes.string.isRequired, language: PropTypes.string.isRequired,
indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired, indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
fields: PropTypes.arrayOf(PropTypes.object).isRequired,
protocol: PropTypes.string.isRequired, protocol: PropTypes.string.isRequired,
capabilities: PropTypes.object.isRequired, capabilities: PropTypes.object.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired

Loading…
Cancel
Save