Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

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

@@ -61,6 +61,7 @@ import {
 } from '../../dialogs/message/message-write.dialog.component';
 import { UserInfo } from '@ucap-webmessenger/protocol-sync';
 import { EmployeeType } from '@ucap-webmessenger/protocol-room';
+import { map } from 'rxjs/operators';
 
 export interface MessageTypeData {
   displayName: string;
@@ -142,19 +143,39 @@ export class MessageBoxComponent
     });
 
     this.messageRetrieveList$ = this.store.pipe(
-      select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList)
+      select(AppStore.MessengerSelector.MessageSelector.selectAllReceiveList),
+      map(list =>
+        list.sort((a, b) =>
+          a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0
+        )
+      )
     );
 
     this.messageSendList$ = this.store.pipe(
-      select(AppStore.MessengerSelector.MessageSelector.selectAllSendList)
+      select(AppStore.MessengerSelector.MessageSelector.selectAllSendList),
+      map(list =>
+        list.sort((a, b) =>
+          a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0
+        )
+      )
     );
     this.messageReservationList$ = this.store.pipe(
       select(
         AppStore.MessengerSelector.MessageSelector.selectAllReservationList
+      ),
+      map(list =>
+        list.sort((a, b) =>
+          a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0
+        )
       )
     );
     this.messageSearchList$ = this.store.pipe(
-      select(AppStore.MessengerSelector.MessageSelector.selectAllSearchList)
+      select(AppStore.MessengerSelector.MessageSelector.selectAllSearchList),
+      map(list =>
+        list.sort((a, b) =>
+          a.regDate > b.regDate ? -1 : a.regDate < b.regDate ? 1 : 0
+        )
+      )
     );
 
     this.messageDetailInfo = this.store

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ 'accounts.changePassword' | translate }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'accounts.changePassword' | translate }}</mat-card-title
+    >
   </mat-card-header>
   <mat-card-content>
     <div fxFlex class="setting-tab">

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ 'settings.label' | translate }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'settings.label' | translate }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z dialog-creat-chat">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
       <i class="mdi mdi-window-close"></i>
     </button>
@@ -63,7 +68,7 @@
                 <i class="mid mid-24 mdi-account-multiple"></i>
               </button>
             </ng-template>
-            <div class="mat-tab-frame">
+            <div class="mat-tab-frame dialog-tab-grouplist">
               <div>
                 <ucap-organization-tenant-search
                   [companyList]="companyList$ | async"
@@ -76,7 +81,7 @@
               </div>
               <div
                 [style.display]="isShowSearch ? 'none' : 'block'"
-                class="list-panel"
+                class="group"
               >
                 <ucap-group-expansion-panel
                   #groupExpansionPanel
@@ -98,7 +103,7 @@
                     [checkDisabled]="!getCheckableUser(userInfo)"
                     (checkUser)="onCheckUser($event)"
                     (click)="onToggleUser(userInfo)"
-                    class="list-item-frame"
+                    class="group-list-item"
                   >
                   </ucap-profile-user-list-item>
                 </ucap-group-expansion-panel>
@@ -149,7 +154,7 @@
                 <i class="mid mid-24 mdi-file-tree"></i>
               </button>
             </ng-template>
-            <div>
+            <div class="dialog-tab-orglist">
               <app-layout-chat-left-sidenav-organization
                 [showTitle]="false"
                 [selectedUserList]="selectedUserList"
@@ -159,7 +164,7 @@
                 (checkAllUser)="onCheckAllUser($event)"
                 (checkUser)="onCheckUser($event)"
                 (toggleUser)="onToggleUser($event)"
-                class="dialog-org"
+                class="oraganization"
               >
               </app-layout-chat-left-sidenav-organization>
             </div>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss

