From 47d58cbbe9b4e74990d8769f4abab78c8f2ac898 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 10 Feb 2020 10:52:28 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20214?= =?UTF-8?q?=20>=20noti=20=EC=84=B1=EA=B2=A9=EC=9D=98=20=20INVITE=5FRES,=20?= =?UTF-8?q?NOTI=20=ED=86=B5=ED=95=A9=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/services/notification.service.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts index 927a7459..bec1bd25 100644 --- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts @@ -481,19 +481,6 @@ export class AppNotificationService { tap(([notiOrRes, loginResInfo]) => { switch (notiOrRes.SSVC_TYPE) { case SSVC_TYPE_ROOM_INVITE_RES: - { - const noti = notiOrRes as InviteNotification; - this.logger.debug( - 'Notification::roomProtocolService::InviteNotification', - noti - ); - this.store.dispatch( - RoomStore.inviteSuccess({ - roomSeq: noti.roomSeq - }) - ); - } - break; case SSVC_TYPE_ROOM_INVITE_NOTI: { const noti = notiOrRes as InviteNotification; From 195ce632d53db78250706ae96b9307ea38129ef3 Mon Sep 17 00:00:00 2001 From: khk Date: Mon, 10 Feb 2020 11:10:11 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=A7=88=EC=A7=80=EB=A7=89=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/messages.component.html | 1 + .../messenger/components/messages.component.scss | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index 27f3229a..b01b65cb 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -181,6 +181,7 @@ (fileDragLeave)="onFileDragLeave()" > + Date: Mon, 10 Feb 2020 11:26:55 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=A7=88=EC=A7=80=EB=A7=89=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/layouts/messenger/components/messages.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index b01b65cb..b2ec202a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -181,7 +181,7 @@ (fileDragLeave)="onFileDragLeave()" > - + Date: Mon, 10 Feb 2020 13:02:56 +0900 Subject: [PATCH 4/4] =?UTF-8?q?bugfix=20::=20=EA=B7=B8=EB=A3=B9=EB=8C=80?= =?UTF-8?q?=ED=99=94=EB=B0=A9=20=EC=97=B4=EB=A0=A4=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20=EB=8C=80=ED=99=94?= =?UTF-8?q?=EC=83=81=EB=8C=80=20=EC=B6=94=EA=B0=80=EC=8B=9C=20=EB=8C=80?= =?UTF-8?q?=ED=99=94=EC=83=81=EB=8C=80=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EA=B0=B1=EC=8B=A0=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/integrated-search.dialog.component.ts | 2 -- .../src/app/store/messenger/room/effects.ts | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts index 01307145..35594656 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts @@ -165,8 +165,6 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy { }) ); } - - console.log(this.searchUserInfos); } break; } diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts index e48f746e..8feefb54 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/effects.ts @@ -273,7 +273,15 @@ export class Effects { }) .pipe( map((res: InviteResponse) => { - return inviteSuccess(res); + // return inviteSuccess(res); + const loginInfo = this.sessionStorageService.get( + KEY_LOGIN_INFO + ); + return info({ + roomSeq: res.roomSeq, + isDetail: true, + localeCode: loginInfo.localeCode + }); }), catchError(error => of(inviteFailure({ error }))) );