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.html

@@ -3,10 +3,14 @@
     <div class="current-head">
       <h3>그룹</h3>
       <div class="btn-box">
-        <button mat-icon-button >
+        <button mat-icon-button>
           <mat-icon>person_add</mat-icon>
         </button>
-        <button mat-icon-button [matMenuTriggerFor]="groupMenu" aria-label="group menu">
+        <button
+          mat-icon-button
+          [matMenuTriggerFor]="groupMenu"
+          aria-label="group menu"
+        >
           <mat-icon>more_vert</mat-icon>
         </button>
       </div>
@@ -84,7 +88,7 @@
       mat-menu-item
       (click)="onClickProfileContextMenu('REGISTER_FAVORITE', userInfo)"
     >
-      즐겨찾기 등록
+      즐겨찾기 {{ userInfo.isFavorit ? '해제' : '등록' }}
     </button>
     <button mat-menu-item (click)="onClickProfileContextMenu('CHAT', userInfo)">
       대화하기

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

@@ -1,16 +1,33 @@
 import { UserSelectDialogType } from './../../../../types/userselect.dialog.type';
-import {
+import { MatMenuTrigger } from '@angular/material';
-  CreateChatDialogComponent,
-  CreateChatDialogData,
-  CreateChatDialogResult
-} from './../../dialogs/chat/create-chat.dialog.component';
 import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 
 import { Observable, combineLatest, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
-
 import { Store, select } from '@ngrx/store';
 
+import * as AppStore from '@app/store';
+import * as ChatStore from '@app/store/messenger/chat';
+import * as QueryStore from '@app/store/messenger/query';
+import * as SyncStore from '@app/store/messenger/sync';
+
+import { NGXLogger } from 'ngx-logger';
+import { Company } from '@ucap-webmessenger/api-external';
+import { SessionStorageService } from '@ucap-webmessenger/web-storage';
+import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
+import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
+import { KEY_VER_INFO } from '@app/types/ver-info.type';
+import { ExpansionPanelComponent as GroupExpansionPanelComponent } from '@ucap-webmessenger/ui-group';
+
+import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
+import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync';
+import {
+  DeptSearchType,
+  UserInfoSS,
+  UserInfoF,
+  UserInfoDN
+} from '@ucap-webmessenger/protocol-query';
+
 import {
   ucapAnimations,
   DialogService,
@@ -18,48 +35,16 @@ import {
   ConfirmDialogComponent,
   ConfirmDialogResult
 } from '@ucap-webmessenger/ui';
-import { UserInfo, GroupDetailData } from '@ucap-webmessenger/protocol-sync';
-
-import * as AppStore from '@app/store';
-import * as ChatStore from '@app/store/messenger/chat';
-import * as QueryStore from '@app/store/messenger/query';
-import * as SyncStore from '@app/store/messenger/sync';
-import { NGXLogger } from 'ngx-logger';
-import { Company } from '@ucap-webmessenger/api-external';
-import { SessionStorageService } from '@ucap-webmessenger/web-storage';
-import { LoginInfo, KEY_LOGIN_INFO } from '@app/types';
-import { ExpansionPanelComponent as GroupExpansionPanelComponent } from '@ucap-webmessenger/ui-group';
 import {
-  CreateGroupDialogComponent,
+  CreateChatDialogComponent,
-  CreateGroupDialogData,
+  CreateChatDialogData,
-  CreateGroupDialogResult
+  CreateChatDialogResult
-} from '@app/layouts/messenger/dialogs/group/create-group.dialog.component';
+} from './../../dialogs/chat/create-chat.dialog.component';
-import { LoginResponse } from '@ucap-webmessenger/protocol-authentication';
-import {
-  DeptSearchType,
-  UserInfoSS,
-  UserInfoF,
-  UserInfoDN
-} from '@ucap-webmessenger/protocol-query';
-import { MatMenuTrigger } from '@angular/material';
-import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
-import { KEY_VER_INFO } from '@app/types/ver-info.type';
-import {
-  DeleteGroupDialogComponent,
-  DeleteGroupDialogData,
-  DeleteGroupDialogResult
-} from '@app/layouts/messenger/dialogs/group/delete-group.dialog.component';
-
 import {
   EditGroupDialogComponent,
   EditGroupDialogData,
   EditGroupDialogResult
 } from '@app/layouts/messenger/dialogs/group/edit-group.dialog.component';
-import {
-  EditGroupMemberDialogComponent,
-  EditGroupMemberDialogData,
-  EditGroupMemberDialogResult
-} from '@app/layouts/messenger/dialogs/group/edit-group-member.dialog.component';
 
 @Component({
   selector: 'app-layout-chat-left-sidenav-group',
@@ -251,10 +236,7 @@ export class GroupComponent implements OnInit, OnDestroy {
     );
   }
 
-  onClickProfileContextMenu(
+  onClickProfileContextMenu(menuType: string, userInfo: UserInfo | UserInfoF) {
-    menuType: string,
-    userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN
-  ) {
     this.logger.debug(
       'onClickProfileContextMenu',
       'menuType',
@@ -262,6 +244,16 @@ export class GroupComponent implements OnInit, OnDestroy {
       'userInfo',
       userInfo
     );
+    switch (menuType) {
+      case 'REGISTER_FAVORITE':
+        this.store.dispatch(
+          SyncStore.updateBuddy({
+            seq: userInfo.seq,
+            isFavorit: !userInfo.isFavorit
+          })
+        );
+        break;
+    }
   }
 
   onContextMenuProfile(

projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts

@@ -31,19 +31,21 @@ import {
   refreshRoom,
   refreshRoomFailure,
   refreshRoomSuccess,
-  createGroup,
-  createGroupSuccess,
-  createGroupFailure,
   createGroupAndBuddy,
   addBuddy,
   addBuddyFailure,
   delBuddy,
   delBuddyFailure,
+  delBuddySuccess,
+  updateBuddy,
+  updateBuddySuccess,
+  updateBuddyFailure,
+  createGroup,
+  createGroupSuccess,
+  createGroupFailure,
   updateGroup,
   updateGroupFailure,
   updateGroupMember,
-  updateBuddy,
-  delBuddySuccess,
   delGroup,
   delGroupFailure,
   delGroupSuccess
@@ -92,7 +94,8 @@ import {
 import {
   BuddyProtocolService,
   AddResponse as BuddyAddResponse,
-  DelResponse as BuddyDelResponse
+  DelResponse as BuddyDelResponse,
+  UpdateResponse as BuddyUpdateResponse
 } from '@ucap-webmessenger/protocol-buddy';
 
 import * as ChatStore from '@app/store/messenger/chat';
@@ -682,6 +685,20 @@ export class Effects {
     )
   );
 
+  updateBuddy$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(updateBuddy),
+      exhaustMap(req =>
+        this.buddyProtocolService.update(req).pipe(
+          map((res: BuddyUpdateResponse) => {
+            return updateBuddySuccess(res);
+          }),
+          catchError(error => of(updateBuddyFailure({ error })))
+        )
+      )
+    )
+  );
+
   updateGroup$ = createEffect(() =>
     this.actions$.pipe(
       ofType(updateGroup),

projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts

@@ -17,17 +17,20 @@ import {
   createGroupSuccess,
   addBuddySuccess,
   delBuddySuccess,
-  delGroupSuccess
+  delGroupSuccess,
+  updateBuddySuccess
 } from './actions';
 import {
   RoomUserDetailData,
   RoomUserData,
-  GroupDetailData
+  GroupDetailData,
+  UserInfo
 } from '@ucap-webmessenger/protocol-sync';
 
 import * as AuthenticationStore from '@app/store/account/authentication';
 import * as RoomStore from '@app/store/messenger/room';
 import { RoomInfo } from '@ucap-webmessenger/protocol-room';
+import { UpdateResponse } from '@ucap-webmessenger/protocol-buddy';
 
 export const reducer = createReducer(
   initialState,
@@ -222,5 +225,17 @@ export const reducer = createReducer(
         ...state.buddy2
       })
     };
+  }),
+
+  on(updateBuddySuccess, (state, action) => {
+    const userInfo: UserInfo = {
+      ...state.buddy2.entities[action.seq],
+      isFavorit: action.isFavorit
+    };
+
+    return {
+      ...state,
+      buddy2: adapterBuddy2.upsertOne(userInfo, { ...state.buddy2 })
+    };
   })
 );

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.html

@@ -1,6 +1,5 @@
 <div class="date-split">
   <span class="line"></span>
-  <!-- {{ message.sendDate | date: 'short' }} -->
+  <span class="date">{{ dateInfo }}</span>
-  <span class="date">{{ dateInfo }}2019.10.3</span>
   <span class="line"></span>
 </div>

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/date-splitter.component.ts

@@ -18,7 +18,7 @@ export class DateSplitterComponent implements OnInit {
   ngOnInit() {
     this.dateInfo = this.datePipe.transform(
       this.message.sendDate,
-      'yyyy-MM-dd EEE'
+      'yyyy.MM.dd EEE'
     );
   }
 }

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/information.component.html

@@ -1,3 +1,3 @@
-<p>
+<div>
   {{ contents }}
-</p>
+</div>

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.html

@@ -1,12 +1,11 @@
 <div class="bubble-main">
-  <span>
+  <span class="content">
     {{ content }}
   </span>
   <span>
     {{ message.sendDate | date: 'short' }}
   </span>
 </div>
-  {{detailButteonShow}}
 <div *ngIf="detailButteonShow" class="btn-box">
-    <button mat-button (click)="onClickDetailView()">Detail View</button>
+  <button mat-button (click)="onClickDetailView()">Detail View</button>
 </div>

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/mass.component.scss

@@ -1,6 +1,12 @@
+@charset 'utf-8';
+@import '../../../../ucap-webmessenger-app/src/assets/scss/global/common.scss';
 .bubble-main {
   padding: 14px;
   text-align: left;
+  .content {
+    max-width: 250px;
+    @include ellipsis(1);
+  }
 }
 
 .btn-box {

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

@@ -1,8 +1,5 @@
 <div class="chat-messages">
   <!-- MESSAGE -->
-  <ucap-chat-message-box-date-splitter *ngIf="getDateSplitter(i)" [message]="message">
-  </ucap-chat-message-box-date-splitter>
-
   <div
     *ngFor="let message of messages; let i = index"
     class="message-row"
@@ -11,6 +8,13 @@
       contact: message.senderSeq !== loginRes.userSeq
     }"
   >
+    <div>
+      <ucap-chat-message-box-date-splitter
+        *ngIf="getDateSplitter(i)"
+        [message]="message"
+      >
+      </ucap-chat-message-box-date-splitter>
+    </div>
 
     <div
       *ngIf="getIsInformation(message); then information; else contents"
@@ -46,7 +50,7 @@
     </ng-template>
     <ng-template #contents>
       <div *ngIf="getUserProfile(message.senderSeq) != ''" class="profile-img">
-            <!-- <img
+        <!-- <img
               class="avatar"
               style="width: 50px; height: 50px;"
               [src]="
@@ -59,71 +63,71 @@
                   | async
               "
             /> -->
-            <ucap-ui-imaage
+        <ucap-ui-imaage
-              [style]="'width: 50px; height: 50px;'"
+          [style]="'width: 50px; height: 50px;'"
-              [imageClass]="'avatar'"
+          [imageClass]="'avatar'"
-              [base]="profileImageRoot"
+          [base]="profileImageRoot"
-              [path]="getUserProfile(message.senderSeq)"
+          [path]="getUserProfile(message.senderSeq)"
-              [default]="'assets/images/img_nophoto_50.png'"
+          [default]="'assets/images/img_nophoto_50.png'"
-            ></ucap-ui-imaage>
+        ></ucap-ui-imaage>
       </div>
 
       <div class="message-main">
         <div class="chat-name">
-            {{ getUserName(message.senderSeq) }}
+          {{ getUserName(message.senderSeq) }}
         </div>
 
-      <div class="bubble">
+        <div class="bubble">
-        <ng-container
+          <ng-container
-          class="bubble"
+            class="bubble"
-          *ngIf="message.type !== EventType.NotificationForTimerRoom"
+            *ngIf="message.type !== EventType.NotificationForTimerRoom"
-          [ngSwitch]="message.type"
+            [ngSwitch]="message.type"
-        >
-          <ucap-chat-message-box-mass
-            *ngSwitchCase="EventType.MassText"
-            [message]="message"
-            (massDetail)="onMassDetail($event)"
           >
-          </ucap-chat-message-box-mass>
+            <ucap-chat-message-box-mass
-          <ucap-chat-message-box-file
+              *ngSwitchCase="EventType.MassText"
-            *ngSwitchCase="EventType.File"
+              [message]="message"
-            [message]="message"
+              (massDetail)="onMassDetail($event)"
-            (save)="onSave($event)"
+            >
-            (imageViewer)="onImageViewer($event)"
+            </ucap-chat-message-box-mass>
-          >
+            <ucap-chat-message-box-file
-          </ucap-chat-message-box-file>
+              *ngSwitchCase="EventType.File"
-          <ucap-chat-message-box-sticker
+              [message]="message"
-            *ngSwitchCase="EventType.Sticker"
+              (save)="onSave($event)"
-            [message]="message"
+              (imageViewer)="onImageViewer($event)"
-          >
+            >
-          </ucap-chat-message-box-sticker>
+            </ucap-chat-message-box-file>
-          <ucap-chat-message-box-recall
+            <ucap-chat-message-box-sticker
-            *ngSwitchCase="EventType.RecalledMessage"
+              *ngSwitchCase="EventType.Sticker"
-          ></ucap-chat-message-box-recall>
+              [message]="message"
-          <ucap-chat-message-box-text
+            >
-            *ngSwitchCase="EventType.Character"
+            </ucap-chat-message-box-sticker>
-            [message]="message"
+            <ucap-chat-message-box-recall
-            (contextmenu)="onContextMenuMessage($event, message)"
+              *ngSwitchCase="EventType.RecalledMessage"
-          >
+            ></ucap-chat-message-box-recall>
-          </ucap-chat-message-box-text>
+            <ucap-chat-message-box-text
-          <div *ngSwitchDefault>
+              *ngSwitchCase="EventType.Character"
-            mass-translation
+              [message]="message"
-            <ucap-chat-message-box-mass-translation></ucap-chat-message-box-mass-translation>
+              (contextmenu)="onContextMenuMessage($event, message)"
-            notice
+            >
-            <ucap-chat-message-box-notice></ucap-chat-message-box-notice>
+            </ucap-chat-message-box-text>
-            <ucap-chat-message-box-schedule></ucap-chat-message-box-schedule>
+            <div *ngSwitchDefault>
-            translation
+              mass-translation
-            <ucap-chat-message-box-translation></ucap-chat-message-box-translation>
+              <ucap-chat-message-box-mass-translation></ucap-chat-message-box-mass-translation>
-            video-conference
+              notice
-            <ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
+              <ucap-chat-message-box-notice></ucap-chat-message-box-notice>
+              <ucap-chat-message-box-schedule></ucap-chat-message-box-schedule>
+              translation
+              <ucap-chat-message-box-translation></ucap-chat-message-box-translation>
+              video-conference
+              <ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
 
-            <div class="message">
+              <div class="message">
-              {{ message.sentMessage }}
+                {{ message.sentMessage }}
+              </div>
             </div>
-          </div>
+          </ng-container>
-        </ng-container>
+        </div>
       </div>
-    </div>
 
       <div class="time secondary-text">
         {{ message.sendDate | date: 'a hh:mm' }}