Fix update aliases checkbox state for edit updates (#679)

stashapp · Jul 12, 2023 · 2a5cf01 · 2a5cf01
1 parent 221da5d
commit 2a5cf01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/frontend/src/pages/performers/PerformerEditUpdate.tsx b/frontend/src/pages/performers/PerformerEditUpdate.tsx
@@ -78,6 +78,7 @@ export const PerformerEditUpdate: FC<{ edit: EditUpdate }> = ({ edit }) => {
       <PerformerForm
         performer={edit.target}
         initial={edit.details}
+        options={edit.options}
         callback={doUpdate}
         saving={saving}
       />

diff --git a/frontend/src/pages/performers/performerForm/PerformerForm.tsx b/frontend/src/pages/performers/performerForm/PerformerForm.tsx
@@ -17,6 +17,7 @@ import {
   BreastTypeEnum,
   EthnicityEnum,
   PerformerEditDetailsInput,
+  PerformerEditOptionsInput,
   ValidSiteTypeEnum,
   PerformerFragment as Performer,
 } from "src/graphql";
@@ -121,6 +122,7 @@ interface PerformerProps {
     id?: string
   ) => void;
   initial?: InitialPerformer;
+  options?: PerformerEditOptionsInput | null;
   saving: boolean;
 }
 
@@ -129,6 +131,7 @@ const PerformerForm: FC<PerformerProps> = ({
   callback,
   initial,
   saving,
+  options,
 }) => {
   const initialAliases = initial?.aliases ?? performer?.aliases ?? [];
   const {
@@ -182,7 +185,7 @@ const PerformerForm: FC<PerformerProps> = ({
   });
 
   const [activeTab, setActiveTab] = useState("personal");
-  const [updateAliases, setUpdateAliases] = useState(false);
+  const [updateAliases, setUpdateAliases] = useState<boolean>();
   const [file, setFile] = useState<File | undefined>();
 
   const fieldData = watch();
@@ -202,10 +205,6 @@ const PerformerForm: FC<PerformerProps> = ({
     newChanges.name !== null &&
     performer?.name?.trim() !== newChanges.name;
 
-  useEffect(() => {
-    setUpdateAliases(changedName);
-  }, [changedName, setUpdateAliases]);
-
   const showBreastType =
     fieldData.gender !== GenderEnum.MALE &&
     fieldData.gender !== GenderEnum.TRANSGENDER_MALE;
@@ -263,7 +262,7 @@ const PerformerForm: FC<PerformerProps> = ({
     )
       performerData.breast_type = BreastTypeEnum.NA;
 
-    callback(performerData, data.note, updateAliases, data.id);
+    callback(performerData, data.note, updateAliases ?? false, data.id);
   };
 
   const countryObj = [
@@ -341,6 +340,7 @@ const PerformerForm: FC<PerformerProps> = ({
                 <Form.Check
                   id="update-modify-aliases"
                   checked={updateAliases}
+                  defaultChecked={options?.set_modify_aliases ?? false}
                   onChange={() => setUpdateAliases(!updateAliases)}
                   label="Set unset performance aliases to old name"
                   className="d-inline-block"