diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index e919a2a3..c9020572 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -49,7 +49,32 @@

- {{ getRoomName() }} + + 대화방명을 가져오고 있습니다.. + + + + + MyTalk + + + {{ _roomUserInfos | ucapTranslate: 'name':',' }} + + + + {{ roomInfo.roomName }} + + + {{ _roomUserInfos | ucapTranslate: 'name':',' }} + + + +

- +
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 2e95f086..8b9b001e 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 @@ -161,6 +161,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { snackBarPreviewEvent: MatSnackBarRef; + RoomType = RoomType; + constructor( private store: Store, private sessionStorageService: SessionStorageService, @@ -296,36 +298,14 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.selectedSticker = undefined; } - getRoomName() { - if (!this.roomInfo || !this.userInfoList) { - return '대화방명을 가져오고 있습니다..'; - } - - switch (this.roomInfo.roomType) { - case RoomType.Mytalk: - return 'MyTalk'; - case RoomType.Bot: - case RoomType.Allim: - return this.userInfoList - .filter(user => user.seq !== this.loginRes.userSeq && user.isJoinRoom) - .map(user => user.name); - } - - if (!!this.roomInfo.roomName && '' !== this.roomInfo.roomName.trim()) { - return this.roomInfo.roomName; - } else { - return this.userInfoList - .filter(user => { - if (this.roomInfo.roomType === RoomType.Single) { - return user.seq !== this.loginRes.userSeq; - } else { - return user.isJoinRoom; - } - }) - .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)) - .map(user => user.name) - .join(','); - } + get _roomUserInfos() { + return this.userInfoList + .filter(roomUserInfo => { + return ( + this.loginRes.userSeq !== roomUserInfo.seq && roomUserInfo.isJoinRoom + ); + }) + .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)); } /** 대화전송 가능한 방인지 판단 */ diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html index dd575262..9cc80548 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.html @@ -25,23 +25,27 @@
- - {{ roomInfo.roomName }} - - - Second - - - {{ _roomUserInfos | ucapTranslate: 'name':',' }} - - + + + MyTalk + + + {{ _roomUserInfos | ucapTranslate: 'name':',' }} + + + + {{ roomInfo.roomName }} + + + {{ _roomUserInfos | ucapTranslate: 'name':',' }} + + +
{ - if ( - this.loginRes.userSeq === roomUserInfo.seq || - !roomUserInfo.isJoinRoom - ) { - return; - } - if ('' === roomName.trim()) { - roomName = roomName.concat('', roomUserInfo.name); - } else { - roomName = roomName.concat(',', roomUserInfo.name); - } - } - ); - return roomName; - } - } - get _roomUserInfos() { - return this.roomUserInfo.filter(roomUserInfo => { - return ( - this.loginRes.userSeq !== roomUserInfo.seq && !!roomUserInfo.isJoinRoom - ); - }); + return this.roomUserInfo + .filter(roomUserInfo => { + return ( + this.loginRes.userSeq !== roomUserInfo.seq && roomUserInfo.isJoinRoom + ); + }) + .sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)); } // getChecked(value: boolean, roomInfo: RoomInfo) {