diff --git a/frontend/src/pages/performers/PerformerEditUpdate.tsx b/frontend/src/pages/performers/PerformerEditUpdate.tsx index fcfc26e8..35e26b3b 100644 --- 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 }) => { diff --git a/frontend/src/pages/performers/performerForm/PerformerForm.tsx b/frontend/src/pages/performers/performerForm/PerformerForm.tsx index 68d9e4af..933dc394 100644 --- 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 = ({ callback, initial, saving, + options, }) => { const initialAliases = initial?.aliases ?? performer?.aliases ?? []; const { @@ -182,7 +185,7 @@ const PerformerForm: FC = ({ }); const [activeTab, setActiveTab] = useState("personal"); - const [updateAliases, setUpdateAliases] = useState(false); + const [updateAliases, setUpdateAliases] = useState(); const [file, setFile] = useState(); const fieldData = watch(); @@ -202,10 +205,6 @@ const PerformerForm: FC = ({ 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 = ({ ) 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 = ({ setUpdateAliases(!updateAliases)} label="Set unset performance aliases to old name" className="d-inline-block"