Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts

@@ -289,6 +289,7 @@ export class GroupComponent implements OnInit, OnDestroy {
 
   /** 그룹 header > more 버튼 > visible of context menu */
   getShowGroupContextMenu(menuType: string, group: GroupDetailData) {
+    // 즐겨찾기 그룹 숨김메뉴
     if (
       menuType === 'DIV1' ||
       menuType === 'RENAME' ||
@@ -296,7 +297,13 @@ export class GroupComponent implements OnInit, OnDestroy {
       menuType === 'DELETE'
     ) {
       if (!group || group === undefined) {
-        // 현재는 즐겨찾기에 해당함.
+        return false;
+      }
+    }
+
+    // 기본 그룹 숨김메뉴
+    if (menuType === 'RENAME' || menuType === 'DELETE') {
+      if (!!group && group.seq === 0) {
         return false;
       }
     }

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html

@@ -171,6 +171,7 @@
         [userInfos]="userInfoList"
         [loginRes]="loginRes"
         [sessionVerInfo]="sessionVerInfo"
+        [isShowUnreadCount]="getShowUnreadCount()"
         (moreEvent)="onMoreEvent($event)"
         (massDetail)="onMassDetail($event)"
         (save)="onSave($event)"

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts

@@ -353,6 +353,21 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     return true;
   }
 
+  getShowUnreadCount(): boolean {
+    if (!this.roomInfo || this.roomInfo === undefined) {
+      return true;
+    }
+    if (
+      this.roomInfo.roomType === RoomType.Mytalk ||
+      this.roomInfo.roomType === RoomType.Bot ||
+      this.roomInfo.roomType === RoomType.Allim
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
   readyToReply(): void {
     setTimeout(() => {
       this.focusReplyInput();

projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html

@@ -154,7 +154,7 @@
 
         <div class="time secondary-text">
           <ul>
-            <li>{{ getUnreadCount(message) }}</li>
+            <li *ngIf="isShowUnreadCount">{{ getUnreadCount(message) }}</li>
             <li>
               {{ moment(message.sendDate).toDate() | date: 'a hh:mm' }}
             </li>

projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts

@@ -42,6 +42,8 @@ export class MessagesComponent implements OnInit {
   userInfos?: UserInfo[];
   @Input()
   sessionVerInfo: VersionInfo2Response;
+  @Input()
+  isShowUnreadCount = true;
 
   @Output()
   openProfile = new EventEmitter<UserInfo>();