From d5b6514f482ce6a8f0f8b3ed4bce03ea01cc10fa Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 3 Dec 2019 08:51:49 +0900 Subject: [PATCH 1/5] unsubscribe add --- .../components/left-sidenav/message.component.ts | 9 ++++++++- .../dialogs/message/message-detail.dialog.component.ts | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) 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 fcca0d21..dff61f31 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 @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { Subscription, of } from 'rxjs'; import { Store, select } from '@ngrx/store'; -import { tap, map, catchError } from 'rxjs/operators'; +import { tap, map, catchError, take } from 'rxjs/operators'; import { NGXLogger } from 'ngx-logger'; import * as AppStore from '@app/store'; @@ -223,6 +223,7 @@ export class MessageBoxComponent searchType === MessageSearchType.Contents ? searchStr : '' } as RetrieveSearchRequest) .pipe( + take(1), map(res => { if (res.responseCode === MessageStatusCode.Success) { this.currentTotalCount = res.totalCount; @@ -256,6 +257,7 @@ export class MessageBoxComponent pageCount: this.recieveCurrentPage } as RetrieveRequest) .pipe( + take(1), map(res => { if (res.responseCode === MessageStatusCode.Success) { this.currentTotalCount = res.totalCount; @@ -282,6 +284,7 @@ export class MessageBoxComponent pageCount: this.sendCurrentPage } as RetrieveRequest) .pipe( + take(1), map(res => { if (res.responseCode === MessageStatusCode.Success) { this.currentTotalCount = res.totalCount; @@ -308,6 +311,7 @@ export class MessageBoxComponent pageCount: this.reservationCurrentPage } as RetrieveRequest) .pipe( + take(1), map(res => { if (res.responseCode === MessageStatusCode.Success) { this.currentTotalCount = res.totalCount; @@ -336,6 +340,7 @@ export class MessageBoxComponent msgId: message.msgId } as DetailRequest) .pipe( + take(1), map(async res => { if (res.responseCode === MessageStatusCode.Success) { // Badge Refresh in case Receive Message.. @@ -389,6 +394,7 @@ export class MessageBoxComponent msgList } as DelRequest) .pipe( + take(1), map(async res => { if (res.responseCode === MessageStatusCode.Success) { } else { @@ -413,6 +419,7 @@ export class MessageBoxComponent msgId: messageInfo.msgId } as CancelReservationRequest) .pipe( + take(1), map(async res => { if (res.responseCode === MessageStatusCode.Success) { } else { 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 062e74aa..dda9dcc0 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 @@ -466,6 +466,7 @@ export class MessageDetailDialogComponent implements OnInit { recvUserList } as CancelRequest) .pipe( + take(1), map(async res => { if (res.responseCode === MessageStatusCode.Success) { this.receivers = this.receivers.filter( From 20614ed4f04e41e1aea3cc2c8b69b752d00713bb Mon Sep 17 00:00:00 2001 From: khk Date: Tue, 3 Dec 2019 09:32:54 +0900 Subject: [PATCH 2/5] Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger # Conflicts: # projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html # projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.html --- .../ucap-webmessenger-app/src/assets/scss/global/_default.scss | 3 +++ 1 file changed, 3 insertions(+) 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 eb52afce..0dc5dba1 100644 --- a/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss +++ b/projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss @@ -8,6 +8,9 @@ body { position: relative; width: 100%; height: 100%; + min-width: 1160px; + min-height: 700px; + overflow: auto; padding: 0; margin: 0; color: #333; From 51a84ee42f7ad5e7e2cdf1dcf90d57c8e31dbacf Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 3 Dec 2019 14:30:41 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EC=B2=98=EB=A6=AC=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/store/account/authentication/effects.ts | 2 +- .../src/lib/protocols/login.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts index aff0ba2b..a59fdb02 100644 --- a/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts +++ b/projects/ucap-webmessenger-app/src/app/store/account/authentication/effects.ts @@ -275,7 +275,7 @@ export class Effects { } } - if (!!loginRes.passwordExpired) { + if (!loginRes.passwordValid) { const result = await this.dialogService.open< ChangePasswordDialogComponent, ChangePasswordDialogData, diff --git a/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts index 6d02b73e..5a678a3b 100644 --- a/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts +++ b/projects/ucap-webmessenger-protocol-authentication/src/lib/protocols/login.ts @@ -79,7 +79,8 @@ export interface LoginResponse extends ProtocolResponse { hardPhoneSadn: string; fmcSadn: string; pbxIndex: number; - passwordExpired: boolean; + /** PW 유효 여부(s) | Y : 유효함 N : 만료됨 */ + passwordValid: boolean; validAccount: boolean; validDevice: boolean; useableDevice: boolean; @@ -183,7 +184,7 @@ export const decodeLogin: ProtocolDecoder = ( hardPhoneSadn: message.bodyList[19], fmcSadn: message.bodyList[20], pbxIndex: message.bodyList[21], - passwordExpired: message.bodyList[22] === 'Y' ? true : false, + passwordValid: message.bodyList[22] === 'Y' ? true : false, validAccount: message.bodyList[23] === 'Y' ? true : false, validDevice: message.bodyList[24] === 'Y' ? true : false, useableDevice: message.bodyList[25] === 'Y' ? true : false, From ec60e33af17b5c25687bffab8d6ac78cc9268d41 Mon Sep 17 00:00:00 2001 From: leejinho Date: Tue, 3 Dec 2019 14:31:49 +0900 Subject: [PATCH 4/5] =?UTF-8?q?top-bar=20=EB=82=B4=20tooltip=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/layouts/native/components/top-bar.component.html | 5 +++++ .../src/app/layouts/native/native.layout.module.ts | 3 +++ 2 files changed, 8 insertions(+) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index b434a17d..9376dbd8 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -8,6 +8,10 @@ + + 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 new file mode 100644 index 00000000..fbe0c0ed --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.scss @@ -0,0 +1,45 @@ +@mixin ellipsis($row) { + overflow: hidden; + text-overflow: ellipsis; + @if $row == 1 { + display: block; + white-space: nowrap; + word-wrap: normal; + } @else if $row >= 2 { + display: -webkit-box; + -webkit-line-clamp: $row; + -webkit-box-orient: vertical; + word-wrap: break-word; + } +} + +::ng-deep .mat-card-header-text { + margin: 0; + .title { + width: 480px; + @include ellipsis(1); + } +} +.confirm-card { + min-width: 500px; + .mat-card-header { + margin-bottom: 20px; + .mat-card-header-text { + .mat-card-title { + margin: 0 -16px; + } + } + } + .button-farm { + text-align: right; + .mat-primary { + margin-left: 4px; + } + } +} + +.contnets { + max-height: 500px; + min-height: 400px; + word-break: break-word; +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.spec.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.spec.ts new file mode 100644 index 00000000..7a9834fb --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.spec.ts @@ -0,0 +1,27 @@ +/* tslint:disable:no-unused-variable */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; + +import { NoticeDetailDialogComponent } from './notice-detail.dialog.component'; + +describe('ProfileDialogComponent', () => { + let component: NoticeDetailDialogComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [NoticeDetailDialogComponent] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NoticeDetailDialogComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..79433b77 --- /dev/null +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.ts @@ -0,0 +1,30 @@ +import { Component, OnInit, Inject, ViewChild, OnDestroy } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; +import { NoticeList } from '@ucap-webmessenger/api-message'; + +export interface NoticeDetailDialogData { + notice: NoticeList; +} + +export interface NoticeDetailDialogResult {} + +@Component({ + selector: 'app-notice-detail.dialog', + templateUrl: './notice-detail.dialog.component.html', + styleUrls: ['./notice-detail.dialog.component.scss'] +}) +export class NoticeDetailDialogComponent implements OnInit { + constructor( + public dialogRef: MatDialogRef< + NoticeDetailDialogData, + NoticeDetailDialogResult + >, + @Inject(MAT_DIALOG_DATA) public data: NoticeDetailDialogData + ) {} + + ngOnInit() {} + + onClickConfirm(): void { + this.dialogRef.close(); + } +} diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 9376dbd8..99283e2b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -8,6 +8,28 @@ +