From 3454b111227036a984ca066fffecf4ae47785319 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 15 Jan 2020 17:02:18 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EC=AA=BD=EC=A7=80=20=EB=B0=9C=EC=86=A1=20?=
 =?UTF-8?q?=EC=B7=A8=EC=86=8C=20=EC=8B=A4=ED=8C=A8=EC=8B=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=9C=EB=A0=A5=202,?=
 =?UTF-8?q?=20=EC=9B=B9=EB=A7=81=ED=81=AC=20allow=20=EC=99=80=20=EC=8B=A4?=
 =?UTF-8?q?=EC=A0=9C=20url=20=EC=9D=B4=20=EB=A7=A4=EC=B9=AD=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=84=EB=95=8C=20=EB=B0=9C=EC=83=9D?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=EC=A0=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/message-detail.dialog.component.ts        |  9 +++++++++
 .../layouts/native/components/top-bar.component.html  |  5 ++++-
 .../layouts/native/components/top-bar.component.ts    | 11 ++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts
index c469fcf7..389d4087 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts
@@ -609,6 +609,15 @@ export class MessageDetailDialogComponent implements OnInit {
                 this.selectedUnreadUserSeqs = [];
                 this.rightDrawer.close();
               } else {
+                this.snackBarService.open(
+                  this.translateService.instant('chat.error.cancelledError'),
+                  this.translateService.instant('common.messages.confirm'),
+                  {
+                    duration: 3000,
+                    verticalPosition: 'bottom',
+                    horizontalPosition: 'center'
+                  }
+                );
                 this.logger.error('message cancel user Error!');
               }
             }),
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
index 8eacbece..ebe936ed 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html
@@ -5,7 +5,10 @@
   <div class="app-layout-native-title-bar-title">DS Talk</div>
   <div class="app-layout-native-title-bar-spacer"></div>
   <div class="btn-area">
-    <div *ngIf="!!loginRes" class="app-layout-native-title-bar-link">
+    <div
+      *ngIf="!!loginRes && !!weblink"
+      class="app-layout-native-title-bar-link"
+    >
       <ng-container *ngFor="let link of weblink" [ngSwitch]="link.key">
         <button
           mat-icon-button
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
index 6c64bc3a..0160fc74 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -193,9 +193,14 @@ export class TopBarComponent implements OnInit, OnDestroy {
 
       if (!!urlInfo && !!urlInfo.webLink) {
         // order by webLinkAllowedList..
-        this.weblink = urlInfo.webLinkAllowedList.map(showWeblink =>
-          urlInfo.webLink.find(weblink => weblink.key === showWeblink)
-        );
+        this.weblink = urlInfo.webLinkAllowedList
+          .filter(
+            showWebLink =>
+              urlInfo.webLink.filter(wl => wl.key === showWebLink).length > 0
+          )
+          .map(showWeblink =>
+            urlInfo.webLink.find(weblink => weblink.key === showWeblink)
+          );
 
         if (urlInfo.webLinkAllowedList.indexOf(WebLinkType.Mail) > -1) {
           // 메일 카운트 체크.