Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

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;
   }

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;
   }

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;
   }

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;
   }

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;
   }

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;
   }

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;
   }

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;
   }

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)"
 >
 </ucap-profile-profile>

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();
+  }
 }

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;
   }

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';

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<Login2Response> {
-    return this.httpClient
+    const httpReq = new HttpRequest(
-      .post<any>(
+      'POST',
-        this.urls.login2,
+      this.urls.login2,
-        {},
+      encodeLogin2(req),
-        {
+      { reportProgress: true }
-          params: encodeLogin2(req)
+    );
+
+    return this.httpClient.request(httpReq).pipe(
+      filter(event => {
+        if (event instanceof HttpResponse) {
+          return true;
         }
-      )
+        return false;
-      .pipe(map(res => decodeLogin2(res)));
+      }),
+      map(res => decodeLogin2((res as HttpResponse<any>).body))
+    );
   }
 
   public userTermsAction(

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',

projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html

@@ -384,4 +384,8 @@
       </div>
     </mat-card-actions>
   </mat-card-content>
+
+  <button class="icon-button btn-dialog-close" (click)="onClose()">
+    <i class="mdi mdi-window-close"></i>
+  </button>
 </mat-card>

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 {
+
+}

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<FileUploadItem>();
   @Output()
   updateIntro = new EventEmitter<string>();
+  @Output()
+  close = new EventEmitter();
 
   @ViewChild('profileImageFileInput', { static: false })
   profileImageFileInput: ElementRef<HTMLInputElement>;
@@ -250,4 +251,8 @@ export class ProfileComponent implements OnInit {
     }
     return rtn;
   }
+
+  onClose() {
+    this.close.emit();
+  }
 }

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 { StatusCode, PresenceType } from '@ucap-webmessenger/core';
-
-import { PresenceType } from '../types/presence-type.type';
 import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
 
 @Component({

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';

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;

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',

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;
   }