From 50331c61aea59a39579341bf29cf2e392571d07f Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 10 Jan 2023 22:19:15 -0600
Subject: [PATCH] Fixed: Use selected BaseUrl for external link

Fixes #1310
---
 frontend/src/Indexer/Index/Table/IndexerIndexRow.js  | 6 +++++-
 frontend/src/Indexer/Info/IndexerInfoModalContent.js | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Indexer/Index/Table/IndexerIndexRow.js b/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
index a21f0f47c..1ea960943 100644
--- a/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
+++ b/frontend/src/Indexer/Index/Table/IndexerIndexRow.js
@@ -79,6 +79,7 @@ class IndexerIndexRow extends Component {
       privacy,
       priority,
       status,
+      fields,
       appProfile,
       added,
       capabilities,
@@ -96,6 +97,8 @@ class IndexerIndexRow extends Component {
       isIndexerInfoModalOpen
     } = this.state;
 
+    const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
+
     return (
       <>
         {
@@ -250,7 +253,7 @@ class IndexerIndexRow extends Component {
                         className={styles.externalLink}
                         name={icons.EXTERNAL_LINK}
                         title={translate('Website')}
-                        to={indexerUrls[0].replace('api.', '')}
+                        to={baseUrl.replace('api.', '')}
                       /> : null
                   }
 
@@ -299,6 +302,7 @@ IndexerIndexRow.propTypes = {
   name: PropTypes.string.isRequired,
   enable: PropTypes.bool.isRequired,
   redirect: PropTypes.bool.isRequired,
+  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
   appProfile: PropTypes.object.isRequired,
   status: PropTypes.object,
   capabilities: PropTypes.object,
diff --git a/frontend/src/Indexer/Info/IndexerInfoModalContent.js b/frontend/src/Indexer/Info/IndexerInfoModalContent.js
index 1b162efa8..81d6cdca1 100644
--- a/frontend/src/Indexer/Info/IndexerInfoModalContent.js
+++ b/frontend/src/Indexer/Info/IndexerInfoModalContent.js
@@ -20,11 +20,14 @@ function IndexerInfoModalContent(props) {
     encoding,
     language,
     indexerUrls,
+    fields,
     protocol,
     capabilities,
     onModalClose
   } = props;
 
+  const baseUrl = fields.find((field) => field.name === 'baseUrl')?.value ?? indexerUrls[0];
+
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
@@ -57,7 +60,7 @@ function IndexerInfoModalContent(props) {
               />
               <DescriptionListItemTitle>{translate('IndexerSite')}</DescriptionListItemTitle>
               <DescriptionListItemDescription>
-                <Link to={indexerUrls[0]}>{indexerUrls[0]}</Link>
+                <Link to={baseUrl}>{baseUrl}</Link>
               </DescriptionListItemDescription>
               <DescriptionListItemTitle>{`${protocol === 'usenet' ? 'Newznab' : 'Torznab'} Url`}</DescriptionListItemTitle>
               <DescriptionListItemDescription>
@@ -114,6 +117,7 @@ IndexerInfoModalContent.propTypes = {
   encoding: PropTypes.string.isRequired,
   language: PropTypes.string.isRequired,
   indexerUrls: PropTypes.arrayOf(PropTypes.string).isRequired,
+  fields: PropTypes.arrayOf(PropTypes.object).isRequired,
   protocol: PropTypes.string.isRequired,
   capabilities: PropTypes.object.isRequired,
   onModalClose: PropTypes.func.isRequired