From 64bc91093b77e130cf7950792915ed4f2c66ee59 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 8 Jan 2020 13:21:09 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=8C=80=ED=99=94=EB=B0=A9=20=EC=97=B4?= =?UTF-8?q?=EB=95=8C=20ClearView=20=EC=97=90=EC=84=9C=20=20Right=20drawer?= =?UTF-8?q?=20=EB=8B=AB=EA=B8=B0.=202.=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=8B=9C=20GroupComponent=20=EC=97=90=EC=84=9C=20user?= =?UTF-8?q?Info=20is=20null=20exception=20=EB=B0=9C=EC=83=9D=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EB=B3=B4=EC=99=84=EC=BD=94=EB=93=9C=203.=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=ED=95=A8,=20=EC=95=A8=EB=B2=94=ED=95=A8=20?= =?UTF-8?q?=EC=98=A4=ED=94=88=20=ED=9B=84=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=A7=84=ED=96=89=EC=8B=9C=20roomInfo.roomSeq=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20null=20=EB=B0=9C=EC=83=9D=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EB=B3=B4=EC=99=84=EC=BD=94?= =?UTF-8?q?=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/left-sidenav/group.component.ts | 4 +++- .../app/layouts/messenger/components/messages.component.ts | 5 +++++ .../messenger/components/right-drawer/album-box.component.ts | 1 + .../messenger/components/right-drawer/file-box.component.ts | 1 + .../src/app/layouts/native/components/top-bar.component.ts | 4 +--- .../app/pages/messenger/components/main.page.component.html | 1 + 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index 4d1f5bea..1111bdb9 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -144,7 +144,9 @@ export class GroupComponent implements OnInit, OnDestroy { .pipe( select(AppStore.AccountSelector.AuthenticationSelector.loginRes), tap(loginRes => { - this.loginRes = loginRes; + if (!!loginRes) { + this.loginRes = loginRes; + } }) ) .subscribe(); 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 739e1079..6b34752f 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 @@ -119,6 +119,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { openProfile = new EventEmitter<{ userSeq: number; }>(); + @Output() + closeRightDrawer = new EventEmitter(); @ViewChild('chatForm', { static: false }) private chatForm: UCapUiChatFormComponent; @@ -410,6 +412,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { * 채팅방의 여러 팝업들을 닫아준다. */ clearView() { + // Right Drawer closed.. + this.closeRightDrawer.emit(); + // Sticker Selector Clear.. this.isShowStickerSelector = false; this.selectedSticker = undefined; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts index 4cb8cd26..7b27a3c4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.ts @@ -100,6 +100,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy { tap(([roomInfo, fileInfoList, fileInfoCheckList]) => { this.fileInfoList = fileInfoList.filter(fileInfo => { if ( + !!roomInfo && fileInfo.roomSeq === roomInfo.roomSeq && (fileInfo.type === FileType.Image || fileInfo.type === FileType.Video) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts index 7dfb1cb9..0baff6a5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.ts @@ -109,6 +109,7 @@ export class FileBoxComponent implements OnInit, OnDestroy { this.fileInfoList = fileInfoList.filter(fileInfo => { if ( + !!roomInfo && fileInfo.roomSeq === roomInfo.roomSeq && (fileInfo.type === FileType.File || fileInfo.type === FileType.Sound) 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 dc42cd11..f002796e 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 @@ -113,9 +113,7 @@ export class TopBarComponent implements OnInit, OnDestroy { >(KEY_VER_INFO); // WebLink init.. - if (!this.weblink || this.weblink.length === 0) { - this.initWebLink(); - } + this.initWebLink(); }) ) .subscribe(); diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html index 878bd84f..8945d47b 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html @@ -37,6 +37,7 @@