From 11fc391fc4134e30361f55c979cbc7ee065f5842 Mon Sep 17 00:00:00 2001
From: richard-loafle <44828666+richard-loafle@users.noreply.github.com>
Date: Wed, 5 Feb 2020 17:57:18 +0900
Subject: [PATCH] [ISSUE 195] fixed
---
.../components/messages.component.ts | 52 +++++++--------
.../src/assets/i18n/en.json | 2 +-
.../src/assets/i18n/ko.json | 2 +-
.../src/lib/components/write.component.ts | 65 +++++++++----------
.../directives/file-upload-for.directive.ts | 30 ++++-----
5 files changed, 69 insertions(+), 82 deletions(-)
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
index 1ebcf98d..00a6126f 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
@@ -1160,22 +1160,18 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
fui => fui.file.size > fileAllowSize * 1024 * 1024
).length
) {
- this.dialogService.open<
- AlertDialogComponent,
- AlertDialogData,
- AlertDialogResult
- >(AlertDialogComponent, {
- width: '360px',
- data: {
- title: '',
- message: this.translateService.instant(
- 'common.file.errors.oversize',
- {
- maxSize: fileAllowSize
- }
- )
+ this.snackBarService.open(
+ this.translateService.instant('common.file.errors.oversize', {
+ maxSize: fileAllowSize
+ }),
+ '',
+ {
+ duration: 1000,
+ verticalPosition: 'bottom',
+ horizontalPosition: 'center'
}
- });
+ );
+
if (!!this.fileUploadQueue) {
this.fileUploadQueue.onUploadComplete();
}
@@ -1191,22 +1187,18 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
this.fileUploadQueue.onUploadComplete();
}
- this.dialogService.open<
- AlertDialogComponent,
- AlertDialogData,
- AlertDialogResult
- >(AlertDialogComponent, {
- data: {
- title: 'Alert',
- html: `${this.translateService.instant(
- 'common.file.errors.notSupporedType'
- )} ${
- checkExt.reject.length > 0
- ? '
(' + checkExt.reject.join(',') + ')'
- : ''
- }`
+ this.snackBarService.open(
+ this.translateService.instant('common.file.errors.notSupporedType', {
+ supporedType:
+ checkExt.reject.length > 0 ? checkExt.reject.join(',') : ''
+ }),
+ '',
+ {
+ duration: 1000,
+ verticalPosition: 'bottom',
+ horizontalPosition: 'center'
}
- });
+ );
return;
}
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index a639afa6..619e2899 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -434,7 +434,7 @@
"expired": "This file has expired",
"noPreview": "This file does not support preview.",
"cantPlay": "This file does not support playing.",
- "notSupporedType": "File format is not supported.",
+ "notSupporedType": "File format is not supported.
({{supporedType}})",
"oversize": "You cannot upload files larger than {{size}} megabytes."
}
},
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index bee364bc..f2c35bfb 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -434,7 +434,7 @@
"expired": "기간이 만료된 파일입니다",
"noPreview": "미리보기를 지원하지 않는 파일입니다.",
"cantPlay": "재생을 지원하지 않는 파일입니다.",
- "notSupporedType": "지원하지 않는 파일형식입니다.",
+ "notSupporedType": "지원하지 않는 파일형식입니다.
({{supporedType}})",
"oversize": "{{maxSize}}MB 이상 파일을 업로드 할 수 없습니다."
}
},
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
index 65e42c5a..b55d6141 100644
--- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
+++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
@@ -8,7 +8,8 @@ import {
ChangeDetectorRef,
OnDestroy,
ElementRef,
- Input
+ Input,
+ NgZone
} from '@angular/core';
import {
@@ -16,7 +17,8 @@ import {
DialogService,
AlertDialogResult,
AlertDialogComponent,
- AlertDialogData
+ AlertDialogData,
+ SnackBarService
} from '@ucap-webmessenger/ui';
import { NGXLogger } from 'ngx-logger';
@@ -118,6 +120,8 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
private changeDetectorRef: ChangeDetectorRef,
private translateService: TranslateService,
private commonApiService: CommonApiService,
+ private snackBarService: SnackBarService,
+ private readonly ngZone: NgZone,
private logger: NGXLogger
) {}
@@ -193,6 +197,7 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
const fileList: FileList = this.fileInput.nativeElement.files;
if (!this.validUploadFile(fileList)) {
+ self.fileInput.nativeElement.value = '';
return;
}
@@ -222,21 +227,18 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
}
}
if (!valid) {
- this.dialogService.open<
- AlertDialogComponent,
- AlertDialogData,
- AlertDialogResult
- >(AlertDialogComponent, {
- width: '360px',
- data: {
- title: '',
- message: this.translateService.instant(
- 'common.file.errors.oversize',
- {
- maxSize: this.fileAllowSize
- }
- )
- }
+ this.ngZone.run(() => {
+ this.snackBarService.open(
+ this.translateService.instant('common.file.errors.oversize', {
+ maxSize: this.fileAllowSize
+ }),
+ '',
+ {
+ duration: 1000,
+ verticalPosition: 'bottom',
+ horizontalPosition: 'center'
+ }
+ );
});
return valid;
@@ -247,23 +249,20 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
FileUtil.getExtensions(fileList)
);
if (!checkExt.accept) {
- this.dialogService.open<
- AlertDialogComponent,
- AlertDialogData,
- AlertDialogResult
- >(AlertDialogComponent, {
- data: {
- title: 'Alert',
- html: `${this.translateService.instant(
- 'common.file.errors.notSupporedType'
- )} ${
- checkExt.reject.length > 0
- ? '
(' + checkExt.reject.join(',') + ')'
- : ''
- }`
- }
+ this.ngZone.run(() => {
+ this.snackBarService.open(
+ this.translateService.instant('common.file.errors.notSupporedType', {
+ supporedType:
+ checkExt.reject.length > 0 ? checkExt.reject.join(',') : ''
+ }),
+ '',
+ {
+ duration: 1000,
+ verticalPosition: 'bottom',
+ horizontalPosition: 'center'
+ }
+ );
});
-
return valid;
}
diff --git a/projects/ucap-webmessenger-ui/src/lib/directives/file-upload-for.directive.ts b/projects/ucap-webmessenger-ui/src/lib/directives/file-upload-for.directive.ts
index d245f47e..2a9732ba 100644
--- a/projects/ucap-webmessenger-ui/src/lib/directives/file-upload-for.directive.ts
+++ b/projects/ucap-webmessenger-ui/src/lib/directives/file-upload-for.directive.ts
@@ -13,13 +13,13 @@ import { FileUploadQueueComponent } from '../components/file-upload-queue.compon
import { FileUploadItem } from '@ucap-webmessenger/api';
import { CommonApiService } from '@ucap-webmessenger/api-common';
import { FileUtil } from '@ucap-webmessenger/core';
-import { DialogService } from '../services/dialog.service';
import {
AlertDialogComponent,
AlertDialogResult,
AlertDialogData
} from '../dialogs/alert.dialog.component';
import { TranslateService } from '@ngx-translate/core';
+import { SnackBarService } from '../services/snack-bar.service';
@Directive({
selector: 'input[ucapFileUploadFor], div[ucapFileUploadFor]'
@@ -47,7 +47,7 @@ export class FileUploadForDirective implements AfterViewInit {
private elementRef: ElementRef,
private logger: NGXLogger,
private translateService: TranslateService,
- private dialogService: DialogService
+ private snackBarService: SnackBarService
) {}
ngAfterViewInit(): void {}
@@ -121,22 +121,18 @@ export class FileUploadForDirective implements AfterViewInit {
this.elementRef.nativeElement.value = '';
this.dragOver = false;
- this.dialogService.open<
- AlertDialogComponent,
- AlertDialogData,
- AlertDialogResult
- >(AlertDialogComponent, {
- data: {
- title: 'Alert',
- html: `${this.translateService.instant(
- 'common.file.errors.notSupporedType'
- )} ${
- checkExt.reject.length > 0
- ? '
(' + checkExt.reject.join(',') + ')'
- : ''
- }`
+ this.snackBarService.open(
+ this.translateService.instant('common.file.errors.notSupporedType', {
+ supporedType:
+ checkExt.reject.length > 0 ? checkExt.reject.join(',') : ''
+ }),
+ '',
+ {
+ duration: 1000,
+ verticalPosition: 'bottom',
+ horizontalPosition: 'center'
}
- });
+ );
return;
}