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

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

@@ -149,6 +149,7 @@
         [selectedUserList]="selectedUserList"
         (checkAllUser)="onCheckAllUser($event)"
         (checkUser)="onCheckUser($event)"
+        (openProfile)="onClickOpenProfile($event)"
         (toggleUser)="onToggleUser($event)"
         class="organization-side"
       ></app-layout-chat-left-sidenav-organization>

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html

@@ -54,6 +54,7 @@
           [selectedUserList]="selectedUserList"
           [isChecked]="getCheckedUser(userInfo)"
           (checkUser)="onCheckUser($event)"
+          (openProfile)="onClickOpenProfile($event)"
           (click)="onToggleUser(userInfo)"
         >
           Loading...
@@ -74,6 +75,7 @@
           [selectedUserList]="selectedUserList"
           [isChecked]="getCheckedUser(userInfo)"
           (checkUser)="onCheckUser($event)"
+          (openProfile)="onClickOpenProfile($event)"
           (click)="onToggleUser(userInfo)"
         >
         </ucap-profile-user-list-item>

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

@@ -72,6 +72,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
     isChecked: boolean;
     userInfos: (UserInfo | UserInfoSS | UserInfoF | UserInfoDN)[];
   }>();
+  @Output()
+  openProfile = new EventEmitter<
+    UserInfo | UserInfoSS | UserInfoF | UserInfoDN
+  >();
 
   companyList$: Observable<Company[]>;
   companyCode: string;
@@ -329,6 +333,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
     this.toggleUser.emit(userInfo);
   }
 
+  onClickOpenProfile(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) {
+    this.openProfile.emit(userInfo);
+  }
+
   onClickShowSelectedUserList() {
     this.logger.debug('onClickShowSelectedUserList', this.selectedUserList);
   }

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

@@ -86,25 +86,53 @@
         </button>
 
         <mat-menu #contactMenu="matMenu" [hasBackdrop]="false">
-          <button mat-menu-item (click)="onClickContextMenu('OPEN_ALBUM_LIST')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('OPEN_ALBUM_LIST')"
+            (click)="onClickContextMenu('OPEN_ALBUM_LIST')"
+          >
             앨범함
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('OPEN_FILE_LIST')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('OPEN_FILE_LIST')"
+            (click)="onClickContextMenu('OPEN_FILE_LIST')"
+          >
             파일함
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('OPEN_ROOM_USER')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('OPEN_ROOM_USER')"
+            (click)="onClickContextMenu('OPEN_ROOM_USER')"
+          >
             대화참여자목록
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('ADD_MEMBER')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('ADD_MEMBER')"
+            (click)="onClickContextMenu('ADD_MEMBER')"
+          >
             대화상대추가
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('ADD_GROUP')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('ADD_GROUP')"
+            (click)="onClickContextMenu('ADD_GROUP')"
+          >
             그룹멤버로추가
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('EDIT_ROOM')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('EDIT_ROOM')"
+            (click)="onClickContextMenu('EDIT_ROOM')"
+          >
             대화방설정
           </button>
-          <button mat-menu-item (click)="onClickContextMenu('CLOSE_ROOM')">
+          <button
+            mat-menu-item
+            *ngIf="getShowContextMenu('CLOSE_ROOM')"
+            (click)="onClickContextMenu('CLOSE_ROOM')"
+          >
             방닫기
           </button>
         </mat-menu>

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

@@ -331,6 +331,26 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
     }
   }
 
+  getShowContextMenu(menuType: string) {
+    if (
+      menuType === 'OPEN_ROOM_USER' ||
+      menuType === 'ADD_MEMBER' ||
+      menuType === 'ADD_GROUP' ||
+      menuType === 'EDIT_ROOM'
+    ) {
+      if (
+        this.roomInfo.roomType === RoomType.Mytalk ||
+        this.roomInfo.roomType === RoomType.Allim ||
+        this.roomInfo.roomType === RoomType.Bot ||
+        this.roomInfo.roomType === RoomType.Link
+      ) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
   readyToReply(): void {
     setTimeout(() => {
       this.focusReplyInput();

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html

@@ -1,4 +1,4 @@
-<div fxLayout="column"  class="album-box">
+<div fxLayout="column" class="album-box">
   <div>
     <mat-tab-group (selectedIndexChange)="onSelectedIndexChange($event)">
       <mat-tab label="Image"></mat-tab>
@@ -7,11 +7,20 @@
   </div>
   <div fxFlex="1 1 240px" class="select-filebox bg-accent-brightest">
     <!--<ng-container *ngIf="!selectedFile">-->
-      <ng-container *ngIf="!selectedFile">
+    <ng-container *ngIf="!selectedFile">
-        <!--이미지 빈화면-->
+      <!--이미지 빈화면-->
-      <div class="empty-msg">
+      <div class="empty-msg" *ngIf="currentTabIndex === 0">
-        <svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+        <svg
-          stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round">
+          xmlns="http://www.w3.org/2000/svg"
+          width="36"
+          height="36"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="1.5"
+          stroke-linecap="butt"
+          stroke-linejoin="round"
+        >
           <rect x="3" y="3" width="18" height="18" rx="2" />
           <circle cx="8.5" cy="8.5" r="1.5" />
           <path d="M20.4 14.5L16 10 4 20" />
@@ -19,9 +28,18 @@
         <span>Select File.</span>
       </div>
       <!--비디오 빈화면-->
-      <div class="empty-msg">
+      <div class="empty-msg" *ngIf="currentTabIndex === 1">
-        <svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 24 24" fill="none" stroke="currentColor"
+        <svg
-          stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round">
+          xmlns="http://www.w3.org/2000/svg"
+          width="36"
+          height="36"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="1.5"
+          stroke-linecap="butt"
+          stroke-linejoin="round"
+        >
           <rect x="2" y="2" width="20" height="20" rx="2.18" ry="2.18"></rect>
           <line x1="7" y1="2" x2="7" y2="22"></line>
           <line x1="17" y1="2" x2="17" y2="22"></line>
@@ -50,8 +68,11 @@
         </video>
       </div>
       <ul>
-        <li class="name"> {{ selectedFile.info.name }}</li>
+        <li class="name">{{ selectedFile.info.name }}</li>
-        <li><span class="text-accent-color">size :</span> {{ selectedFile.info.size | ucapBytes }}</li>
+        <li>
+          <span class="text-accent-color">size :</span>
+          {{ selectedFile.info.size | ucapBytes }}
+        </li>
         <li>
           <span class="text-accent-color">date :</span>
           {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }}