# 이슈처리 234

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

View File

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

View File

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