From 1ba1564d8a6fa2b5cfc483d84886d53700b24256 Mon Sep 17 00:00:00 2001
From: Emilo2 <99644577+Emilo2@users.noreply.github.com>
Date: Fri, 9 Jun 2023 01:23:12 +0300
Subject: [PATCH] Include studio code in scene merge dialog (#3803)

---
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 8f80ca1de..db7efa683 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -58,6 +58,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
   const [title, setTitle] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.title)
   );
+  const [code, setCode] = useState<ScrapeResult<string>>(
+    new ScrapeResult<string>(dest.code)
+  );
   const [url, setURL] = useState<ScrapeResult<string>>(
     new ScrapeResult<string>(dest.url)
   );
@@ -157,6 +160,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
         !dest.title
       )
     );
+    setCode(
+      new ScrapeResult(dest.code, sources.find((s) => s.code)?.code, !dest.code)
+    );
     setURL(
       new ScrapeResult(dest.url, sources.find((s) => s.url)?.url, !dest.url)
     );
@@ -290,6 +296,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
   const hasValues = useMemo(() => {
     return hasScrapedValues([
       title,
+      code,
       url,
       date,
       rating,
@@ -306,6 +313,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     ]);
   }, [
     title,
+    code,
     url,
     date,
     rating,
@@ -348,6 +356,11 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
           result={title}
           onChange={(value) => setTitle(value)}
         />
+        <ScrapedInputGroupRow
+          title={intl.formatMessage({ id: "scene_code" })}
+          result={code}
+          onChange={(value) => setCode(value)}
+        />
         <ScrapedInputGroupRow
           title={intl.formatMessage({ id: "url" })}
           result={url}
@@ -532,6 +545,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
     return {
       id: dest.id,
       title: title.getNewValue(),
+      code: code.getNewValue(),
       url: url.getNewValue(),
       date: date.getNewValue(),
       rating100: rating.getNewValue(),