Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore movie/studio data on edit cancel (#476)

This commit is contained in:
WithoutPants 2020-04-20 12:46:55 +10:00 committed by GitHub
parent 359e80f364
commit 7e747fd8a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx
View File

@ -165,6 +165,11 @@ export const Movie: React.FC = () => {
ImageUtils.onImageChange(event, onBackImageLoad);
}
function onToggleEdit() {
setIsEditing(!isEditing);
updateMovieData(movie);
}
function renderDeleteAlert() {
return (
<Modal
@ -266,7 +271,7 @@ export const Movie: React.FC = () => {
objectName={name ?? "movie"}
isNew={isNew}
isEditing={isEditing}
onToggleEdit={() => setIsEditing(!isEditing)}
onToggleEdit={onToggleEdit}
onSave={onSave}
onImageChange={onImageChange}
onBackImageChange={onBackImageChange}

5
ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
View File

@ -41,5 +41,8 @@ export const MovieScenesPanel: React.FC<IMovieScenesPanel> = ({ movie }) => {
return filter;
}
return <SceneList subComponent filterHook={filterHook} />;
if (movie && movie.id) {
return <SceneList subComponent filterHook={filterHook} />;
}
return <></>;
};

7
ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
View File

@ -150,6 +150,11 @@ export const Studio: React.FC = () => {
);
}
function onToggleEdit() {
setIsEditing(!isEditing);
updateStudioData(studio);
}
return (
<div className="row">
<div
@ -180,7 +185,7 @@ export const Studio: React.FC = () => {
objectName={name ?? "studio"}
isNew={isNew}
isEditing={isEditing}
onToggleEdit={() => setIsEditing(!isEditing)}
onToggleEdit={onToggleEdit}
onSave={onSave}
onImageChange={onImageChangeHandler}
onAutoTag={onAutoTag}

103
ui/v2.5/src/utils/editabletext.tsx
View File

@ -63,20 +63,20 @@ const renderInputGroup = (options: {
{options.value}
</a>
);
} else {
return (
<Form.Control
className="text-input"
readOnly={!options.isEditing}
plaintext={!options.isEditing}
value={options.value}
placeholder={options.placeholder ?? options.title}
onChange={(event: React.FormEvent<HTMLInputElement>) =>
options.onChange(event.currentTarget.value)
}
/>
);
}
return (
<Form.Control
className="text-input"
readOnly={!options.isEditing}
plaintext={!options.isEditing}
value={options.value ?? ""}
placeholder={options.placeholder ?? options.title}
onChange={(event: React.FormEvent<HTMLInputElement>) =>
options.onChange(event.currentTarget.value)
}
/>
);
}
const renderDurationInput = (options: {
@ -86,7 +86,7 @@ const renderDurationInput = (options: {
asString?: boolean
onChange: (value: string | undefined) => void;
}) => {
let numericValue: number | undefined = undefined;
let numericValue: number | undefined;
if (options.value) {
if (!options.asString) {
try {
@ -100,7 +100,7 @@ const renderDurationInput = (options: {
}
if (!options.isEditing) {
let durationString = undefined;
let durationString;
if (numericValue !== undefined) {
durationString = DurationUtils.secondsToString(numericValue);
}
@ -108,26 +108,26 @@ const renderDurationInput = (options: {
return (
<Form.Control
className="text-input"
readOnly={true}
plaintext={true}
readOnly
plaintext
defaultValue={durationString}
/>
);
} else {
return (
<DurationInput
disabled={!options.isEditing}
numericValue={numericValue}
onValueChange={(valueAsNumber: number, valueAsString? : string) => {
if (!options.asString) {
valueAsString = valueAsNumber !== undefined ? valueAsNumber.toString() : undefined;
}
options.onChange(valueAsString);
}}
/>
);
}
return (
<DurationInput
disabled={!options.isEditing}
numericValue={numericValue}
onValueChange={(valueAsNumber: number, valueAsString? : string) => {
let value = valueAsString;
if (!options.asString) {
value = valueAsNumber !== undefined ? valueAsNumber.toString() : undefined;
}
options.onChange(value);
}}
/>
);
}
const renderHtmlSelect = (options: {
@ -140,31 +140,30 @@ const renderHtmlSelect = (options: {
return (
<Form.Control
className="text-input"
readOnly={true}
plaintext={true}
readOnly
plaintext
defaultValue={options.value}
/>
);
} else {
return (
<Form.Control
as="select"
className="input-control"
disabled={!options.isEditing}
plaintext={!options.isEditing}
value={options.value?.toString()}
onChange={(event: React.FormEvent<HTMLSelectElement>) =>
options.onChange(event.currentTarget.value)
}
>
{options.selectOptions.map((opt) => (
<option value={opt} key={opt}>
{opt}
</option>
))}
</Form.Control>
);
}
return (
<Form.Control
as="select"
className="input-control"
disabled={!options.isEditing}
plaintext={!options.isEditing}
value={options.value?.toString()}
onChange={(event: React.FormEvent<HTMLSelectElement>) =>
options.onChange(event.currentTarget.value)
}
>
{options.selectOptions.map((opt) => (
<option value={opt} key={opt}>
{opt}
</option>
))}
</Form.Control>
);
}
// TODO: isediting