Prevent accidental deletions on renaming

juanlao7 · Jan 23, 2021 · feb15f5 · feb15f5
1 parent 5f42067
commit feb15f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/client/apps/remolacha.Files/src/ContextMenu.tsx b/client/apps/remolacha.Files/src/ContextMenu.tsx
@@ -25,12 +25,12 @@ export class ContextMenu extends React.Component<ContextMenuProps, ContextMenuSt
 
     private onNewFileMenuItemClick() {
         this.props.onClose();
-        this.props.files.createNewFile();
+        this.props.files.openNewFileDialog();
     }
 
     private onNewDirectoryMenuItemClick() {
         this.props.onClose();
-        this.props.files.createNewDirectory();
+        this.props.files.openNewDirectoryDialog();
     }
 
     private onOpenFileMenuItemClick() {

diff --git a/client/apps/remolacha.Files/src/Files.tsx b/client/apps/remolacha.Files/src/Files.tsx
@@ -193,20 +193,20 @@ export class Files extends React.Component<FilesProps, FilesState> {
         this.setState({selected: selected});
     }
 
-    openDeleteDialog() {
-        this.setState({deleteNames: [...this.state.selected.keys()]});
+    openNewFileDialog() {
+        this.setState({newElementName: 'file'});
     }
 
-    openRenameDialog() {
-        this.setState({renameName: this.state.selected.keys().next().value});
+    openNewDirectoryDialog() {
+        this.setState({newElementName: 'directory'});
     }
 
-    createNewFile() {
-        this.setState({newElementName: 'file'});
+    openDeleteDialog() {
+        this.setState({deleteNames: [...this.state.selected.keys()]});
     }
 
-    createNewDirectory() {
-        this.setState({newElementName: 'directory'});
+    openRenameDialog() {
+        this.setState({renameName: this.state.selected.keys().next().value});
     }
 
     private onLocationInputChange(e : React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) {
@@ -259,11 +259,12 @@ export class Files extends React.Component<FilesProps, FilesState> {
         });
     }
 
-    private async onRenameDialogCloseImpl(newName : string) {
+    private async onRenameDialogCloseImpl(newName : string, overwrite : boolean) {
         try {
             await this.props.appInstance.callBackend('move', {
                 from: this.resolvePath(this.state.renameName),
-                to: this.resolvePath(newName)
+                to: this.resolvePath(newName),
+                overwrite: overwrite
             });
 
             this.setState({
@@ -288,7 +289,7 @@ export class Files extends React.Component<FilesProps, FilesState> {
         this.setState({dialogLoading: true});
 
         if (this.getElementByName(newName) == null) {
-            this.onRenameDialogCloseImpl(newName);
+            this.onRenameDialogCloseImpl(newName, false);
             return;
         }
 
@@ -299,7 +300,7 @@ export class Files extends React.Component<FilesProps, FilesState> {
                 this.setState({overwriteName: null});
 
                 if (overwrite) {
-                    this.onRenameDialogCloseImpl(newName);
+                    this.onRenameDialogCloseImpl(newName, true);
                 }
                 else {
                     this.setState({dialogLoading: false});

diff --git a/server/src/apps/remolacha.Files.ts b/server/src/apps/remolacha.Files.ts
@@ -153,7 +153,7 @@ const app : App = {
             throw new Error('Unexpected params.');
         }
 
-        await fs.move(params.from, params.to, {overwrite: true});
+        await fs.move(params.from, params.to, {overwrite: (params.overwrite === true)});
         connection.close();
     },