From 3e11d4e4a227f45856a5adb69daf34f427911648 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Thu, 21 Nov 2019 16:15:15 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20>=20=EA=B7=B8=EB=A3=B9=20?=
 =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=EC=9D=98=20more=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=B0=8F=20context=20menu=20=EB=B6=84=EA=B8=B0=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../left-sidenav/group.component.html         | 55 ++++++++++++-------
 .../left-sidenav/group.component.ts           | 20 ++++++-
 .../components/expansion-panel.component.html |  2 +-
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
index 0a350246..751d29c1 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
@@ -99,14 +99,14 @@
     <mat-icon>expand_less</mat-icon>
     <span>그룹 전체 닫기</span>
   </button>
-  <button mat-menu-item (click)="onClickGroupMenu('GROUP_SAVE')">
+  <!-- <button mat-menu-item (click)="onClickGroupMenu('GROUP_SAVE')">
     <mat-icon>save</mat-icon>
     <span>그룹 저장하기</span>
   </button>
   <button mat-menu-item (click)="onClickGroupMenu('GROUP_RESTORE')">
     <mat-icon>restore</mat-icon>
     <span>그룹 가져오기</span>
-  </button>
+  </button> -->
 </mat-menu>
 
 <div
@@ -130,7 +130,7 @@
     </button>
     <button
       mat-menu-item
-      *ngIf="getShowContextMenu('REGISTER_FAVORITE', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('REGISTER_FAVORITE', userInfo, group)"
       (click)="onClickProfileContextMenu('REGISTER_FAVORITE', userInfo)"
     >
       즐겨찾기 {{ userInfo.isFavorit ? '해제' : '등록' }}
@@ -140,35 +140,35 @@
     </button>
     <button
       mat-menu-item
-      *ngIf="getShowContextMenu('REMOVE_FROM_GROUP', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('REMOVE_FROM_GROUP', userInfo, group)"
       (click)="onClickProfileContextMenu('REMOVE_FROM_GROUP', userInfo, group)"
     >
       이 그룹에서 삭제
     </button>
     <button
       mat-menu-item
-      *ngIf="getShowContextMenu('COPY_BUDDY', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('COPY_BUDDY', userInfo, group)"
       (click)="onClickProfileContextMenu('COPY_BUDDY', userInfo)"
     >
       대화 상대 복사
     </button>
     <button
       mat-menu-item
-      *ngIf="getShowContextMenu('MOVE_BUDDY', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('MOVE_BUDDY', userInfo, group)"
       (click)="onClickProfileContextMenu('MOVE_BUDDY', userInfo, group)"
     >
       대화 상대 이동
     </button>
     <button
       mat-menu-item
-      *ngIf="getShowContextMenu('SEND_NOTE', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('SEND_NOTE', userInfo, group)"
       (click)="onClickProfileContextMenu('SEND_NOTE', userInfo)"
     >
       쪽지 보내기
     </button>
     <!-- <button
       mat-menu-item
-      *ngIf="getShowContextMenu('REGISTER_NICKNAME', userInfo, group)"
+      *ngIf="getShowProfileContextMenu('REGISTER_NICKNAME', userInfo, group)"
       (click)="onClickProfileContextMenu('REGISTER_NICKNAME', userInfo)"
     >
       닉네임 설정
@@ -189,23 +189,40 @@
   (ucapClickOutside)="groupContextMenuTrigger.closeMenu()"
 >
   <ng-template matMenuContent let-group="group">
-    <button mat-menu-item (click)="onClickGroupContextMenu('CHAT', group)">
-      그룹 대화하기
-    </button>
-    <button mat-menu-item (click)="onClickGroupContextMenu('SEND_NOTE', group)">
-      그룹 쪽지 보내기
-    </button>
-    <button mat-menu-item (click)="onClickGroupContextMenu('RENAME', group)">
-      그룹 이름 바꾸기
-    </button>
-    <mat-divider></mat-divider>
     <button
       mat-menu-item
+      *ngIf="getShowGroupContextMenu('CHAT', group)"
+      (click)="onClickGroupContextMenu('CHAT', group)"
+    >
+      그룹 대화하기
+    </button>
+    <button
+      mat-menu-item
+      *ngIf="getShowGroupContextMenu('SEND_NOTE', group)"
+      (click)="onClickGroupContextMenu('SEND_NOTE', group)"
+    >
+      그룹 쪽지 보내기
+    </button>
+    <button
+      mat-menu-item
+      *ngIf="getShowGroupContextMenu('RENAME', group)"
+      (click)="onClickGroupContextMenu('RENAME', group)"
+    >
+      그룹 이름 바꾸기
+    </button>
+    <mat-divider *ngIf="getShowGroupContextMenu('DIV1', group)"></mat-divider>
+    <button
+      mat-menu-item
+      *ngIf="getShowGroupContextMenu('EDIT_MEMBER', group)"
       (click)="onClickGroupContextMenu('EDIT_MEMBER', group)"
     >
       그룹 멤버 변경
     </button>
-    <button mat-menu-item (click)="onClickGroupContextMenu('DELETE', group)">
+    <button
+      mat-menu-item
+      *ngIf="getShowGroupContextMenu('DELETE', group)"
+      (click)="onClickGroupContextMenu('DELETE', group)"
+    >
       그룹 삭제
     </button>
   </ng-template>
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
index 16e42156..27d66a3f 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
@@ -287,7 +287,25 @@ export class GroupComponent implements OnInit, OnDestroy {
     this.searchUserInfos = [];
   }
 
-  getShowContextMenu(
+  /** 그룹 header > more 버튼 > visible of context menu */
+  getShowGroupContextMenu(menuType: string, group: GroupDetailData) {
+    if (
+      menuType === 'DIV1' ||
+      menuType === 'RENAME' ||
+      menuType === 'EDIT_MEMBER' ||
+      menuType === 'DELETE'
+    ) {
+      if (!group || group === undefined) {
+        // 현재는 즐겨찾기에 해당함.
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /** 그룹 > 그룹원 > visible of context menu */
+  getShowProfileContextMenu(
     menuType: string,
     userInfo: UserInfo | UserInfoF,
     group?: GroupDetailData
diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
index dc832a61..b5f465bd 100644
--- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
+++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html
@@ -67,7 +67,7 @@
           <button
             mat-icon-button
             aria-label="group menu"
-            *ngIf="!checkable"
+            *ngIf="node.nodeType !== NodeType.Profile"
             (click)="onClickMore($event, node.groupDetail)"
             class="group-menu"
           >