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

@@ -5,7 +5,7 @@
       <mat-icon>chat</mat-icon>
     </button>
   </div>
-  <mat-tab-group mat-stretch-tabs>
+  <mat-tab-group mat-stretch-tabs animationDuration="0ms">
     <mat-tab>
       <ng-template mat-tab-label>
         <mat-icon>group</mat-icon>
@@ -14,8 +14,14 @@
     </mat-tab>
     <mat-tab>
       <ng-template mat-tab-label>
-        <mat-icon [matBadgeHidden]="((badgeChatUnReadCount$ | async) <= 0)" [matBadge]="badgeChatUnReadCount$ | async"
+        <mat-icon
-          matBadgeDescription="확인하지 않은 메시지가 있습니다." matBadgeColor="accent" matBadgePosition="above after">chat</mat-icon>
+          [matBadgeHidden]="(badgeChatUnReadCount$ | async) <= 0"
+          [matBadge]="badgeChatUnReadCount$ | async"
+          matBadgeDescription="확인하지 않은 메시지가 있습니다."
+          matBadgeColor="accent"
+          matBadgePosition="above after"
+          >chat</mat-icon
+        >
       </ng-template>
       <app-layout-chat-left-sidenav-chat></app-layout-chat-left-sidenav-chat>
     </mat-tab>

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

@@ -82,9 +82,7 @@ export class GroupComponent implements OnInit, OnDestroy {
   loginRes: LoginResponse;
   loginResSubscription: Subscription;
 
-  sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
+  sessionVerinfo: VersionInfo2Response;
-    KEY_VER_INFO
-  );
 
   constructor(
     private store: Store<any>,
@@ -94,6 +92,9 @@ export class GroupComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
+    this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
+      KEY_VER_INFO
+    );
     const loginInfo = this.sessionStorageService.get<LoginInfo>(KEY_LOGIN_INFO);
     this.companyCode = loginInfo.companyCode;
 
@@ -148,6 +149,7 @@ export class GroupComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.logger.debug('ngOnDestroy');
     if (!!this.loginResSubscription) {
       this.loginResSubscription.unsubscribe();
     }

projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html

@@ -1,51 +1,57 @@
-<mat-accordion #groupAccordion="matAccordion" [multi]="true">
+<mat-accordion
-  <mat-expansion-panel *ngIf="favoritBuddyList.length > 0 && !checkable" [togglePosition]="'before'">
+  #groupAccordion="matAccordion"
+  [multi]="true"
+  [displayMode]="'flat'"
+>
+  <mat-expansion-panel
+    *ngIf="favoritBuddyList.length > 0 && !checkable"
+    [togglePosition]="'before'"
+  >
     <mat-expansion-panel-header>
       <mat-panel-title> 즐겨찾기 </mat-panel-title>
       <mat-panel-description> </mat-panel-description>
     </mat-expansion-panel-header>
 
     <ng-container *ngFor="let favUserList of favoritBuddyList">
-      <ng-template [ngTemplateOutlet]="expansionPanelItemTemplateRef"
+      <ng-template
-        [ngTemplateOutletContext]="{ $implicit: favUserList }">
+        [ngTemplateOutlet]="expansionPanelItemTemplateRef"
+        [ngTemplateOutletContext]="{ $implicit: favUserList }"
+      >
       </ng-template>
     </ng-container>
-
-    <!-- <ucap-profile-user-list-item
-      *ngFor="let favUserList of favoritBuddyList"
-      [userInfo]="favUserList"
-      (click)="onClickBuddy(favUserList)"
-    >
-    </ucap-profile-user-list-item> -->
   </mat-expansion-panel>
 
-  <mat-expansion-panel *ngFor="let groupBuddy of groupBuddyList" [togglePosition]="'before'">
+  <mat-expansion-panel
+    *ngFor="let groupBuddy of groupBuddyList"
+    [togglePosition]="'before'"
+  >
     <mat-expansion-panel-header>
       <mat-panel-title> {{ groupBuddy.group.name }} </mat-panel-title>
       <mat-panel-description>
         <span class="more-spacer"></span>
