From 921af8f5bbb27c74caf8751879c828e000fa6d76 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 4 Mar 2020 08:26:06 +0900
Subject: [PATCH] add white list  :: xlsm

---
 .../app/layouts/messenger/components/messages.component.ts    | 4 ++++
 .../src/environments/environment.type.ts                      | 1 +
 .../src/lib/components/message-box/attach-file.component.scss | 1 +
 .../src/assets/scss/file-icon/_icons.scss                     | 4 ++--
 4 files changed, 8 insertions(+), 2 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 076fc93e..dae05a71 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
@@ -1201,6 +1201,10 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
             this.translateService.instant('common.file.errors.failToUpload'),
             this.translateService.instant('common.file.errors.label')
           );
+
+          if (!!this.fileUploadQueue) {
+            this.fileUploadQueue.onUploadComplete();
+          }
         },
         () => {
           if (!!this.fileUploadQueue) {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.type.ts b/projects/ucap-webmessenger-app/src/environments/environment.type.ts
index 15c0f670..dae649e0 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.type.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.type.ts
@@ -211,6 +211,7 @@ export const commonApiAcceptableFileExtensionsForDocumnet: string[] = [
   'ppsx',
   'xls',
   'xlsx',
+  'xlsm',
   'xlt',
   'xltx',
   'rtf',
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss
index 1a631ff9..3dbefe39 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/attach-file.component.scss
@@ -44,6 +44,7 @@ $tablet-s-width: 768px;
       }
     }
     &.xls,
+    &.xlsm,
     &.xlsx {
       background-image: url(/assets/images/file/icon_talk_xls.png);
       &.disable {
diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/file-icon/_icons.scss b/projects/ucap-webmessenger-ui/src/assets/scss/file-icon/_icons.scss
index 9c1ae1c0..c6c29817 100644
--- a/projects/ucap-webmessenger-ui/src/assets/scss/file-icon/_icons.scss
+++ b/projects/ucap-webmessenger-ui/src/assets/scss/file-icon/_icons.scss
@@ -162,8 +162,8 @@ $icon-list: ('3dm', '', $world), ('3dmf', '', $world), ('7z', '', $zip),
   ('xgz', '', $app), ('xif', '', $photo), ('xl', '', $app), ('xla', '', $app),
   ('xlb', '', $app), ('xlc', '', $app), ('xld', '', $app), ('xlk', '', $app),
   ('xll', '', $app), ('xlm', '', $app), ('xls', '', $app), ('xlsx', '', $app),
-  ('xlt', '', $app), ('xlv', '', $app), ('xlw', '', $app), ('xm', '', $lp),
-  ('xml', '', $app), ('xmz', '', $text), ('xpix', '', $app),
+  ('xlsm', '', $app), ('xlt', '', $app), ('xlv', '', $app), ('xlw', '', $app),
+  ('xm', '', $lp), ('xml', '', $app), ('xmz', '', $text), ('xpix', '', $app),
   ('xpm', '', $picture), ('xsr', '', $play), ('xwd', '', $pict),
   ('xyz', '', $app), ('z', '', $zip), ('zip', '', $zip), ('zoo', '', $app),
   ('zsh', '', $text);