Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

electron-projects/ucap-webmessenger-electron/src/index.ts

@@ -600,12 +600,21 @@ ipcMain.on(
 ipcMain.on(
   FileChannel.SelectSaveFilePath,
   (event: IpcMainEvent, ...args: any[]) => {
+    const defaultPath = args[0];
+    const ext = path.extname(defaultPath);
     dialog
-      .showSaveDialog({ defaultPath: args[0] })
+      .showSaveDialog({
+        defaultPath
+      })
       .then(obj => {
+        const filePath =
+          '' !== ext && '' === path.extname(obj.filePath)
+            ? `${obj.filePath}${ext}`
+            : obj.filePath;
+
         event.returnValue = {
           canceled: obj.canceled,
-          filePath: obj.filePath
+          filePath
         };
       })
       .catch(obj => {

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts

@@ -918,19 +918,20 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
       this.nativeService
         .selectSaveFilePath(value.fileInfo.fileName)
         .then(result => {
-          if (!!result && result.filePath.length > 0) {
+          if (!result) {
-            this.saveFile(value, result.filePath);
+            return;
-          } else {
-            if (!!result && result.canceled) {
-              // ignore..
-            } else {
-              this.snackBarService.open(
-                this.translateService.instant(
-                  'common.file.errors.failToSpecifyPath'
-                ),
-                this.translateService.instant('common.file.errors.label')
-              );
           }
+
+          if (result.canceled) {
+            this.snackBarService.open(
+              this.translateService.instant('common.file.results.canceled'),
+              this.translateService.instant('common.file.errors.label'),
+              {
+                duration: 1000
+              }
+            );
+          } else {
+            this.saveFile(value, result.filePath);
           }
         })
         .catch(reason => {

projects/ucap-webmessenger-app/src/assets/i18n/en.json

@@ -408,6 +408,7 @@
         "saved": "The file has been saved.",
         "savedAll": "All file(s) have(has) been saved.",
         "savedToPath": "The file has been saved to path[{{path}}].",
+        "canceled": "Canceled",
         "downloadInProgress": "Download is in progress."
       },
       "errors": {

projects/ucap-webmessenger-app/src/assets/i18n/ko.json

@@ -408,6 +408,7 @@
         "saved": "파일이 저장되었습니다.",
         "savedAll": "모든 파일이 저장되었습니다.",
         "savedToPath": "파일이 경로[{{path}}]에 저장되었습니다.",
+        "canceled": "취소 되었습니다.",
         "downloadInProgress": "다운로드가 진행중입니다."
       },
       "errors": {