From 4f8695e5a378b95b88cf2493c33f28864cef1eae Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Tue, 7 Jan 2020 16:17:27 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=2049?=
 =?UTF-8?q?=20=EB=8C=80=ED=99=94=EB=B0=A9=EC=9D=B4=EB=A6=84=20=EB=B9=88?=
 =?UTF-8?q?=EC=B9=B8=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95=20=EC=8B=9C=20?=
 =?UTF-8?q?=EC=88=AB=EC=9E=90=EB=A1=9C=20=EB=B3=B4=EC=97=AC=EC=A7=90=20::?=
 =?UTF-8?q?=20=EC=95=84=EC=98=88=20=EB=B9=88=EA=B0=92=EC=9D=B4=EB=A9=B4=20?=
 =?UTF-8?q?=EC=A0=80=EB=A0=87=EA=B2=8C=20=EB=90=98=EA=B3=A0,=20'=20'?=
 =?UTF-8?q?=EB=B9=88=EC=B9=B8=20=ED=95=98=EB=82=98=EB=A5=BC=20=EB=84=A3?=
 =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=EB=8D=B0=20=EC=9D=B4=EB=A5=BC=20=ED=95=84=EC=88=98?=
 =?UTF-8?q?=EC=9E=85=EB=A0=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=ED=95=98=EC=97=AC=20=EC=B2=98=EB=A6=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

83 빈칸 입력 후 그룹 추가 시 추가되지 않음 :: 필수입력으로 처리 및 빈문자열 유효성 검사
---
 .../right-drawer/album-box.component.html     |  5 ++--
 .../chat/create-chat.dialog.component.ts      | 23 +++++++++++++++++--
 .../chat/edit-chat-room.dialog.component.html |  7 +++++-
 .../chat/edit-chat-room.dialog.component.ts   |  7 ++++--
 .../group/select-group.dialog.component.html  |  2 +-
 .../lib/dialogs/alert.dialog.component.html   |  2 +-
 6 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html
index 33f4e6ad..45ddc55a 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html
@@ -66,10 +66,9 @@
         <video
           controls
           *ngIf="selectedFile.info.type === FileType.Video"
+          [src]="getImageUrl(selectedFile)"
           class="preview-video"
-        >
-          <source [src]="getImageUrl(selectedFile)" />
-        </video>
+        ></video>
       </div>
       <ul>
         <li class="name">{{ selectedFile.info.name }}</li>
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts
index bda43023..2530bcf8 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts
@@ -52,7 +52,10 @@ import {
   ConfirmDialogComponent,
   ConfirmDialogResult,
   ConfirmDialogData,
-  DialogService
+  DialogService,
+  AlertDialogComponent,
+  AlertDialogResult,
+  AlertDialogData
 } from '@ucap-webmessenger/ui';
 
 export interface CreateChatDialogData {
@@ -619,6 +622,22 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
         return;
       }
 
+      if (this.inputForm.get('groupName').value.trim().length === 0) {
+        this.dialogService.open<
+          AlertDialogComponent,
+          AlertDialogData,
+          AlertDialogResult
+        >(AlertDialogComponent, {
+          data: {
+            title: '',
+            html: `그룹명은 필수입력입니다.`
+          }
+        });
+
+        this.inputForm.setValue({ groupName: '' });
+        return;
+      }
+
       let cfmMsg = `새로운 그룹을 추가하시겠습니까?`;
       if (this.selectedUserList.length === 0) {
         cfmMsg += `<br/>빈 그룹으로 생성됩니다.`;
@@ -649,7 +668,7 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
       selectedRoom: this.selectedRoom,
       groupName:
         this.data.type === UserSelectDialogType.NewGroup
-          ? this.inputForm.get('groupName').value
+          ? this.inputForm.get('groupName').value.trim()
           : '',
       oldGroup:
         this.data.type === UserSelectDialogType.EditMember
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
index 5b3325d3..e2904400 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
@@ -47,7 +47,12 @@
     >
       No
     </button>
-    <button mat-flat-button (click)="onClickChoice(true)" class="mat-primary">
+    <button
+      mat-flat-button
+      [disabled]="inputForm.invalid"
+      (click)="onClickChoice(true)"
+      class="mat-primary"
+    >
       Yes
     </button>
   </mat-card-actions>
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts
index dd29bec1..8ff84817 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.ts
@@ -1,6 +1,6 @@
 import { RoomInfo } from '@ucap-webmessenger/protocol-room';
 import { Component, OnInit, Inject } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 
 export interface EditChatRoomDialogData {
@@ -50,7 +50,10 @@ export class EditChatRoomDialogComponent implements OnInit {
 
   ngOnInit(): void {
     this.inputForm = this.formBuilder.group({
-      roomName: [this.data.roomInfo.roomName],
+      roomName: [
+        this.data.roomInfo.roomName,
+        !this.data.roomInfo.isTimeRoom ? [Validators.required] : []
+      ],
       changeTarget: ['me'],
       timerInterval: [this.data.roomInfo.timeRoomInterval]
     });
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
index 2452d9d9..91def65e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
@@ -11,7 +11,7 @@
         class="mat-mini-fab mat-button-base mat-accent mat-elevation-z"
       >
         <mat-icon>add</mat-icon>
-        <span class="mat-fab__label">새 그룹 추가</span>
+        <span class="mat-fab__label">{{ 'group.addNew' | translate }}</span>
       </button>
       <div *ngIf="isShowAddGroupField" class="input-groupname-box">
         <mat-form-field hintLabel="특수문자는 '-,_'만 사용할 수 있습니다.">
diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html
index 37e8206f..c4bd857f 100644
--- a/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html
+++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/alert.dialog.component.html
@@ -1,5 +1,5 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header>
+  <mat-card-header *ngIf="data.title">
     <mat-card-title>{{ data.title }}</mat-card-title>
     <!-- <mat-card-subtitle>Confirm</mat-card-subtitle> -->
   </mat-card-header>