diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts index 53cdeb55..59012b13 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts @@ -137,7 +137,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { for (const ru of roomUserShort) { for (const u of ru.userInfos) { if (u.seq !== this.loginRes.userSeq) { - if (!!u.name && '' !== u.name.trim()) { + if (!!u.name && '' !== u.name.trim() && u.isJoinRoom) { recommendedWordList.push(u.name); } } @@ -285,7 +285,9 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked { value => roomInfo.roomSeq === value.roomSeq ); if (-1 < i) { - return this.roomUserShortList[i].userInfos; + return this.roomUserShortList[i].userInfos.filter( + user => user.isJoinRoom + ); } } } 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 b5a979a2..2a2b75c8 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 @@ -608,6 +608,10 @@ export class OrganizationComponent event.preventDefault(); event.stopPropagation(); + if (userInfo.seq === this.loginRes.userSeq) { + return; + } + this.orgUserContextMenuPosition.x = event.clientX + 'px'; this.orgUserContextMenuPosition.y = event.clientY + 'px'; this.orgUserContextMenuTrigger.menu.focusFirstItem('mouse'); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index c3243101..aebb11ec 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -59,7 +59,9 @@ --> - +
@@ -88,6 +90,7 @@ device_hub--> - +
- +