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-25 17:25:17 +09:00
parent 6e78aa3115
commit 7d86529796
2 changed files with 127 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ export class GroupComponent implements OnInit, OnDestroy {
return true; return true;
} }
async onClickProfileContextMenu( onClickProfileContextMenu(
menuType: string, menuType: string,
userInfo: UserInfo | UserInfoF, userInfo: UserInfo | UserInfoF,
group?: GroupDetailData group?: GroupDetailData
@ -497,142 +497,144 @@ export class GroupComponent implements OnInit, OnDestroy {
'group', 'group',
group group
); );
switch (menuType) { this.ngZone.run(async () => {
case 'VIEW_PROFILE': switch (menuType) {
this.onClickOpenProfile(userInfo.seq, group); case 'VIEW_PROFILE':
break; this.onClickOpenProfile(userInfo.seq, group);
case 'CHAT': break;
this.onSelectBuddy(userInfo); case 'CHAT':
break; this.onSelectBuddy(userInfo);
case 'REMOVE_FROM_GROUP': break;
{ case 'REMOVE_FROM_GROUP':
const result = await this.dialogService.open< {
ConfirmDialogComponent, const result = await this.dialogService.open<
ConfirmDialogData, ConfirmDialogComponent,
ConfirmDialogResult ConfirmDialogData,
>(ConfirmDialogComponent, { ConfirmDialogResult
width: '360px', >(ConfirmDialogComponent, {
data: { width: '360px',
title: this.translateService.instant( data: {
'group.removeBuddyFromGroup' title: this.translateService.instant(
), 'group.removeBuddyFromGroup'
html: this.translateService.instant( ),
'group.confirmRemoveBuddyFromGroupInContextMenu', html: this.translateService.instant(
{ 'group.confirmRemoveBuddyFromGroupInContextMenu',
target: `${userInfo.name} ${userInfo.grade}`, {
targetGroup: `${group.name}` target: `${userInfo.name} ${userInfo.grade}`,
} targetGroup: `${group.name}`
) }
} )
});
if (!!result && !!result.choice && result.choice) {
const trgtUserSeq = group.userSeqs.filter(
user => user !== userInfo.seq
);
this.store.dispatch(
SyncStore.updateGroupMember({
oldGroup: group,
trgtUserSeq
})
);
}
}
break;
case 'COPY_BUDDY':
{
const result = await this.dialogService.open<
SelectGroupDialogComponent,
SelectGroupDialogData,
SelectGroupDialogResult
>(SelectGroupDialogComponent, {
width: '600px',
data: {
title: this.translateService.instant('group.selectTargetGroup')
}
});
if (!!result && !!result.choice && result.choice) {
if (!!result.group) {
const oldGroup: GroupDetailData = result.group;
const trgtUserSeq: number[] = [];
let exist = false;
result.group.userSeqs.map(seq => {
trgtUserSeq.push(seq);
if (seq === userInfo.seq) {
exist = true;
}
});
if (!exist) {
trgtUserSeq.push(userInfo.seq);
} }
});
if (!!result && !!result.choice && result.choice) {
const trgtUserSeq = group.userSeqs.filter(
user => user !== userInfo.seq
);
this.store.dispatch( this.store.dispatch(
SyncStore.updateGroupMember({ SyncStore.updateGroupMember({
oldGroup, oldGroup: group,
trgtUserSeq trgtUserSeq
}) })
); );
} }
} }
} break;
break; case 'COPY_BUDDY':
case 'MOVE_BUDDY': {
{ const result = await this.dialogService.open<
const result = await this.dialogService.open< SelectGroupDialogComponent,
SelectGroupDialogComponent, SelectGroupDialogData,
SelectGroupDialogData, SelectGroupDialogResult
SelectGroupDialogResult >(SelectGroupDialogComponent, {
>(SelectGroupDialogComponent, { width: '600px',
width: '600px', data: {
data: { title: this.translateService.instant('group.selectTargetGroup')
title: this.translateService.instant('group.selectTargetGroup'), }
ignoreGroup: [group] });
}
});
if (!!result && !!result.choice && result.choice) { if (!!result && !!result.choice && result.choice) {
if (!!result.group) { if (!!result.group) {
this.store.dispatch( const oldGroup: GroupDetailData = result.group;
SyncStore.moveGroupMember({ const trgtUserSeq: number[] = [];
fromGroup: group, let exist = false;
toGroup: result.group, result.group.userSeqs.map(seq => {
trgtUserSeq: [userInfo.seq] trgtUserSeq.push(seq);
}) if (seq === userInfo.seq) {
); exist = true;
}
});
if (!exist) {
trgtUserSeq.push(userInfo.seq);
}
this.store.dispatch(
SyncStore.updateGroupMember({
oldGroup,
trgtUserSeq
})
);
}
} }
} }
} break;
break; case 'MOVE_BUDDY':
case 'REGISTER_FAVORITE': {
this.store.dispatch( const result = await this.dialogService.open<
SyncStore.updateBuddy({ SelectGroupDialogComponent,
seq: userInfo.seq, SelectGroupDialogData,
isFavorit: !userInfo.isFavorit SelectGroupDialogResult
}) >(SelectGroupDialogComponent, {
); width: '600px',
break; data: {
case 'SEND_MESSAGE': title: this.translateService.instant('group.selectTargetGroup'),
{ ignoreGroup: [group]
this.dialogService.open< }
MessageWriteDialogComponent, });
MessageWriteDialogData,
MessageWriteDialogResult if (!!result && !!result.choice && result.choice) {
>(MessageWriteDialogComponent, { if (!!result.group) {
width: '600px', this.store.dispatch(
height: '600px', SyncStore.moveGroupMember({
disableClose: true, fromGroup: group,
hasBackdrop: false, toGroup: result.group,
data: { trgtUserSeq: [userInfo.seq]
loginRes: this.loginRes, })
environmentsInfo: this.environmentsInfo, );
receiverList: [userInfo] }
} }
}); }
} break;
break; case 'REGISTER_FAVORITE':
} this.store.dispatch(
SyncStore.updateBuddy({
seq: userInfo.seq,
isFavorit: !userInfo.isFavorit
})
);
break;
case 'SEND_MESSAGE':
{
this.dialogService.open<
MessageWriteDialogComponent,
MessageWriteDialogData,
MessageWriteDialogResult
>(MessageWriteDialogComponent, {
width: '600px',
height: '600px',
disableClose: true,
hasBackdrop: false,
data: {
loginRes: this.loginRes,
environmentsInfo: this.environmentsInfo,
receiverList: [userInfo]
}
});
}
break;
}
});
} }
onClickOpenProfile(userSeq: number, group: GroupDetailData) { onClickOpenProfile(userSeq: number, group: GroupDetailData) {

2
projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts
View File

@ -81,7 +81,7 @@ export const environment: Environment = {
maxChatRoomUser: 300, maxChatRoomUser: 300,
masstextLength: 800, masstextLength: 800,
eventRequestInitCount: 15, eventRequestInitCount: 30,
eventRequestDefaultCount: 50, eventRequestDefaultCount: 50,
readHereShowMinimumEventCount: 10, readHereShowMinimumEventCount: 10,