diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss index d6715ffe..25101ef4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss index 455d6526..a2dabdf2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss index 106d6133..bc6e6b61 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss index 4386c317..03bff650 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss index 17fdde5f..3ae8119f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss index efd28023..1345d827 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss index f99c844a..c0573878 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss index 2d1cd97d..5c4d507a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html index afeedb1c..c5514923 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html @@ -17,5 +17,6 @@ (toggleBuddy)="onClickToggleBuddy($event)" (uploadProfileImage)="onUploadProfileImage($event)" (updateIntro)="onUpdateIntro($event)" + (close)="onClose($event)" > 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 cfa3e5a8..4f98cdc2 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 @@ -463,4 +463,8 @@ export class ProfileDialogComponent implements OnInit, OnDestroy { }) ); } + + onClose() { + this.dialogRef.close(); + } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss index a54b7c76..dc54373b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/types/presence-type.type.ts b/projects/ucap-webmessenger-core/src/lib/types/presence.type.ts similarity index 100% rename from projects/ucap-webmessenger-ui-profile/src/lib/types/presence-type.type.ts rename to projects/ucap-webmessenger-core/src/lib/types/presence.type.ts diff --git a/projects/ucap-webmessenger-core/src/public-api.ts b/projects/ucap-webmessenger-core/src/public-api.ts index 002389f9..6ac6bb66 100644 --- a/projects/ucap-webmessenger-core/src/public-api.ts +++ b/projects/ucap-webmessenger-core/src/public-api.ts @@ -14,6 +14,7 @@ export * from './lib/types/file-transfer-permissions.type'; export * from './lib/types/locale-code.type'; export * from './lib/types/notification-method.type'; export * from './lib/types/organization-chart-permissions.type'; +export * from './lib/types/presence.type'; export * from './lib/types/push-type.type'; export * from './lib/types/status-code.type'; export * from './lib/types/status-type.type'; diff --git a/projects/ucap-webmessenger-pi/src/lib/services/pi.service.ts b/projects/ucap-webmessenger-pi/src/lib/services/pi.service.ts index a7b1e274..34161cf5 100644 --- a/projects/ucap-webmessenger-pi/src/lib/services/pi.service.ts +++ b/projects/ucap-webmessenger-pi/src/lib/services/pi.service.ts @@ -1,8 +1,8 @@ import { Injectable, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpRequest, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { map, filter } from 'rxjs/operators'; import { Login2Request, @@ -45,15 +45,22 @@ export class PiService { } public login2(req: Login2Request): Observable { - return this.httpClient - .post( - this.urls.login2, - {}, - { - params: encodeLogin2(req) + const httpReq = new HttpRequest( + 'POST', + this.urls.login2, + encodeLogin2(req), + { reportProgress: true } + ); + + return this.httpClient.request(httpReq).pipe( + filter(event => { + if (event instanceof HttpResponse) { + return true; } - ) - .pipe(map(res => decodeLogin2(res))); + return false; + }), + map(res => decodeLogin2((res as HttpResponse).body)) + ); } public userTermsAction( diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts index 523bb291..659e7395 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts @@ -1,8 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { NGXLogger } from 'ngx-logger'; -import { PresenceType } from '../types/presence-type.type'; import { StatusBulkInfo, StatusInfo } from '@ucap-webmessenger/protocol-status'; -import { StatusCode } from '@ucap-webmessenger/core'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; @Component({ selector: 'ucap-profile-my-profile-widget', diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index b462077e..0dc33777 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -384,4 +384,8 @@ + + diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss index dad02152..c8796a5d 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss @@ -12,7 +12,7 @@ word-wrap: break-word; } } -::ng-deep .mat-card-header-text { +.mat-card-header-text { .mat-card-subtitle { color: rgb(256, 256, 256, 0.7) !important; } @@ -262,3 +262,8 @@ margin-left: 8px; } } + + +.btn-dialog-close { + +} \ No newline at end of file diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts index 23876e54..72117a11 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts @@ -63,11 +63,12 @@ export class ProfileComponent implements OnInit { userInfo: UserInfoSS; isBuddy: boolean; }>(); - @Output() uploadProfileImage = new EventEmitter(); @Output() updateIntro = new EventEmitter(); + @Output() + close = new EventEmitter(); @ViewChild('profileImageFileInput', { static: false }) profileImageFileInput: ElementRef; @@ -250,4 +251,8 @@ export class ProfileComponent implements OnInit { } return rtn; } + + onClose() { + this.close.emit(); + } } diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts index 8daf0f1b..6f0e17cb 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts @@ -18,9 +18,7 @@ import { WorkStatusType } from '@ucap-webmessenger/protocol-status'; import { NGXLogger } from 'ngx-logger'; -import { StatusCode } from '@ucap-webmessenger/core'; - -import { PresenceType } from '../types/presence-type.type'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; @Component({ diff --git a/projects/ucap-webmessenger-ui-profile/src/public-api.ts b/projects/ucap-webmessenger-ui-profile/src/public-api.ts index 155f48c9..2f183b98 100644 --- a/projects/ucap-webmessenger-ui-profile/src/public-api.ts +++ b/projects/ucap-webmessenger-ui-profile/src/public-api.ts @@ -5,6 +5,4 @@ export * from './lib/components/list-item.component'; export * from './lib/components/user-list-item.component'; -export * from './lib/types/presence-type.type'; - export * from './lib/ucap-ui-profile.module'; 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 a7282736..ea5431d0 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 @@ -80,7 +80,7 @@ $thumbnail-msize: 40px; display: flex; flex: 0 0 auto; margin: 0; - padding: 0; + padding: 0 5px 0 0; .room-info { flex-direction: column; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts index 6f374da5..b692dee0 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts +++ b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts @@ -15,18 +15,9 @@ import { StatusBulkInfo, WorkStatusType } from '@ucap-webmessenger/protocol-status'; -import { StatusCode } from '@ucap-webmessenger/core'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; -export enum PresenceType { - PC = 'pc', - MOBILE = 'mobile', - CONFERENCE = 'conference', - MOBILE_CONFERENCE = 'mobileConference', - PHONE = 'phone', - IMESSENER = 'imessenger' -} - @Component({ selector: 'ucap-integrated-search', templateUrl: './integrated-search.component.html', diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss index 201ce5c0..0605ce89 100644 --- a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; }