내 프로필 위치 변경 :: left-side-nav > top-menu

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html

@@ -148,13 +148,6 @@
     </mat-tab> -->
   </mat-tab-group>
 
-  <ucap-profile-my-profile-widget
-    [profileImageRoot]="sessionVerinfo.profileRoot"
-    [profileImageFile]="getMyProfileImageWidget()"
-    (click)="onClickOpenProfile(loginRes.userInfo)"
-    class="myprofile"
-  ></ucap-profile-my-profile-widget>
-
   <div class="left-side-tabs-body">
     <div
       #tabs

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts

@@ -445,12 +445,4 @@ export class LeftSideComponent implements OnInit, OnDestroy {
   getMessageUnreadCount(): void {
     this.store.dispatch(MessageStore.retrieveUnreadCount({}));
   }
-
-  getMyProfileImageWidget(): string {
-    if (!!this.loginRes) {
-      return this.loginRes.userInfo.profileImageFile;
-    } else {
-      return '';
-    }
-  }
 }

projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html

@@ -147,6 +147,12 @@
       </svg>
     </button>
 
+    <ucap-profile-my-profile-widget
+      [profileImageRoot]="sessionVerinfo.profileRoot"
+      [profileImageFile]="getMyProfileImageWidget()"
+      (openProfile)="onClickOpenProfile()"
+      class="myprofile"
+    ></ucap-profile-my-profile-widget>
     <span class="stroke-bar"></span>
   </div>
   <div class="app-layout-native-title-bar-actions">

projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject, OnDestroy, ViewChild } from '@angular/core';
+import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
 import {
   UCAP_NATIVE_SERVICE,
   NativeService,
@@ -21,7 +21,8 @@ import {
   KEY_URL_INFO,
   LoginInfo,
   KEY_LOGIN_INFO,
-  KEY_LOGIN_RES_INFO
+  KEY_LOGIN_RES_INFO,
+  KEY_VER_INFO
 } from '@app/types';
 import {
   WebLink,
@@ -33,8 +34,18 @@ import {
 } from '@ucap-webmessenger/web-storage';
 import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type';
 import { environment } from '../../../../environments/environment';
-import { DaesangApiService } from '@ucap-webmessenger/daesang';
+import {
+  DaesangApiService,
+  DaesangProtocolService
+} from '@ucap-webmessenger/daesang';
 import { NGXLogger } from 'ngx-logger';
+import { VersionInfo2Response } from '@ucap-webmessenger/api-public';
+import {
+  ProfileDialogComponent,
+  ProfileDialogResult,
+  ProfileDialogData
+} from '@app/layouts/messenger/dialogs/profile/profile.dialog.component';
+import { DialogService } from '@ucap-webmessenger/ui';
 
 @Component({
   selector: 'app-layout-native-top-bar',
@@ -47,6 +58,7 @@ export class TopBarComponent implements OnInit, OnDestroy {
 
   loginRes: LoginResponse;
   loginResSubscription: Subscription;
+  sessionVerinfo: VersionInfo2Response;
 
   updateInfo$: Observable<UpdateInfo>;
 
@@ -59,11 +71,17 @@ export class TopBarComponent implements OnInit, OnDestroy {
   constructor(
     private store: Store<any>,
     @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService,
+    private dialogService: DialogService,
     private localStorageService: LocalStorageService,
     private sessionStorageService: SessionStorageService,
     private daesangApiService: DaesangApiService,
+    private daesangProtocolService: DaesangProtocolService,
     private logger: NGXLogger
-  ) {}
+  ) {
+    this.sessionVerinfo = this.sessionStorageService.get<VersionInfo2Response>(
+      KEY_VER_INFO
+    );
+  }
 
   ngOnInit() {
     this.windowStateChanged$ = this.nativeService.windowStateChanged();
@@ -223,6 +241,68 @@ export class TopBarComponent implements OnInit, OnDestroy {
     this.store.dispatch(AuthenticationStore.logoutConfirmation());
   }
 
+  getMyProfileImageWidget(): string {
+    if (!!this.loginRes) {
+      return this.loginRes.userInfo.profileImageFile;
+    } else {
+      return '';
+    }
+  }
+
+  onClickOpenProfile() {
+    // [GROUP]
+    // this.queryProtocolService
+    //   .dataUser({
+    //     divCd: 'OPENPROF',
+    //     seq: userInfo.seq,
+    //     senderCompanyCode: this.loginRes.userInfo.companyCode,
+    //     senderEmployeeType: this.loginRes.userInfo.employeeType
+    //   })
+    //   .pipe(
+    //     take(1),
+    //     map(res => {
+    //       if (!!res && !!res.userInfo) {
+    //         this.dialogService.open<
+    //           ProfileDialogComponent,
+    //           ProfileDialogData,
+    //           ProfileDialogResult
+    //         >(ProfileDialogComponent, {
+    //           data: {
+    //             userInfo: res.userInfo
+    //           }
+    //         });
+    //       }
+    //     })
+    //   )
+    //   .subscribe();
+
+    // [Daesang]
+    this.daesangProtocolService
+      .dataUserDaesang({
+        divCd: 'OPENPROF',
+        seq: this.loginRes.userSeq,
+        senderCompanyCode: this.loginRes.userInfo.companyCode,
+        senderEmployeeType: this.loginRes.userInfo.employeeType
+      })
+      .pipe(
+        take(1),
+        map(res => {
+          if (!!res && !!res.userInfo) {
+            this.dialogService.open<
+              ProfileDialogComponent,
+              ProfileDialogData,
+              ProfileDialogResult
+            >(ProfileDialogComponent, {
+              data: {
+                userInfo: res.userInfo
+              }
+            });
+          }
+        })
+      )
+      .subscribe();
+  }
+
   onClickNotice(): void {
     this.store.dispatch(
       ChatStore.selectedRightDrawer({

projects/ucap-webmessenger-app/src/app/layouts/native/native.layout.module.ts

@@ -7,6 +7,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatToolbarModule } from '@angular/material/toolbar';
 
 import { UCapUiModule } from '@ucap-webmessenger/ui';
+import { UCapUiProfileModule } from '@ucap-webmessenger/ui-profile';
 
 import { COMPONENTS } from './components';
 import { MatTooltipModule, MatBadgeModule } from '@angular/material';
@@ -20,7 +21,8 @@ import { MatTooltipModule, MatBadgeModule } from '@angular/material';
     MatTooltipModule,
     MatBadgeModule,
 
-    UCapUiModule
+    UCapUiModule,
+    UCapUiProfileModule
   ],
   exports: [...COMPONENTS],
   declarations: [...COMPONENTS],

projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts

@@ -5,7 +5,6 @@ import {
   Inject,
   OnDestroy,
   ViewChild,
-  ChangeDetectorRef,
   NgZone
 } from '@angular/core';
 
@@ -21,11 +20,10 @@ import { UserInfo } from '@ucap-webmessenger/protocol-sync';
 import {
   UserInfoSS,
   UserInfoF,
-  UserInfoDN,
-  QueryProtocolService
+  UserInfoDN
 } from '@ucap-webmessenger/protocol-query';
 import { StatusProtocolService } from '@ucap-webmessenger/protocol-status';
-import { StatusType, StatusCode, DeviceType } from '@ucap-webmessenger/core';
+import { StatusType, StatusCode } from '@ucap-webmessenger/core';
 import {
   DialogService,
   ConfirmDialogComponent,
@@ -48,19 +46,7 @@ import { DaesangProtocolService, SmsUtils } from '@ucap-webmessenger/daesang';
 import { CallService } from '@ucap-webmessenger/api-prompt';
 import { EnvironmentsInfo, KEY_ENVIRONMENTS_INFO } from '@app/types';
 import { SessionStorageService } from '@ucap-webmessenger/web-storage';
-import {
-  MessageApiService,
-  MessageType,
-  DetailRequest,
-  MessageDetailInfo,
-  DelRequest
-} from '@ucap-webmessenger/api-message';
-import { MessageStatusCode } from '@ucap-webmessenger/api';
-import {
-  MessageDetailDialogComponent,
-  MessageDetailDialogResult,
-  MessageDetailDialogData
-} from '@app/layouts/messenger/dialogs/message/message-detail.dialog.component';
+import { MessageApiService, MessageType } from '@ucap-webmessenger/api-message';
 
 @Component({
   selector: 'app-page-messenger-main',