-        <button mat-icon-button aria-label="group menu" *ngIf="!checkable"
+        <button
-          (click)="onClickMore($event, groupBuddy.group)">
+          mat-icon-button
+          aria-label="group menu"
+          *ngIf="!checkable"
+          (click)="onClickMore($event, groupBuddy.group)"
+        >
           <mat-icon>more_vert</mat-icon>
         </button>
-        <mat-checkbox *ngIf="checkable" #checkbox [checked]="getCheckedGroup(groupBuddy)"
+        <mat-checkbox
-          (change)="onChangeCheck(checkbox.checked, groupBuddy)" (click)="$event.stopPropagation()"></mat-checkbox>
+          *ngIf="checkable"
+          #checkbox
+          [checked]="getCheckedGroup(groupBuddy)"
+          (change)="onChangeCheck(checkbox.checked, groupBuddy)"
+          (click)="$event.stopPropagation()"
+        ></mat-checkbox>
       </mat-panel-description>
     </mat-expansion-panel-header>
 
     <ng-container *ngFor="let userInfo of groupBuddy.buddyList">
-      <ng-template [ngTemplateOutlet]="expansionPanelItemTemplateRef"
+      <ng-template
-        [ngTemplateOutletContext]="{ $implicit: userInfo }"></ng-template>
+        [ngTemplateOutlet]="expansionPanelItemTemplateRef"
+        [ngTemplateOutletContext]="{ $implicit: userInfo }"
+      ></ng-template>
     </ng-container>
-
-    <!-- <ucap-profile-user-list-item
-      *ngFor="let userInfo of groupBuddy.buddyList"
-      [userInfo]="userInfo"
-      (click)="onClickBuddy(userInfo)"
-    >
-    </ucap-profile-user-list-item> -->
-    <!-- <ucap-profile-user-list-item *ngFor="let userInfo of groupBuddy.buddyList" [userInfo]="userInfo"
-      [presence]="presence">
-    </ucap-profile-user-list-item> -->
   </mat-expansion-panel>
 </mat-accordion>

projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html

@@ -4,8 +4,8 @@
   <span
     class="presence"
     [ngClass]="getPresence(PresenceType.PC)"
-    *ngIf="userPresence && userPresence.pcStatus"
+    *ngIf="presence && presence.pcStatus"
-    >{{ userPresence.pcStatus }}
+    >{{ presence.pcStatus }}
   </span>
   <dl class="item-default">
     <dt>

projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts

@@ -37,9 +37,7 @@ export class UserListItemComponent implements OnInit, OnDestroy {
   @Input()
   profileImageRoot?: string;
   @Input()
-  set presence(value: StatusBulkInfo | StatusInfo) {
+  presence: StatusBulkInfo | StatusInfo;
-    this.userPresence = value;
-  }
   @Input()
   checkable = false;
   @Input()
@@ -58,7 +56,6 @@ export class UserListItemComponent implements OnInit, OnDestroy {
     userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN;
   }>();
 
-  userPresence: StatusBulkInfo | StatusInfo;
   PresenceType = PresenceType;
 
   // private profileImageRootSubscription: Subscription;
@@ -94,7 +91,7 @@ export class UserListItemComponent implements OnInit, OnDestroy {
     let rtnClass = '';
     switch (type) {
       case 'pc':
-        status = this.userPresence.pcStatus;
+        status = this.presence.pcStatus;
         break;
     }
 

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

@@ -8,10 +8,10 @@ import { ucapAnimations } from '../animations';
   selector: 'ucap-ui-imaage',
   template: `
     <img
+      #imageElement
       [src]="imageSrc"
       [style]="baseStyle"
       [ngClass]="classList"
-      [@fadeInOut]
     />
   `,
   styles: [],