ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# 이슈처리 234

Browse Source
This commit is contained in:
leejinho 2020-02-19 10:26:12 +09:00
parent 53e7d5026a
commit cb121b3612
2 changed files with 107 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,8 @@ import {
ViewChild, ViewChild,
OnDestroy, OnDestroy,
EventEmitter, EventEmitter,
Output Output,
NgZone
} from '@angular/core'; } from '@angular/core';
import { import {
@ -138,7 +139,8 @@ export class GroupComponent implements OnInit, OnDestroy {
private dialogService: DialogService, private dialogService: DialogService,
private queryProtocolService: QueryProtocolService, private queryProtocolService: QueryProtocolService,
private translateService: TranslateService, private translateService: TranslateService,
private logger: NGXLogger private logger: NGXLogger,
private ngZone: NgZone
) { ) {
this.environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>( this.environmentsInfo = this.sessionStorageService.get<EnvironmentsInfo>(
KEY_ENVIRONMENTS_INFO KEY_ENVIRONMENTS_INFO
@ -689,6 +691,7 @@ export class GroupComponent implements OnInit, OnDestroy {
break; break;
case 'SEND_MESSAGE': case 'SEND_MESSAGE':
{ {
this.ngZone.run(() => {
let receiverList: UserInfo[] = []; let receiverList: UserInfo[] = [];
const isFavGroup = const isFavGroup =
group.seq < 0 && group.name === 'Favorit' ? true : false; group.seq < 0 && group.name === 'Favorit' ? true : false;
@ -721,10 +724,12 @@ export class GroupComponent implements OnInit, OnDestroy {
} }
}); });
} }
});
} }
break; break;
case 'RENAME': case 'RENAME':
{ {
this.ngZone.run(async () => {
const result = await this.dialogService.open< const result = await this.dialogService.open<
EditGroupDialogComponent, EditGroupDialogComponent,
EditGroupDialogData, EditGroupDialogData,
@ -747,10 +752,12 @@ export class GroupComponent implements OnInit, OnDestroy {
); );
} }
} }
});
} }
break; break;
case 'EDIT_MEMBER': case 'EDIT_MEMBER':
{ {
this.ngZone.run(async () => {
const result = await this.dialogService.open< const result = await this.dialogService.open<
CreateChatDialogComponent, CreateChatDialogComponent,
CreateChatDialogData, CreateChatDialogData,
@ -777,10 +784,12 @@ export class GroupComponent implements OnInit, OnDestroy {
); );
} }
} }
});
} }
break; break;
case 'DELETE': case 'DELETE':
{ {
this.ngZone.run(async () => {
const result = await this.dialogService.open< const result = await this.dialogService.open<
ConfirmDialogComponent, ConfirmDialogComponent,
ConfirmDialogData, ConfirmDialogData,
@ -789,15 +798,19 @@ export class GroupComponent implements OnInit, OnDestroy {
width: '360px', width: '360px',
data: { data: {
title: this.translateService.instant('group.removeGroup'), title: this.translateService.instant('group.removeGroup'),
html: this.translateService.instant('group.confirmRemoveGroup', { html: this.translateService.instant(
'group.confirmRemoveGroup',
{
nameOfGroup: `${group.name}` nameOfGroup: `${group.name}`
}) }
)
} }
}); });
if (!!result && !!result.choice && result.choice) { if (!!result && !!result.choice && result.choice) {
this.store.dispatch(SyncStore.delGroup({ group })); this.store.dispatch(SyncStore.delGroup({ group }));
} }
});
} }
break; break;
default: default:

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts
View File

@ -21,10 +21,9 @@ import {
combineLatest, combineLatest,
Subscription, Subscription,
of, of,
BehaviorSubject, BehaviorSubject
forkJoin
} from 'rxjs'; } from 'rxjs';
import { map, tap, catchError, take } from 'rxjs/operators'; import { map, tap, catchError } from 'rxjs/operators';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import * as AppStore from '@app/store'; import * as AppStore from '@app/store';
@ -67,7 +66,7 @@ import {
AlertDialogResult, AlertDialogResult,
AlertDialogData AlertDialogData
} from '@ucap-webmessenger/ui'; } from '@ucap-webmessenger/ui';
import { TranslateService, TranslateParser } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { environment } from '../../../../../environments/environment'; import { environment } from '../../../../../environments/environment';
import { StringUtil } from '@ucap-webmessenger/core'; import { StringUtil } from '@ucap-webmessenger/core';
import { AppService } from '@app/services/app.service'; import { AppService } from '@app/services/app.service';