새그룹 추가시 빈그룹으로 생성할 수 있도록 수정,
그룹 생성시 confirm 하도록 수정.
This commit is contained in:
parent
5fa57c7130
commit
81397401b9
|
@ -28,14 +28,6 @@
|
||||||
</mat-tab>
|
</mat-tab>
|
||||||
<mat-tab [aria-label]="MainMenu.Chat">
|
<mat-tab [aria-label]="MainMenu.Chat">
|
||||||
<ng-template mat-tab-label>
|
<ng-template mat-tab-label>
|
||||||
<!--<mat-icon
|
|
||||||
[matBadgeHidden]="(badgeChatUnReadCount$ | async) <= 0"
|
|
||||||
[matBadge]="badgeChatUnReadCount$ | async"
|
|
||||||
matBadgeDescription="확인하지 않은 메시지가 있습니다."
|
|
||||||
matBadgeColor="accent"
|
|
||||||
matBadgePosition="above after"
|
|
||||||
>chat</mat-icon
|
|
||||||
>-->
|
|
||||||
<div
|
<div
|
||||||
class="icon-item"
|
class="icon-item"
|
||||||
[matBadgeHidden]="badgeChatUnReadCount <= 0"
|
[matBadgeHidden]="badgeChatUnReadCount <= 0"
|
||||||
|
|
|
@ -136,7 +136,7 @@ export class LeftSideComponent implements OnInit, OnDestroy {
|
||||||
if (!!result && !!result.choice && result.choice) {
|
if (!!result && !!result.choice && result.choice) {
|
||||||
if (
|
if (
|
||||||
!!result.selectedUserList &&
|
!!result.selectedUserList &&
|
||||||
result.selectedUserList.length > 0 &&
|
// result.selectedUserList.length > 0 &&
|
||||||
result.groupName.trim().length > 0
|
result.groupName.trim().length > 0
|
||||||
) {
|
) {
|
||||||
const userSeqs: number[] = [];
|
const userSeqs: number[] = [];
|
||||||
|
|
|
@ -48,6 +48,12 @@ import {
|
||||||
UserInfoShort,
|
UserInfoShort,
|
||||||
UserInfo as RoomUserInfo
|
UserInfo as RoomUserInfo
|
||||||
} from '@ucap-webmessenger/protocol-room';
|
} from '@ucap-webmessenger/protocol-room';
|
||||||
|
import {
|
||||||
|
ConfirmDialogComponent,
|
||||||
|
ConfirmDialogResult,
|
||||||
|
ConfirmDialogData,
|
||||||
|
DialogService
|
||||||
|
} from '@ucap-webmessenger/ui';
|
||||||
|
|
||||||
export interface CreateChatDialogData {
|
export interface CreateChatDialogData {
|
||||||
type?: string;
|
type?: string;
|
||||||
|
@ -96,7 +102,8 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
|
||||||
private sessionStorageService: SessionStorageService,
|
private sessionStorageService: SessionStorageService,
|
||||||
private queryProtocolService: QueryProtocolService,
|
private queryProtocolService: QueryProtocolService,
|
||||||
private formBuilder: FormBuilder,
|
private formBuilder: FormBuilder,
|
||||||
private logger: NGXLogger
|
private logger: NGXLogger,
|
||||||
|
private dialogService: DialogService
|
||||||
) {
|
) {
|
||||||
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
|
this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
|
||||||
KEY_VER_INFO
|
KEY_VER_INFO
|
||||||
|
@ -474,7 +481,32 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 팝업의 선택 이벤트 전달. */
|
/** 팝업의 선택 이벤트 전달. */
|
||||||
onClickChoice(choice: boolean): void {
|
async onClickChoice(choice: boolean): Promise<void> {
|
||||||
|
if (this.data.type === UserSelectDialogType.NewGroup) {
|
||||||
|
let cfmMsg = `새로운 그룹을 추가하시겠습니까?`;
|
||||||
|
if (this.selectedUserList.length === 0) {
|
||||||
|
cfmMsg += `<br/>빈 그룹으로 생성됩니다.`;
|
||||||
|
}
|
||||||
|
const result = await this.dialogService.open<
|
||||||
|
ConfirmDialogComponent,
|
||||||
|
ConfirmDialogData,
|
||||||
|
ConfirmDialogResult
|
||||||
|
>(ConfirmDialogComponent, {
|
||||||
|
width: '400px',
|
||||||
|
data: {
|
||||||
|
title: 'Delete',
|
||||||
|
html: cfmMsg
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!!result && !!result.choice && result.choice) {
|
||||||
|
this.doAction(choice);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.doAction(choice);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
doAction(choice: boolean) {
|
||||||
this.dialogRef.close({
|
this.dialogRef.close({
|
||||||
choice,
|
choice,
|
||||||
selectedUserList: this.selectedUserList,
|
selectedUserList: this.selectedUserList,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user