From 1a46307df7ef9177119cc0c093bd237a55386d3c Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 5 Feb 2020 14:10:34 +0900 Subject: [PATCH 1/4] bugfix --- .../components/messages.component.ts | 1 + .../src/app/store/messenger/status/effects.ts | 31 +++++++++++++------ .../src/lib/components/messages.component.ts | 6 +++- 3 files changed, 28 insertions(+), 10 deletions(-) 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 161d4f12..a8e7a3c3 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 @@ -272,6 +272,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { if ( !this.roomInfoSubject.value || (!!this.roomInfoSubject.value && + !!roomInfo && this.roomInfoSubject.value.roomSeq !== roomInfo.roomSeq) ) { this.clearView(); diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/status/effects.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/status/effects.ts index 8e5f48fb..f672ba82 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/status/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/status/effects.ts @@ -17,7 +17,14 @@ import { messageUpdate, messageUpdateFailure } from './actions'; -import { tap, switchMap, map, catchError, exhaustMap } from 'rxjs/operators'; +import { + tap, + switchMap, + map, + catchError, + exhaustMap, + delay +} from 'rxjs/operators'; import { StatusProtocolService, SSVC_TYPE_STATUS_BULK_INFO_DATA, @@ -120,14 +127,20 @@ export class Effects { ) ); - myStatusCheck$ = createEffect(() => - this.actions$.pipe( - ofType(AuthStore.loginSuccess), - map(action => action.loginRes), - map(loginRes => { - return bulkInfo({ divCd: 'bulk', userSeqs: [loginRes.userSeq] }); - }) - ) + myStatusCheck$ = createEffect( + () => + this.actions$.pipe( + ofType(AuthStore.loginSuccess), + map(action => action.loginRes), + delay(5000), + tap(loginRes => { + this.store.dispatch( + bulkInfo({ divCd: 'mybulk', userSeqs: [loginRes.userSeq] }) + ); + // return bulkInfo({ divCd: 'bulk', userSeqs: [loginRes.userSeq] }); + }) + ), + { dispatch: false } ); constructor( diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts index c5e56161..5f82ee8c 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts @@ -181,7 +181,11 @@ export class MessagesComponent implements OnInit, OnDestroy { this.existReadToHereEvent = true; /** [E] initializing by changed room */ - if (this.roomInfo.roomSeq !== roomInfo.roomSeq) { + if ( + !!this.roomInfo && + !!roomInfo && + this.roomInfo.roomSeq !== roomInfo.roomSeq + ) { this.initEventMore(); } }); From 12f09c33dd90c88110d26134ebd49e6a3c48a1e3 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 5 Feb 2020 14:48:08 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=ED=97=88?= =?UTF-8?q?=EC=9A=A9=20=ED=99=95=EC=9E=A5=EC=9E=90=20=ED=99=94=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EA=B0=B1=EC=8B=A0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/environments/environment.type.ts | 116 +++++++----------- 1 file changed, 46 insertions(+), 70 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/environments/environment.type.ts b/projects/ucap-webmessenger-app/src/environments/environment.type.ts index e6f378b3..376b2888 100644 --- a/projects/ucap-webmessenger-app/src/environments/environment.type.ts +++ b/projects/ucap-webmessenger-app/src/environments/environment.type.ts @@ -195,101 +195,77 @@ export const protocolUrls: ProtocolUrls = { }; export const commonApiacceptableFileExtensions: string[] = [ - // 문서1 - 'csv', - 'd01', + // 문서 'doc', 'docx', 'dot', 'dotx', - 'hwp', - 'log', - 'one', - 'pdf', + 'ppt', + 'pptx', 'pot', 'potx', 'pps', 'ppsx', - 'ppt', - 'pptx', - 'ps', - // 문서2 - 'rtf', - 'txt', - 'vcf', 'xls', 'xlsx', 'xlt', 'xltx', - 'xlsm', - 'ods', - // CAD - 'asc', - 'dwg', - 'dws', - 'dwt', - 'dxf', - 'pgp', - 'plt', - // MAC - 'pages', - 'keynote', + 'rtf', + 'txt', + 'csv', + 'pdf', + 'hwp', + + // 이미지 + 'tif', + 'ogg', + 'psd', + 'ai', + 'bmp', + 'gif', + 'jpg', + 'jpeg', + 'png', + // 압축 - '7z', + 'zip', + 'alz', + 'a00', 'a01', 'a02', 'a03', - 'alz', - 'egg', - 'gz', - 'rar', - 'tar', - 'zip', + 'a04', + 'a05', + 'a06', + 'a07', + 'a08', + 'a09', + // 오디오 - 'aac', - 'aiff', - 'flac', - 'm4a', - 'mp2', - 'mp3', - 'mpega', - 'mpga', - 'ogg', - 'wma', 'wav', + 'mp3', + 'm4a', + // 플래쉬 - 'fla', - 'flv', 'swf', - // 이미지 - 'ai', - 'bmp', - 'cdr', - 'emf', - 'eps', - 'gif', - 'jpeg', - 'jpg', - 'png', - 'psd', - 'tif', - 'tiff', - 'wmf', + 'fla', + // 동영상 - '3gp', 'avi', - 'm4v', - 'mkv', - 'mov', 'mp4', - 'mpeg', - 'mpg', - 'rv', + 'wmv', + 'mov', + '3gp', + 'mkv', 'ts', 'webm', - 'wmv', - // 폴더전송용 - 'zdr' + 'm4v', + 'mpg', + 'mpeg', + + // 폴더전송 + 'zdr', + 'dat' ]; // export abstract class UrlConfig { From 4ee34482285cff3ef285d0b5627f59434f3e1537 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 5 Feb 2020 15:29:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EB=8B=B5=EC=9E=A5=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/message.component.ts | 71 ++++++++++++++++++- .../message-detail.dialog.component.html | 11 +-- .../message-detail.dialog.component.ts | 7 ++ .../message-write.dialog.component.html | 2 +- .../src/assets/i18n/en.json | 1 + .../src/assets/i18n/ko.json | 1 + 6 files changed, 87 insertions(+), 6 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts index 615445f4..11d5b16f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts @@ -20,7 +20,10 @@ import { AlertDialogResult, AlertDialogData } from '@ucap-webmessenger/ui'; -import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; +import { + LoginResponse, + RoleCode +} from '@ucap-webmessenger/protocol-authentication'; import { KEY_LOGIN_RES_INFO } from '@app/types/login-res-info.type'; import { MessageApiService, @@ -51,6 +54,13 @@ import { import * as AppStore from '@app/store'; import * as MessageStore from '@app/store/messenger/message'; import { TranslateService } from '@ngx-translate/core'; +import { + MessageWriteDialogComponent, + MessageWriteDialogResult, + MessageWriteDialogData +} from '../../dialogs/message/message-write.dialog.component'; +import { UserInfo } from '@ucap-webmessenger/protocol-sync'; +import { EmployeeType } from '@ucap-webmessenger/protocol-room'; export interface MessageTypeData { displayName: string; @@ -172,6 +182,7 @@ export class MessageBoxComponent MessageDetailDialogResult >(MessageDetailDialogComponent, { width: '600px', + hasBackdrop: false, data: { detail: info, loginRes: this.loginRes, @@ -192,6 +203,10 @@ export class MessageBoxComponent // 단건 발송취소(예약) this.doMessageCancelReservation(result.messageInfo); break; + case 'REPLY': + // 답장 + this.doMessageReply(result.messageInfo); + break; case 'UPDATE': // 예약 수정 this.getRetrieveMessage(MessageType.Reservation, 0); @@ -367,6 +382,24 @@ export class MessageBoxComponent ); } + doMessageReply(messageInfo: MessageDetailInfo): void { + this.dialogService.open< + MessageWriteDialogComponent, + MessageWriteDialogData, + MessageWriteDialogResult + >(MessageWriteDialogComponent, { + width: '600px', + height: '600px', + disableClose: true, + hasBackdrop: false, + data: { + loginRes: this.loginRes, + environmentsInfo: this.environmentsInfo, + receiverList: [this.convertDetailReceivertoUserInfo(messageInfo)] + } + }); + } + private setMessageTypeData() { const messageTypeData = this.translateService.instant('message.type'); @@ -394,4 +427,40 @@ export class MessageBoxComponent this.messageTypeList = messageTypeList; } + + private convertDetailReceivertoUserInfo(base: MessageDetailInfo): UserInfo { + return { + seq: base.sendUserSeq, + name: base.sendUserName, + profileImageFile: '', + grade: '', + intro: '', + companyCode: '', + hpNumber: '', + lineNumber: '', + email: '', + isMobile: false, + deptName: '', + isFavorit: false, + isBuddy: false, + isActive: false, + roleCd: RoleCode.Self, + employeeNum: '', + madn: '', + hardSadn: '', + fmcSadn: '', + nameEn: '', + nameCn: '', + gradeEn: '', + gradeCn: '', + deptNameEn: '', + deptNameCn: '', + isPrivacyAgree: false, + isValidLogin: false, + employeeType: EmployeeType.Regular, + nickName: '', + + order: '' + }; + } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html index 65cb4915..9c0121a0 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html @@ -1,5 +1,5 @@ - + {{ @@ -249,11 +249,14 @@ - + + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts index 6ffb3c7d..b27766a5 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.ts @@ -655,4 +655,11 @@ export class MessageDetailDialogComponent implements OnInit { returnType: 'CLOSE' }); } + + onClickReply(): void { + this.dialogRef.close({ + returnType: 'REPLY', + messageInfo: this.messageInfo + }); + } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html index 2618a662..9192de70 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html @@ -1,5 +1,5 @@ - + {{ (isModify ? 'message.modify' : 'message.sendTo') | translate }} diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index 476cf86f..a66e1fc9 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -295,6 +295,7 @@ "modify": "Modify message", "sendTo": "Send message", "sendReservation": "Send reservation", + "sendReply": "Send reply", "placeholderForSearch": "search for name, title, content", "searchTypeName": "Name", "searchTypeTitle": "Title", diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 0fd8399b..2acce2d4 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -295,6 +295,7 @@ "modify": "쪽지 수정", "sendTo": "쪽지 보내기", "sendReservation": "쪽지 예약 보내기", + "sendReply": "답장", "placeholderForSearch": "이름, 제목, 내용 검색", "searchTypeName": "이름", "searchTypeTitle": "제목", From fa1d0287beb0e0ee5a8908d62221388e273476fb Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 5 Feb 2020 15:50:35 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=20=EB=B0=8F=20=20svg=20->=20=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/create-chat.dialog.component.html | 15 +++++---- .../selected-user-list.dialog.component.html | 29 +++++++++-------- .../selected-user-list.dialog.component.scss | 16 ++++++++++ .../src/assets/scss/global/_default.scss | 5 +++ .../lib/components/list-item.component.html | 2 +- .../lib/components/list-item.component.scss | 1 + .../src/assets/scss/partials/_icons.scss | 32 +++++++++++++------ 7 files changed, 69 insertions(+), 31 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index 55f63d5d..b62a3312 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -40,7 +40,7 @@ > - + +
@@ -136,11 +137,11 @@ - device_hub + >device_hub--> +
chat +
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html index 934ba9e5..12b60064 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html @@ -1,28 +1,29 @@ - + {{ data.title }} - + {{ selectedUserList.length }} / {{ data.selectedUserList.length }} - - {{ 'common.messages.selectAll' | translate }} - + + {{ 'common.messages.selectAll' | translate }} +
notifications_off
-->
- +
diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss index dc1f5198..9a5047d2 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss @@ -105,6 +105,7 @@ $thumbnail-msize: 40px; line-height: unset; } .icon-img { + padding-left: 4px; i { font-size: 1.1em; text-align: center; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss index e3625f13..9931e3c5 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss @@ -3,8 +3,6 @@ mat-icon { font-size: 24px; width: 24px; height: 24px; - min-width: 24px; - min-height: 24px; line-height: 24px; @each $breakpoint, $materialBreakpoint in $helper-breakpoints { @@ -32,17 +30,31 @@ mat-icon { justify-items: center; background: none; border: none; - width: 20px; - height: 20px; + width: auto; + height: auto; justify-items: center; justify-content: center; i { - font-family: 'material-outline-icons'; - font-size: 20px; - width: 20px; - height: 20px; - line-height: 20px; - font-weight: normal; + &.mid { + font-family: 'material-outline-icons'; + font-size: 20px; + width: 20px; + height: 20px; + line-height: 20px; + font-weight: normal; + &-18 { + font-size: 18px; + width: 18px; + height: 18px; + line-height: 18px; + } + &-24 { + font-size: 24px; + width: 24px; + height: 24px; + line-height: 24px; + } + } &:before { display: inline-block; font: normal normal normal 20px/1 'Material Design Icons';