Fix match studio/performer links in performer view (#5337)

stashapp · Oct 3, 2024 · 58c58be · 58c58be
1 parent f055188
commit 58c58be
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 44 deletions.
diff --git a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Button, ButtonGroup } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 
@@ -13,24 +13,24 @@ import {
 } from "src/components/Performers/PerformerSelect";
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { Link } from "react-router-dom";
 
-interface IPerformerName {
+const PerformerLink: React.FC<{
   performer: GQL.ScrapedPerformer | Performer;
-  id: string | undefined | null;
-  baseURL: string | undefined;
-}
-
-const PerformerName: React.FC<IPerformerName> = ({
-  performer,
-  id,
-  baseURL,
-}) => {
-  const name =
-    baseURL && id ? (
-      <ExternalLink href={`${baseURL}${id}`}>{performer.name}</ExternalLink>
+  url: string | undefined;
+  internal?: boolean;
+}> = ({ performer, url, internal = false }) => {
+  const name = useMemo(() => {
+    if (!url) return performer.name;
+
+    return internal ? (
+      <Link to={url} target="_blank">
+        {performer.name}
+      </Link>
     ) : (
-      performer.name
+      <ExternalLink href={url}>{performer.name}</ExternalLink>
     );
+  }, [url, performer.name, internal]);
 
   return (
     <>
@@ -115,10 +115,9 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
         <div className="entity-name">
           <FormattedMessage id="countables.performers" values={{ count: 1 }} />:
           <b className="ml-2">
-            <PerformerName
+            <PerformerLink
               performer={performer}
-              id={performer.remote_site_id}
-              baseURL={stashboxPerformerPrefix}
+              url={`${stashboxPerformerPrefix}${performer.remote_site_id}`}
             />
           </b>
         </div>
@@ -134,10 +133,10 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
                 <FormattedMessage id="component_tagger.verb_matched" />:
               </span>
               <b className="col-3 text-right">
-                <PerformerName
+                <PerformerLink
                   performer={matchedPerformer}
-                  id={matchedPerformer.id}
-                  baseURL={performerURLPrefix}
+                  url={`${performerURLPrefix}${matchedPerformer.id}`}
+                  internal
                 />
               </b>
             </div>
@@ -169,10 +168,9 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
       <div className="entity-name">
         <FormattedMessage id="countables.performers" values={{ count: 1 }} />:
         <b className="ml-2">
-          <PerformerName
+          <PerformerLink
             performer={performer}
-            id={performer.remote_site_id}
-            baseURL={stashboxPerformerPrefix}
+            url={`${stashboxPerformerPrefix}${performer.remote_site_id}`}
           />
         </b>
       </div>

diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { Button, ButtonGroup } from "react-bootstrap";
 import { FormattedMessage } from "react-intl";
 import cx from "classnames";
@@ -12,20 +12,24 @@ import { OptionalField } from "../IncludeButton";
 import { faSave } from "@fortawesome/free-solid-svg-icons";
 import { getStashboxBase } from "src/utils/stashbox";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { Link } from "react-router-dom";
 
-interface IStudioName {
+const StudioLink: React.FC<{
   studio: GQL.ScrapedStudio | GQL.SlimStudioDataFragment;
-  id: string | undefined | null;
-  baseURL: string | undefined;
-}
-
-const StudioName: React.FC<IStudioName> = ({ studio, id, baseURL }) => {
-  const name =
-    baseURL && id ? (
-      <ExternalLink href={`${baseURL}${id}`}>{studio.name}</ExternalLink>
+  url: string | undefined;
+  internal?: boolean;
+}> = ({ studio, url, internal = false }) => {
+  const name = useMemo(() => {
+    if (!url) return studio.name;
+
+    return internal ? (
+      <Link to={url} target="_blank">
+        {studio.name}
+      </Link>
     ) : (
-      studio.name
+      <ExternalLink href={url}>{studio.name}</ExternalLink>
     );
+  }, [url, studio.name, internal]);
 
   return <span>{name}</span>;
 };
@@ -82,10 +86,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
         <div className="entity-name">
           <FormattedMessage id="countables.studios" values={{ count: 1 }} />:
           <b className="ml-2">
-            <StudioName
+            <StudioLink
               studio={studio}
-              id={studio.remote_site_id}
-              baseURL={stashboxStudioPrefix}
+              url={`${stashboxStudioPrefix}${studio.remote_site_id}`}
             />
           </b>
         </div>
@@ -101,10 +104,10 @@ const StudioResult: React.FC<IStudioResultProps> = ({
                 <FormattedMessage id="component_tagger.verb_matched" />:
               </span>
               <b className="col-3 text-right">
-                <StudioName
+                <StudioLink
                   studio={matchedStudio}
-                  id={matchedStudio.id}
-                  baseURL={studioURLPrefix}
+                  url={`${studioURLPrefix}${matchedStudio.id}`}
+                  internal
                 />
               </b>
             </div>
@@ -136,10 +139,9 @@ const StudioResult: React.FC<IStudioResultProps> = ({
       <div className="entity-name">
         <FormattedMessage id="countables.studios" values={{ count: 1 }} />:
         <b className="ml-2">
-          <StudioName
+          <StudioLink
             studio={studio}
-            id={studio.remote_site_id}
-            baseURL={stashboxStudioPrefix}
+            url={`${stashboxStudioPrefix}${studio.remote_site_id}`}
           />
         </b>
       </div>