diff --git a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts index 16e7b11c..489bd5fc 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/common/dialogs/file-viewer.dialog.component.ts @@ -15,9 +15,6 @@ import { FileDownloadItem } from '@ucap-webmessenger/api'; import { CommonApiService } from '@ucap-webmessenger/api-common'; import { TranslateService } from '@ngx-translate/core'; import { FileProtocolService } from '@ucap-webmessenger/protocol-file'; -import { select, Store } from '@ngrx/store'; -import { Subscription } from 'rxjs'; -import * as AppStore from '@app/store'; export interface FileViewerDialogData { fileInfo: FileEventJson; @@ -35,8 +32,6 @@ export interface FileViewerDialogResult {} styleUrls: ['./file-viewer.dialog.component.scss'] }) export class FileViewerDialogComponent implements OnInit, OnDestroy { - loginResSubscription: Subscription; - fileInfo: FileEventJson; downloadUrl: string; userSeq: number; @@ -56,7 +51,6 @@ export class FileViewerDialogComponent implements OnInit, OnDestroy { private snackBarService: SnackBarService, private commonApiService: CommonApiService, private fileProtocolService: FileProtocolService, - private store: Store, private logger: NGXLogger ) { this.fileInfo = data.fileInfo; @@ -76,24 +70,9 @@ export class FileViewerDialogComponent implements OnInit, OnDestroy { ); } - ngOnInit() { - this.loginResSubscription = this.store - .pipe( - select(AppStore.AccountSelector.AuthenticationSelector.loginRes), - tap(loginRes => { - if (!loginRes) { - this.onClosedViewer(); - } - }) - ) - .subscribe(); - } + ngOnInit() {} - ngOnDestroy(): void { - if (!!this.loginResSubscription) { - this.loginResSubscription.unsubscribe(); - } - } + ngOnDestroy(): void {} onDownload(fileDownloadItem: FileDownloadItem): void { this.commonApiService diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss index 1ee9592c..555bb867 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.scss @@ -176,6 +176,7 @@ ::ng-deep .chat-snackbar-class { .mat-simple-snackbar { + justify-content: center; span { @include ellipsis(1); } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 69c28335..1c92a9b5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -974,32 +974,36 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { onExistNewMessage(info: Info) { let message = ''; - const senderUser = this.userInfoListSubject.value.filter( - user => user.seq === info.senderSeq - ); - if (!!senderUser && senderUser.length > 0) { - message += `${senderUser[0].name} : `; - } - message += StringUtil.convertFinalEventMessage( + const contents = StringUtil.convertFinalEventMessage( info.type, info.sentMessageJson || info.sentMessage ); - this.snackBarPreviewEvent = this.snackBarService.open( - message, - this.translateService.instant('common.messages.confirm'), - { - // duration: 3000, - verticalPosition: 'bottom', - horizontalPosition: 'center', - panelClass: ['chat-snackbar-class'] + if (!!contents) { + const senderUser = this.userInfoListSubject.value.filter( + user => user.seq === info.senderSeq + ); + if (!!senderUser && senderUser.length > 0) { + message += `${senderUser[0].name} : `; } - ); - this.snackBarPreviewEvent.onAction().subscribe(() => { - this.chatMessages.initEventMore(); - this.chatMessages.scrollToBottom(); - this.snackBarPreviewEvent.dismiss(); - }); + message += contents; + + this.snackBarPreviewEvent = this.snackBarService.open( + message, + this.translateService.instant('common.messages.confirm'), + { + // duration: 3000, + verticalPosition: 'bottom', + horizontalPosition: 'center', + panelClass: ['chat-snackbar-class'] + } + ); + this.snackBarPreviewEvent.onAction().subscribe(() => { + this.chatMessages.initEventMore(); + this.chatMessages.scrollToBottom(); + this.snackBarPreviewEvent.dismiss(); + }); + } } saveFile( @@ -1292,12 +1296,6 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { (message as Info).sentMessage ) ) { - this.snackBarService.open( - this.translateService.instant( - 'common.clipboard.results.copied' - ), - '확인' - ); this.snackBarService.open( this.translateService.instant( 'common.clipboard.results.copied' diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html index 94f5e39a..b6c1ddf5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.html @@ -43,7 +43,7 @@ -
+
{ - if (!loginRes) { - this.onClickCancel(); - } - this.loginRes = loginRes; }) ) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html index dca6ad05..494242db 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html @@ -19,7 +19,7 @@ - diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss index 4fedf13d..4c6cd15b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss @@ -13,18 +13,21 @@ } } -::ng-deep .mat-card-header-text { - margin: 0; - .title { - width: 480px; - @include ellipsis(1); +.mat-card-header { + .mat-card-header-text { + .title { + @include ellipsis(1); + } + .btn-dialog-close { + font-size: 20px; + display: flex; + margin-left: auto; + align-self: flex-start; + color: #444444; + } } - .btn-dialog-close { - font-size: 20px; - display: flex; + .icon-button { margin-left: auto; - align-self: flex-start; - color: #444444; } } .confirm-card { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.ts index 23f8e6a0..cf6f8fd1 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.ts @@ -1,10 +1,6 @@ import { Component, OnInit, Inject, OnDestroy } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { NoticeList } from '@ucap-webmessenger/api-message'; -import { Subscription } from 'rxjs'; -import { select, Store } from '@ngrx/store'; -import { tap } from 'rxjs/operators'; -import * as AppStore from '@app/store'; export interface NoticeDetailDialogData { notice: NoticeList; @@ -18,35 +14,17 @@ export interface NoticeDetailDialogResult {} styleUrls: ['./notice-detail.dialog.component.scss'] }) export class NoticeDetailDialogComponent implements OnInit, OnDestroy { - loginResSubscription: Subscription; - constructor( public dialogRef: MatDialogRef< NoticeDetailDialogData, NoticeDetailDialogResult >, - @Inject(MAT_DIALOG_DATA) public data: NoticeDetailDialogData, - private store: Store + @Inject(MAT_DIALOG_DATA) public data: NoticeDetailDialogData ) {} - ngOnInit() { - this.loginResSubscription = this.store - .pipe( - select(AppStore.AccountSelector.AuthenticationSelector.loginRes), - tap(loginRes => { - if (!loginRes) { - this.onClickConfirm(); - } - }) - ) - .subscribe(); - } + ngOnInit() {} - ngOnDestroy(): void { - if (!!this.loginResSubscription) { - this.loginResSubscription.unsubscribe(); - } - } + ngOnDestroy(): void {} onClickConfirm(): void { this.dialogRef.close(); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts index ba5171b9..b2ba121b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts @@ -119,10 +119,6 @@ export class ProfileDialogComponent implements OnInit, OnDestroy { .pipe( select(AppStore.AccountSelector.AuthenticationSelector.loginRes), tap(loginRes => { - if (!loginRes) { - this.onClose(); - } - this.loginRes = loginRes; if (!!loginRes && loginRes.userSeq === this.data.userInfo.seq) { this.isMe = true; 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 cbb4f68a..d3473bfe 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 @@ -86,9 +86,6 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy { .pipe( select(AppStore.AccountSelector.AuthenticationSelector.loginRes), tap(loginRes => { - if (!loginRes) { - this.onCancel(); - } this.loginRes = loginRes; }) ) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss index be24d055..c4ad3975 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss @@ -42,7 +42,7 @@ padding: 0 10px; align-content: flex-start; text-align: left; - align-items: self-start; + align-items: center; justify-content: flex-start; } } 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 43e81e5a..24d23d61 100644 --- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts +++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts @@ -24,7 +24,8 @@ import { SSVC_TYPE_EVENT_CANCEL_NOTI, SSVC_TYPE_EVENT_DEL_RES, SSVC_TYPE_EVENT_SEND_RES, - SSVC_TYPE_EVENT_READ_RES + SSVC_TYPE_EVENT_READ_RES, + EventType } from '@ucap-webmessenger/protocol-event'; import { InfoProtocolService, @@ -248,30 +249,35 @@ export class AppNotificationService { ); audio.play(); } else { - const notiReq: NotificationRequest = { - type: NotificationType.Event, - seq: noti.roomSeq, - title: this.translateService.instant( - 'notification.titleChatEventArrived' - ), - contents: StringUtil.convertFinalEventMessage( - noti.eventType, - noti.info.sentMessageJson - ), - image: '', - useSound: [ - NotificationMethod.Sound, - NotificationMethod.SoundAndAlert - ].some( - n => n === appUserInfo.settings.notification.method - ) - ? true - : false, - displayTime: - appUserInfo.settings.notification - .alertExposureTime * 1000 - }; - this.nativeService.notify(notiReq); + const contents = StringUtil.convertFinalEventMessage( + noti.eventType, + noti.info.sentMessageJson + ); + + if (!!contents) { + const notiReq: NotificationRequest = { + type: NotificationType.Event, + seq: noti.roomSeq, + title: this.translateService.instant( + 'notification.titleChatEventArrived' + ), + contents, + image: '', + useSound: [ + NotificationMethod.Sound, + NotificationMethod.SoundAndAlert + ].some( + n => + n === appUserInfo.settings.notification.method + ) + ? true + : false, + displayTime: + appUserInfo.settings.notification + .alertExposureTime * 1000 + }; + this.nativeService.notify(notiReq); + } } } } @@ -474,6 +480,20 @@ export class AppNotificationService { ); } break; + case SSVC_TYPE_ROOM_INVITE_NOTI: + { + const noti = notiOrRes as InviteNotification; + this.logger.debug( + 'Notification::roomProtocolService::InviteNotification', + noti + ); + this.store.dispatch( + RoomStore.inviteNotification({ + noti + }) + ); + } + break; case SSVC_TYPE_ROOM_UPD_RES: { const noti = notiOrRes as RoomUpdateNotification; @@ -496,20 +516,6 @@ export class AppNotificationService { ); } break; - case SSVC_TYPE_ROOM_INVITE_NOTI: - { - const noti = notiOrRes as InviteNotification; - this.logger.debug( - 'Notification::roomProtocolService::InviteNotification', - noti - ); - this.store.dispatch( - RoomStore.inviteNotification({ - noti - }) - ); - } - break; case SSVC_TYPE_ROOM_EXIT_RES: case SSVC_TYPE_ROOM_EXIT_NOTI: { @@ -528,7 +534,8 @@ export class AppNotificationService { } else { this.store.dispatch( RoomStore.exitNotificationOthers({ - noti + roomSeq: noti.roomSeq, + trgtUser: [noti.SENDER_SEQ] }) ); @@ -560,15 +567,31 @@ export class AppNotificationService { break; case SSVC_TYPE_ROOM_EXIT_FORCING_NOTI: { - // 내가 강퇴 됨. const noti = notiOrRes as ExitForcingNotification; this.logger.debug( 'Notification::roomProtocolService::ExitForcingNotification NOTI', noti ); + + if (noti.userSeqs.indexOf(loginResInfo.userSeq) >= 0) { + this.store.dispatch( + RoomStore.exitForcingNotification({ + noti + }) + ); + } + this.store.dispatch( - RoomStore.exitForcingNotification({ - noti + RoomStore.exitNotificationOthers({ + roomSeq: noti.roomSeq, + trgtUser: noti.userSeqs + }) + ); + + this.store.dispatch( + SyncStore.clearRoomUsers({ + roomSeq: noti.roomSeq, + userSeqs: noti.userSeqs }) ); } diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts index 02427292..be56cadb 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/actions.ts @@ -56,9 +56,12 @@ export const exitNotification = createAction( '[Messenger::Room] Exit Notification', props<{ noti: ExitNotification }>() ); +/** + * 현재 열려 있는 방의 방참여인원의 isJoinRoom flag 를 false 로 변경. + */ export const exitNotificationOthers = createAction( '[Messenger::Room] Exit Notification By Others', - props<{ noti: ExitNotification }>() + props<{ roomSeq: string; trgtUser: number[] }>() ); export const exitForcing = createAction( 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 966aa15a..3f7e14ae 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 @@ -310,8 +310,25 @@ export class Effects { () => { return this.actions$.pipe( ofType(inviteNotification), - map(action => action.noti), - tap(noti => {}) + withLatestFrom( + this.store.pipe( + select((state: any) => state.messenger.room.roomInfo as RoomInfo) + ) + ), + tap(([action, roomInfo]) => { + if (!!roomInfo && roomInfo.roomSeq === action.noti.roomSeq) { + const loginInfo = this.sessionStorageService.get( + KEY_LOGIN_INFO + ); + this.store.dispatch( + info({ + roomSeq: action.noti.roomSeq, + isDetail: true, + localeCode: loginInfo.localeCode + }) + ); + } + }) ); }, { dispatch: false } @@ -354,13 +371,11 @@ export class Effects { tap(([action, roomInfo]) => { if ( !!roomInfo && - roomInfo.roomSeq === action.noti.roomSeq && - !!action.noti && - !!action.noti.SENDER_SEQ + roomInfo.roomSeq === action.roomSeq && + !!action.trgtUser && + action.trgtUser.length > 0 ) { - this.store.dispatch( - clearRoomUser({ userSeqs: [action.noti.SENDER_SEQ] }) - ); + this.store.dispatch(clearRoomUser({ userSeqs: action.trgtUser })); } }) ); diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts index 5969f577..4d3842f0 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/room/reducers.ts @@ -10,7 +10,7 @@ import { import * as AuthenticationStore from '@app/store/account/authentication'; import * as ChatStore from '@app/store/messenger/chat'; -import { UserInfo } from '@ucap-webmessenger/protocol-room'; +import { UserInfo, UserInfoShort } from '@ucap-webmessenger/protocol-room'; export const reducer = createReducer( initialState, @@ -28,14 +28,45 @@ export const reducer = createReducer( }), on(clearRoomUser, (state, action) => { + const tmpUserInfoList: UserInfo[] = []; + const tmpUserInfoShortList: UserInfoShort[] = []; + action.userSeqs.forEach(userSeq => { + const userInfo: UserInfo = { + ...state.userInfoList.entities[userSeq] + }; + + if (!!userInfo && !!userInfo.seq) { + tmpUserInfoList.push({ + ...userInfo, + isJoinRoom: false + }); + } + + const userInfoShort: UserInfoShort = { + ...state.userInfoShortList.entities[userSeq] + }; + if (!!userInfoShort && !!userInfoShort.seq) { + tmpUserInfoShortList.push({ + ...userInfoShort, + isJoinRoom: false + }); + } + }); + return { ...state, - userInfoList: adapterUserInfo.removeMany(action.userSeqs, { - ...state.userInfoList - }), - userInfoShortList: adapterUserInfoShort.removeMany(action.userSeqs, { - ...state.userInfoShortList - }) + userInfoList: + tmpUserInfoList.length > 0 + ? adapterUserInfo.upsertMany(tmpUserInfoList, { + ...state.userInfoList + }) + : state.userInfoList, + userInfoShortList: + tmpUserInfoShortList.length > 0 + ? adapterUserInfoShort.upsertMany(tmpUserInfoShortList, { + ...state.userInfoShortList + }) + : state.userInfoShortList }; }), diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts index 342f2a60..2a80c28e 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/actions.ts @@ -264,7 +264,7 @@ export const delGroupFailure = createAction( props<{ error: any }>() ); -/** 방 인원 클리어 */ +/** Sync 되어 있는 방의 방인원의 isJoinRoom flag 를 false 로 변경. */ export const clearRoomUsers = createAction( '[Messenger::Sync] Clear room users.', props<{ roomSeq: string; userSeqs: number[] }>() diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts index a6ea6f4a..b52dc94c 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/effects.ts @@ -342,6 +342,10 @@ export class Effects { let roomSeq = null; for (const key in roomUsers) { + if (key === undefined) { + continue; + } + if (roomUsers.hasOwnProperty(key)) { const element = roomUsers[key]; if (userSeqList.length === element.userInfos.length) { @@ -371,6 +375,10 @@ export class Effects { } for (const key in roomUserShorts) { + if (key === undefined) { + continue; + } + if (roomUserShorts.hasOwnProperty(key)) { const element = roomUserShorts[key]; if (userSeqList.length === element.userInfos.length) { diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts index 2cac0931..ea6d0eed 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts @@ -103,35 +103,45 @@ export const reducer = createReducer( }), on(clearRoomUsers, (state, action) => { - let roomUserList: RoomUserDetailData = { + const roomUserList: RoomUserDetailData = { ...state.roomUser.entities[action.roomSeq] }; + let trgtRoomUserList: RoomUserDetailData; if ( !!roomUserList && !!roomUserList.userInfos && roomUserList.userInfos.length > 0 ) { - const userInfos = roomUserList.userInfos.filter( - userInfo => action.userSeqs.indexOf(userInfo.seq) < 0 - ); - roomUserList = { + const userInfos = roomUserList.userInfos.map(userInfo => { + if (action.userSeqs.indexOf(userInfo.seq) >= 0) { + return { ...userInfo, isJoinRoom: false }; + } else { + return userInfo; + } + }); + trgtRoomUserList = { ...roomUserList, userInfos }; } - let roomUserShortList: RoomUserData = { + const roomUserShortList: RoomUserData = { ...state.roomUserShort.entities[action.roomSeq] }; + let trgtRoomUserShortList: RoomUserData; if ( !!roomUserShortList && !!roomUserShortList.userInfos && roomUserShortList.userInfos.length > 0 ) { - const userInfos = roomUserShortList.userInfos.filter( - userInfo => action.userSeqs.indexOf(userInfo.seq) < 0 - ); - roomUserShortList = { + const userInfos = roomUserShortList.userInfos.map(userInfo => { + if (action.userSeqs.indexOf(userInfo.seq) >= 0) { + return { ...userInfo, isJoinRoom: false }; + } else { + return userInfo; + } + }); + trgtRoomUserShortList = { ...roomUserShortList, userInfos }; @@ -139,12 +149,16 @@ export const reducer = createReducer( return { ...state, - roomUser: adapterRoomUser.upsertOne(roomUserList, { - ...state.roomUser - }), - roomUserShort: adapterRoomUserShort.upsertOne(roomUserShortList, { - ...state.roomUserShort - }) + roomUser: !!trgtRoomUserList + ? adapterRoomUser.upsertOne(trgtRoomUserList, { + ...state.roomUser + }) + : state.roomUser, + roomUserShort: !!trgtRoomUserShortList + ? adapterRoomUserShort.upsertOne(trgtRoomUserShortList, { + ...state.roomUserShort + }) + : state.roomUserShort }; }), diff --git a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss index a60e59d4..18272614 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -275,6 +275,14 @@ $daesang-grey: ( cursor: pointer; } + .cdk-global-overlay-wrapper { + align-items: center !important; + justify-content: center !important; + .mat-simple-snackbar { + justify-content: center; + } + } + .policy { color: mat-color($accent, B100); } @@ -440,7 +448,7 @@ $daesang-grey: ( } } } - .mat-calendar-body-selected{ - background-color: mat-color($accent); + .mat-calendar-body-selected { + background-color: mat-color($accent); } } diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss index d0265ade..6d18bba3 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss @@ -29,9 +29,10 @@ $tablet-s-width: 768px; .profile-img { flex: 0 0 auto; &.thumbnail-mask { - border-radius: 50%; width: 40px; height: 40px; + border: 1px solid rgb(0, 0, 0, 0.1); + border-radius: 50%; overflow: hidden; img { width: 40px; diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html index c663dced..111cd570 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.html @@ -1,5 +1,9 @@ -
-
+ +
+
+
+ + + + + + + + {{ curIndex }} / {{ totalCount }} +
+
+ +
+ + +