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/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 7403cfce..c09d0e0c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -116,6 +116,8 @@ export class OrganizationComponent @ViewChild('cvsvDeptUser', { static: false }) cvsvDeptUser: CdkVirtualScrollViewport; + @ViewChild('cvsvDeptSearchUser', { static: false }) + cvsvDeptSearchUser: CdkVirtualScrollViewport; @ViewChild(PerfectScrollbarDirective, { static: false }) psDirectiveRef?: PerfectScrollbarDirective; @@ -290,15 +292,21 @@ export class OrganizationComponent this.selectedDepartmentProcessing = false; // 검색 결과에 따른 프레즌스 조회. const userSeqList: number[] = []; - this.searchUserInfos.map(user => userSeqList.push(user.seq)); if (userSeqList.length > 0) { this.store.dispatch( StatusStore.bulkInfo({ divCd: 'orgSrch', - userSeqs: userSeqList + userSeqs: this.searchUserInfos.map(user => user.seq) }) ); } + + if (!!this.cvsvDeptSearchUser) { + this.cvsvDeptSearchUser.scrollToOffset(0); + } + if (!!this.psDirectiveRef) { + this.psDirectiveRef.update(); + } } break; } 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 070ee530..061488b2 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 d0d907b7..d40948a4 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 6c2ec65a..d17bc5bc 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 @@