1. 대화방 열때 ClearView 에서 Right drawer 닫기.
2. 로그아웃시 GroupComponent 에서 userInfo is null exception 발생 부분 보완코드 3. 파일함, 앨범함 오픈 후 로그아웃 진행시 roomInfo.roomSeq 에서 null 발생하는 부분 보완코드
This commit is contained in:
parent
1af702bccd
commit
64bc91093b
|
@ -144,7 +144,9 @@ export class GroupComponent implements OnInit, OnDestroy {
|
||||||
.pipe(
|
.pipe(
|
||||||
select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
|
select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
|
||||||
tap(loginRes => {
|
tap(loginRes => {
|
||||||
|
if (!!loginRes) {
|
||||||
this.loginRes = loginRes;
|
this.loginRes = loginRes;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
.subscribe();
|
.subscribe();
|
||||||
|
|
|
@ -119,6 +119,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
openProfile = new EventEmitter<{
|
openProfile = new EventEmitter<{
|
||||||
userSeq: number;
|
userSeq: number;
|
||||||
}>();
|
}>();
|
||||||
|
@Output()
|
||||||
|
closeRightDrawer = new EventEmitter();
|
||||||
|
|
||||||
@ViewChild('chatForm', { static: false })
|
@ViewChild('chatForm', { static: false })
|
||||||
private chatForm: UCapUiChatFormComponent;
|
private chatForm: UCapUiChatFormComponent;
|
||||||
|
@ -410,6 +412,9 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
* 채팅방의 여러 팝업들을 닫아준다.
|
* 채팅방의 여러 팝업들을 닫아준다.
|
||||||
*/
|
*/
|
||||||
clearView() {
|
clearView() {
|
||||||
|
// Right Drawer closed..
|
||||||
|
this.closeRightDrawer.emit();
|
||||||
|
|
||||||
// Sticker Selector Clear..
|
// Sticker Selector Clear..
|
||||||
this.isShowStickerSelector = false;
|
this.isShowStickerSelector = false;
|
||||||
this.selectedSticker = undefined;
|
this.selectedSticker = undefined;
|
||||||
|
|
|
@ -100,6 +100,7 @@ export class AlbumBoxComponent implements OnInit, OnDestroy {
|
||||||
tap(([roomInfo, fileInfoList, fileInfoCheckList]) => {
|
tap(([roomInfo, fileInfoList, fileInfoCheckList]) => {
|
||||||
this.fileInfoList = fileInfoList.filter(fileInfo => {
|
this.fileInfoList = fileInfoList.filter(fileInfo => {
|
||||||
if (
|
if (
|
||||||
|
!!roomInfo &&
|
||||||
fileInfo.roomSeq === roomInfo.roomSeq &&
|
fileInfo.roomSeq === roomInfo.roomSeq &&
|
||||||
(fileInfo.type === FileType.Image ||
|
(fileInfo.type === FileType.Image ||
|
||||||
fileInfo.type === FileType.Video)
|
fileInfo.type === FileType.Video)
|
||||||
|
|
|
@ -109,6 +109,7 @@ export class FileBoxComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
this.fileInfoList = fileInfoList.filter(fileInfo => {
|
this.fileInfoList = fileInfoList.filter(fileInfo => {
|
||||||
if (
|
if (
|
||||||
|
!!roomInfo &&
|
||||||
fileInfo.roomSeq === roomInfo.roomSeq &&
|
fileInfo.roomSeq === roomInfo.roomSeq &&
|
||||||
(fileInfo.type === FileType.File ||
|
(fileInfo.type === FileType.File ||
|
||||||
fileInfo.type === FileType.Sound)
|
fileInfo.type === FileType.Sound)
|
||||||
|
|
|
@ -113,9 +113,7 @@ export class TopBarComponent implements OnInit, OnDestroy {
|
||||||
>(KEY_VER_INFO);
|
>(KEY_VER_INFO);
|
||||||
|
|
||||||
// WebLink init..
|
// WebLink init..
|
||||||
if (!this.weblink || this.weblink.length === 0) {
|
|
||||||
this.initWebLink();
|
this.initWebLink();
|
||||||
}
|
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
.subscribe();
|
.subscribe();
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
<app-layout-messenger-messages
|
<app-layout-messenger-messages
|
||||||
*ngIf="!!(this.selectedChat$ | async)"
|
*ngIf="!!(this.selectedChat$ | async)"
|
||||||
(openProfile)="onClickOpenProfile($event)"
|
(openProfile)="onClickOpenProfile($event)"
|
||||||
|
(closeRightDrawer)="onCloseRightDrawer()"
|
||||||
></app-layout-messenger-messages>
|
></app-layout-messenger-messages>
|
||||||
</div>
|
</div>
|
||||||
<mat-drawer
|
<mat-drawer
|
||||||
|
|
Loading…
Reference in New Issue
Block a user