@@ -1,7 +1,5 @@
-.mat-card-header {
+.dialog-creat-chat {
-  .mat-card-header-text {
+  & > .mat-card-header {
-    margin: 0;
-  }
     .btn-dialog-close {
       font-size: 20px;
       display: flex;
@@ -10,19 +8,40 @@
       color: #444444;
     }
   }
-
-//조직도 레이아웃 변경
-::ng-deep .dialog-org {
-  .ps__rail-y {
-    left: auto !important;
 }
 
-  .oraganization-tab {
+.dialog-tab-grouplist {
+  height: 380px;
+  width: 100%;
+  .group {
+    width: 100%;
+    height: calc(100% - 50px);
+    &-expansion {
+      .list-item {
+        height: 60px;
+      }
+    }
+    &-list-item {
+      width: 100%;
+    }
+  }
+}
+
+::ng-deep .dialog-tab-orglist {
   width: 100%;
   height: 380px;
   border-bottom: 1px solid #dddddd;
   position: relative;
-    .oraganization-tab-tree {
+  .oraganization {
+    .ps__rail-y {
+      left: auto !important;
+    }
+    &-tab {
+      width: 100%;
+      height: 380px;
+      border-bottom: 1px solid #dddddd;
+      position: relative;
+      &-tree {
         display: inline-flex;
         width: 50%;
         height: 100% !important;
@@ -46,6 +65,7 @@
       }
     }
   }
+}
 
 .list-chip {
   height: 100px;
@@ -82,7 +102,7 @@
   }
 }
 
-::ng-deep .mat-dialog-container {
+/*::ng-deep .mat-dialog-container {
   .mat-tab-body-wrapper {
     height: 380px;
     width: 100%;
@@ -123,3 +143,4 @@
   width: 100%;
   height: 100%;
 }
+*/

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
   <mat-card-header>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickConfirm()">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html

@@ -1,6 +1,10 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
       <ng-container [ngSwitch]="messageInfo.type">
         <span *ngSwitchCase="MessageType.Receive">{{
           'message.type.messageTypeReceiving' | translate

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html

@@ -1,6 +1,10 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
       {{ (isModify ? 'message.modify' : 'message.sendTo') | translate }}
     </mat-card-title>
     <button class="icon-button btn-dialog-close" (click)="onCancel()">

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
   <mat-card-header>
-    <mat-card-title class="title">
+    <mat-card-title
+      class="card-header title"
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
       <span *ngIf="data.notice.topYn">
         [{{ 'notice.important' | translate }}]
       </span>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z  selected-user-dialog">
   <mat-card-header>
-    <mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      class="card-header"
+    >
       {{ data.title }}
       <span class="count text-accent-dark">
         {{ selectedUserList.length }} / {{ data.selectedUserList.length }}
@@ -34,6 +39,7 @@
         <ucap-profile-user-list-item
           *cdkVirtualFor="let userInfo of data.selectedUserList"
           [userInfo]="userInfo"
+          [showPresence]="false"
           [sessionVerinfo]="sessionVerinfo"
           [selectedUserList]="selectedUserList"
           [checkable]="userInfo.seq !== loginRes.userSeq"

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html

@@ -1,11 +1,12 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header
+  <mat-card-header>
+    <mat-card-title
       cdkDrag
       cdkDragRootElement=".cdk-overlay-pane"
       cdkDragHandle
       class="card-header"
+      >{{ 'search.label' | translate }}</mat-card-title
     >
-    <mat-card-title>{{ 'search.label' | translate }}</mat-card-title>
     <button class="icon-button btn-dialog-close" (click)="onCancel()">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html

@@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
+  <mat-card-header>
-    <mat-card-title>{{ 'settings.label' | translate }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'settings.label' | translate }}</mat-card-title
+    >
     <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
       <i class="mdi mdi-window-close"></i>
     </button>

projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html

@@ -4,7 +4,7 @@
   </div>
 
   <mat-drawer-container class="contents" autosize>
-    <mat-drawer #leftSideDrawer mode="side" opened>
+    <mat-drawer #leftSideDrawer mode="side" [disableClose]="true" opened>
       <app-layout-messenger-left-side
         #leftSideContainer
         (openProfile)="onClickOpenProfile($event)"

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

@@ -26,7 +26,7 @@ import { NGXLogger } from 'ngx-logger';
 import moment from 'moment';
 
 import { FileUtil } from '@ucap-webmessenger/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import {
   ContentType,
   CategoryType,
@@ -127,7 +127,7 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {
 
   ngOnInit() {
     this.messageWriteForm = this.formBuilder.group({
-      title: ['', []]
+      title: ['', [Validators.required]]
     });
 
     if (this.isModify) {