Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix scene edit state resetting when scene is updated (#1112)

Browse Source 
* Fix organized click resetting scene form state
* Fix state resetting for images/galleries
* Fix favoriting a performer resetting edit state
This commit is contained in:
InfiniteTF
2021-02-11 04:33:16 +01:00
committed by GitHub
parent bbc34bd1bf
commit 758eccc659
6 changed files with 172 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
View File

@@ -19,26 +19,32 @@ interface IProps {
onDelete: () => void;
}
export const ImageEditPanel: React.FC<IProps> = (props: IProps) => {
export const ImageEditPanel: React.FC<IProps> = ({
image,
isVisible,
onDelete,
}) => {
const Toast = useToast();
const [title, setTitle] = useState<string>();
const [rating, setRating] = useState<number>();
const [studioId, setStudioId] = useState<string>();
const [performerIds, setPerformerIds] = useState<string[]>();
const [tagIds, setTagIds] = useState<string[]>();
const [title, setTitle] = useState<string>(image?.title ?? "");
const [rating, setRating] = useState<number>(image.rating ?? NaN);
const [studioId, setStudioId] = useState<string>(image.studio?.id ?? "");
const [performerIds, setPerformerIds] = useState<string[]>(
image.performers.map((p) => p.id)
);
const [tagIds, setTagIds] = useState<string[]>(image.tags.map((t) => t.id));
// Network state
const [isLoading, setIsLoading] = useState(true);
const [isLoading, setIsLoading] = useState(false);
const [updateImage] = useImageUpdate();
useEffect(() => {
if (props.isVisible) {
if (isVisible) {
Mousetrap.bind("s s", () => {
onSave();
});
Mousetrap.bind("d d", () => {
props.onDelete();
onDelete();
});
// numeric keypresses get caught by jwplayer, so blur the element
@@ -74,26 +80,9 @@ export const ImageEditPanel: React.FC<IProps> = (props: IProps) => {
}
});
function updateImageEditState(state: Partial<GQL.ImageDataFragment>) {
const perfIds = state.performers?.map((performer) => performer.id);
const tIds = state.tags ? state.tags.map((tag) => tag.id) : undefined;
setTitle(state.title ?? undefined);
setRating(state.rating === null ? NaN : state.rating);
// setGalleryId(state?.gallery?.id ?? undefined);
setStudioId(state?.studio?.id ?? undefined);
setPerformerIds(perfIds);
setTagIds(tIds);
}
useEffect(() => {
updateImageEditState(props.image);
setIsLoading(false);
}, [props.image]);
function getImageInput(): GQL.ImageUpdateInput {
return {
id: props.image.id,
id: image.id,
title,
rating: rating ?? null,
studio_id: studioId ?? null,
@@ -131,7 +120,7 @@ export const ImageEditPanel: React.FC<IProps> = (props: IProps) => {
<Button
className="edit-button"
variant="danger"
onClick={() => props.onDelete()}
onClick={() => onDelete()}
>
Delete
</Button>
@@ -152,7 +141,7 @@ export const ImageEditPanel: React.FC<IProps> = (props: IProps) => {
<Col xs={9}>
<RatingStars
value={rating}
onSetRating={(value) => setRating(value)}
onSetRating={(value) => setRating(value ?? NaN)}
/>
</Col>
</Form.Group>
@@ -164,7 +153,7 @@ export const ImageEditPanel: React.FC<IProps> = (props: IProps) => {
<Col xs={9}>
<StudioSelect
onSelect={(items) =>
setStudioId(items.length > 0 ? items[0]?.id : undefined)
setStudioId(items.length > 0 ? items[0]?.id : "")
}
ids={studioId ? [studioId] : []}
/>