Slightly more logical handling when moving things around
This commit is contained in:
parent
d07ee9a36b
commit
85b47ceb79
1 changed files with 9 additions and 2 deletions
|
@ -17,7 +17,7 @@ type Props = RequiredModalProps & { file: FileObject; useMoveTerminology?: boole
|
||||||
export default ({ file, useMoveTerminology, ...props }: Props) => {
|
export default ({ file, useMoveTerminology, ...props }: Props) => {
|
||||||
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
|
const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
|
||||||
const directory = ServerContext.useStoreState(state => state.files.directory);
|
const directory = ServerContext.useStoreState(state => state.files.directory);
|
||||||
const pushFile = ServerContext.useStoreActions(actions => actions.files.pushFile);
|
const { pushFile, removeFile } = ServerContext.useStoreActions(actions => actions.files);
|
||||||
|
|
||||||
const submit = (values: FormikValues, { setSubmitting }: FormikActions<FormikValues>) => {
|
const submit = (values: FormikValues, { setSubmitting }: FormikActions<FormikValues>) => {
|
||||||
const renameFrom = join(directory, file.name);
|
const renameFrom = join(directory, file.name);
|
||||||
|
@ -25,7 +25,14 @@ export default ({ file, useMoveTerminology, ...props }: Props) => {
|
||||||
|
|
||||||
renameFile(uuid, { renameFrom, renameTo })
|
renameFile(uuid, { renameFrom, renameTo })
|
||||||
.then(() => {
|
.then(() => {
|
||||||
pushFile({ ...file, name: values.name });
|
if (!useMoveTerminology && values.name.split('/').length === 1) {
|
||||||
|
pushFile({ ...file, name: values.name });
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((useMoveTerminology || values.name.split('/').length > 1) && file.uuid.length > 0) {
|
||||||
|
removeFile(file.uuid);
|
||||||
|
}
|
||||||
|
|
||||||
props.onDismissed();
|
props.onDismissed();
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
|
|
Loading…
Reference in a new issue