From 155dbc370bb6a2592b83068fa8665d33f9a3744a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Marseault?= <larsluph@larsluph.dev>
Date: Wed, 11 Jun 2025 09:32:11 +0200
Subject: [PATCH] fix: Prevent generating invalid link on empty scraper
 response (#5876)

---
 ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx | 8 +++++++-
 ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx    | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
index 53b681aac..55e7f7f25 100755
--- a/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx
@@ -165,6 +165,12 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
 
   const selectedSource = !selectedID ? "skip" : "existing";
 
+  const safeBuildPerformerScraperLink = (id: string | null | undefined) => {
+    return stashboxPerformerPrefix && id
+      ? `${stashboxPerformerPrefix}${id}`
+      : undefined;
+  };
+
   return (
     <div className="row no-gutters align-items-center mt-2">
       <div className="entity-name">
@@ -172,7 +178,7 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
         <b className="ml-2">
           <PerformerLink
             performer={performer}
-            url={`${stashboxPerformerPrefix}${performer.remote_site_id}`}
+            url={safeBuildPerformerScraperLink(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
index 13ffe6bff..410ce2d19 100755
--- a/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx
@@ -134,6 +134,12 @@ const StudioResult: React.FC<IStudioResultProps> = ({
 
   const selectedSource = !selectedID ? "skip" : "existing";
 
+  const safeBuildStudioScraperLink = (id: string | null | undefined) => {
+    return stashboxStudioPrefix && id
+      ? `${stashboxStudioPrefix}${id}`
+      : undefined;
+  };
+
   return (
     <div className="row no-gutters align-items-center mt-2">
       <div className="entity-name">
@@ -141,7 +147,7 @@ const StudioResult: React.FC<IStudioResultProps> = ({
         <b className="ml-2">
           <StudioLink
             studio={studio}
-            url={`${stashboxStudioPrefix}${studio.remote_site_id}`}
+            url={safeBuildStudioScraperLink(studio.remote_site_id)}
           />
         </b>
       </div>