From 4a08bd351a543df563557600194d5ac40f6fde1e Mon Sep 17 00:00:00 2001
From: InfiniteTF <infinitekittens@protonmail.com>
Date: Fri, 11 Dec 2020 01:15:32 +0100
Subject: [PATCH] Fix scene gallery selection (#990)

---
 .../Scenes/SceneDetails/SceneEditPanel.tsx    |  2 +-
 ui/v2.5/src/components/Shared/Select.tsx      | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 6c086b921..de5532f29 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -598,7 +598,7 @@ export const SceneEditPanel: React.FC<IProps> = (props: IProps) => {
             <Col xs={9}>
               <SceneGallerySelect
                 sceneId={props.scene.id}
-                initialId={galleryId}
+                gallery={props.scene.gallery ?? undefined}
                 onSelect={(item) => setGalleryId(item ? item.id : undefined)}
               />
             </Col>
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 36a6b36f2..b0c4d2318 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -72,7 +72,7 @@ interface IFilterSelectProps
   extends Omit<ISelectProps, "onChange" | "items" | "onCreateOption"> {}
 
 interface ISceneGallerySelect {
-  initialId?: string;
+  gallery?: Pick<GQL.Gallery, "title" | "path" | "id">;
   sceneId: string;
   onSelect: (
     item:
@@ -225,8 +225,9 @@ const FilterSelectComponent: React.FC<
 };
 
 export const SceneGallerySelect: React.FC<ISceneGallerySelect> = (props) => {
-  const [query, setQuery] = React.useState<string>("");
+  const [query, setQuery] = useState<string>("");
   const { data, loading } = useFindGalleries(getFilter());
+  const [selectedOption, setSelectedOption] = useState<Option>();
 
   const galleries = data?.findGalleries.galleries ?? [];
   const items = galleries.map((g) => ({
@@ -246,14 +247,22 @@ export const SceneGallerySelect: React.FC<ISceneGallerySelect> = (props) => {
 
   const onChange = (selectedItems: ValueType<Option>) => {
     const selectedItem = getSelectedValues(selectedItems)[0];
+    setSelectedOption(
+      Array.isArray(selectedItems) ? selectedItems[0] : selectedItems
+    );
     props.onSelect(
       selectedItem ? galleries.find((g) => g.id === selectedItem) : undefined
     );
   };
 
-  const selectedOptions: Option[] = props.initialId
-    ? items.filter((item) => props.initialId?.indexOf(item.value) !== -1)
-    : [];
+  const selectedOptions: Option[] = [];
+  if (selectedOption !== undefined) selectedOptions.push(selectedOption);
+  else if (props.gallery) {
+    selectedOptions.push({
+      value: props.gallery.id,
+      label: props.gallery.title ?? props.gallery.path ?? "Unknown",
+    });
+  }
 
   return (
     <SelectComponent
@@ -274,7 +283,7 @@ interface IScrapePerformerSuggestProps {
 export const ScrapePerformerSuggest: React.FC<IScrapePerformerSuggestProps> = (
   props
 ) => {
-  const [query, setQuery] = React.useState<string>("");
+  const [query, setQuery] = useState<string>("");
   const { data, loading } = useScrapePerformerList(props.scraperId, query);
 
   const performers = data?.scrapePerformerList ?? [];