diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx index 691b03387..6625acc49 100644 --- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx +++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx @@ -117,6 +117,10 @@ const SceneMergeDetails: React.FC = ({ const [stashIDs, setStashIDs] = useState(new ScrapeResult([])); + const [organized, setOrganized] = useState( + new ScrapeResult(dest.organized) + ); + const [image, setImage] = useState>( new ScrapeResult(dest.paths.screenshot) ); @@ -228,6 +232,13 @@ const SceneMergeDetails: React.FC = ({ ) ); + setOrganized( + new ScrapeResult( + dest.organized ?? false, + sources.every((s) => s.organized) + ) + ); + setStashIDs( new ScrapeResult( dest.stash_ids, @@ -287,6 +298,7 @@ const SceneMergeDetails: React.FC = ({ movies, tags, details, + organized, stashIDs, image, ]); @@ -302,6 +314,7 @@ const SceneMergeDetails: React.FC = ({ movies, tags, details, + organized, stashIDs, image, ]); @@ -323,6 +336,9 @@ const SceneMergeDetails: React.FC = ({ ); } + const trueString = intl.formatMessage({ id: "true" }); + const falseString = intl.formatMessage({ id: "false" }); + return ( <> = ({ result={details} onChange={(value) => setDetails(value)} /> + ( + {}} + className="bg-secondary text-white border-secondary" + /> + )} + renderNewField={() => ( + {}} + className="bg-secondary text-white border-secondary" + /> + )} + onChange={(value) => setOrganized(value)} + /> = ({ }), tag_ids: tags.getNewValue(), details: details.getNewValue(), + organized: organized.getNewValue(), stash_ids: stashIDs.getNewValue(), cover_image: coverImage, }; diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx index 410534e41..c1f27d689 100644 --- a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx +++ b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx @@ -36,10 +36,11 @@ export class ScrapeResult { ) { this.originalValue = originalValue ?? undefined; this.newValue = newValue ?? undefined; + const hasNewValue = newValue !== undefined; const valuesEqual = isEqual(originalValue, newValue); - this.useNewValue = useNewValue ?? (!!this.newValue && !valuesEqual); - this.scraped = !!this.newValue && !valuesEqual; + this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual); + this.scraped = hasNewValue && !valuesEqual; } public setOriginalValue(value?: T) {