From 7e6099a777904ddaa80048c159fff8216f5498d3 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Thu, 6 Feb 2020 10:24:47 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20215,?=
 =?UTF-8?q?=20216,=20218?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/left-sidenav/chat.component.ts |  6 ++--
 .../left-sidenav/organization.component.ts    |  4 +++
 .../chat/create-chat.dialog.component.html    | 13 +++++---
 .../components/user-list-item.component.html  |  1 +
 .../components/user-list-item.component.ts    | 30 +++++++++----------
 5 files changed, 33 insertions(+), 21 deletions(-)

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 @@
                 <path d="M23 21v-2a4 4 0 0 0-3-3.87"></path>
                 <path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
               </svg>-->
-              <button class="icon-button"><i class="mid mid-24 mdi-account-multiple"></i></button>
+              <button class="icon-button">
+                <i class="mid mid-24 mdi-account-multiple"></i>
+              </button>
             </ng-template>
             <div class="mat-tab-frame">
               <div>
@@ -88,6 +90,7 @@
                   <ucap-profile-user-list-item
                     *ucapGroupExpansionPanelItem="let userInfo"
                     [userInfo]="userInfo"
+                    [showPresence]="false"
                     [sessionVerinfo]="sessionVerinfo"
                     [selectedUserList]="selectedUserList"
                     [isChecked]="getCheckedUser(userInfo)"
@@ -123,6 +126,7 @@
                 <ucap-profile-user-list-item
                   *ngFor="let userInfo of searchUserInfos"
                   [userInfo]="userInfo"
+                  [showPresence]="false"
                   [sessionVerinfo]="sessionVerinfo"
                   [selectedUserList]="selectedUserList"
                   [isChecked]="getCheckedUser(userInfo)"
@@ -141,7 +145,9 @@
                 matTooltip="{{ 'organization.chart' | translate }}"
                 matTooltipPosition="after"
                 >device_hub</mat-icon>-->
-                <button class="icon-button"><i class="mid mid-24 mdi-file-tree"></i></button>
+              <button class="icon-button">
+                <i class="mid mid-24 mdi-file-tree"></i>
+              </button>
             </ng-template>
             <div>
               <app-layout-chat-left-sidenav-organization
@@ -165,8 +171,7 @@
                 matTooltipPosition="before"
                 class="icon-button"
                 ><i class="mid mid-24 mdi-chat"></i>
-                </mat-icon
-              >
+              </mat-icon>
             </ng-template>
             <div>
               <ucap-room-list-item
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
index 1d8b0877..769aee6f 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html
@@ -3,6 +3,7 @@
   <!--pcOn , pcOut  pcOff , pcOther-->
   <span
     class="presence"
+    *ngIf="showPresence"
     [ngClass]="getPresence(PresenceType.PC)"
     [matTooltip]="getPresenceMsg()"
     matTooltipPosition="after"
diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
index d46ffea4..2551b32c 100644
--- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
+++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts
@@ -35,6 +35,8 @@ export class UserListItemComponent implements OnInit {
   @Input()
   presence: StatusBulkInfo | StatusInfo;
   @Input()
+  showPresence = true;
+  @Input()
   checkable = false;
   @Input()
   checkDisabled = false;
@@ -77,21 +79,19 @@ export class UserListItemComponent implements OnInit {
         break;
     }
 
-    if (!!status) {
-      switch (status) {
-        case StatusCode.OnLine:
-          rtnClass = type + 'On';
-          break;
-        case StatusCode.Away:
-          rtnClass = type + 'Out';
-          break;
-        case StatusCode.Busy:
-          rtnClass = type + 'Other';
-          break;
-        default:
-          rtnClass = type + 'Off';
-          break;
-      }
+    switch (status) {
+      case StatusCode.OnLine:
+        rtnClass = type + 'On';
+        break;
+      case StatusCode.Away:
+        rtnClass = type + 'Out';
+        break;
+      case StatusCode.Busy:
+        rtnClass = type + 'Other';
+        break;
+      default:
+        rtnClass = type + 'Off';
+        break;
     }
 
     return rtnClass;