electron: fix 'save as...' cwd

The following commit fixes the `defaultPath` when performing a `save
as...` in `electron`. Previously, the `defaultPath` was incorrect
leading the dialog to always open where the application started. With
these changes, the dialog will open at the current location where the
`save as...` is performed.

Signed-off-by: vince-fugnitto <vincent.fugnitto@ericsson.com>

packages/filesystem/src/browser/file-dialog/file-dialog-service.ts

@@ -83,14 +83,12 @@ export class DefaultFileDialogService implements FileDialogService {
             resource: new URI(await this.environments.getHomeDirUri()),
             isDirectory: true
         };
-        if (folder) {
-            const folderUri = folder.resource;
-            const rootUri = folder.isDirectory ? folderUri : folderUri.parent;
-            try {
-                const rootStat = await this.fileService.resolve(rootUri);
-                return DirNode.createRoot(rootStat);
-            } catch { }
-        }
+        const folderUri = folder.resource;
+        const rootUri = folder.isDirectory ? folderUri : folderUri.parent;
+        try {
+            const rootStat = await this.fileService.resolve(rootUri);
+            return DirNode.createRoot(rootStat);
+        } catch { }
         return undefined;
     }
 }

packages/filesystem/src/electron-browser/file-dialog/electron-file-dialog-service.ts

@@ -60,10 +60,16 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
         return undefined;
     }
 
-    async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
-        const rootNode = await this.getRootNode(folder);
-        if (rootNode) {
-            const { filePath } = await remote.dialog.showSaveDialog(this.toSaveDialogOptions(rootNode.uri, props));
+    async showSaveDialog(props: SaveFileDialogProps, fileOrFolder?: FileStat): Promise<URI | undefined> {
+        let resource = undefined;
+        if (fileOrFolder) {
+            resource = fileOrFolder.resource;
+        } else {
+            const node = await this.getRootNode(fileOrFolder);
+            resource = node?.uri;
+        }
+        if (resource) {
+            const { filePath } = await remote.dialog.showSaveDialog(this.toSaveDialogOptions(resource, props));
             if (!filePath) {
                 return undefined;
             }
@@ -108,8 +114,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
 
     protected toSaveDialogOptions(uri: URI, props: SaveFileDialogProps): SaveDialogOptions {
         const buttonLabel = props.saveLabel;
-        const defaultPath = props.inputValue;
-        return { ...this.toDialogOptions(uri, props, 'Save'), buttonLabel, defaultPath };
+        return { ...this.toDialogOptions(uri, props, 'Save'), buttonLabel };
     }
 
 }