From 88a341ca5886f0de10d7ecf804a93f45c2d3d728 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 1 Apr 2020 11:24:46 +0900
Subject: [PATCH] =?UTF-8?q?bugfix=20::=201.=20=EC=A1=B0=EC=A7=81=EB=8F=84?=
 =?UTF-8?q?=20=EB=B6=80=EC=84=9C=EC=9B=90=20=EC=A1=B0=ED=9A=8C=20=ED=9B=84?=
 =?UTF-8?q?=20=20=ED=81=B4=EB=A6=AD=EC=9C=BC=EB=A1=9C=20=20=ED=8A=B8?=
 =?UTF-8?q?=EB=A6=AC=20=EC=9D=B4=EB=8F=99.=202.=20=EC=A1=B0=EC=A7=81?=
 =?UTF-8?q?=EB=8F=84=EC=97=90=EC=84=9C=20=EB=8B=A4=EB=A5=B8=EB=B6=80?=
 =?UTF-8?q?=EC=84=9C=20=ED=81=B4=EB=A6=AD=203.=201=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=ED=9B=84=20=ED=81=B4=EB=A6=AD=ED=95=9C=20?=
 =?UTF-8?q?=EC=82=AC=EB=9E=8C=20=EB=8B=A4=EC=8B=9C=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=ED=9B=84=20=ED=81=B4=EB=A6=AD=20>>=20=EC=A1=B0=EC=A7=81?=
 =?UTF-8?q?=EB=8F=84=20=EC=9D=B4=EB=8F=99=20=EC=95=88=EB=90=A8.=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/left-side.component.html         |  1 -
 .../messenger/components/left-side.component.ts |  3 ---
 .../left-sidenav/organization-tree.component.ts | 17 ++++++++++++++++-
 .../components/main-contents.component.html     |  1 -
 .../components/main-contents.component.ts       |  7 +------
 .../main-contents/organization.component.ts     |  8 ++++----
 .../components/main.page.component.html         |  2 --
 .../messenger/components/main.page.component.ts |  6 ------
 .../src/app/store/messenger/query/actions.ts    |  5 +++++
 .../src/app/store/messenger/query/reducers.ts   | 10 +++++++++-
 .../src/app/store/messenger/query/state.ts      |  6 ++++++
 11 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
index 958686c3..339aea63 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
@@ -28,7 +28,6 @@
       "
     >
       <app-layout-chat-left-sidenav-organization-tree
-        [gotoDeptTree]="gotoDeptTree"
         class="organization-side"
       ></app-layout-chat-left-sidenav-organization-tree>
       <!-- <app-layout-chat-left-sidenav-organization
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
index 1e6e17f0..b9ec6fd4 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.ts
@@ -59,9 +59,6 @@ import { TranslateService } from '@ngx-translate/core';
   animations: ucapAnimations
 })
 export class LeftSideComponent implements OnInit, OnDestroy {
-  @Input()
-  gotoDeptTree: number;
-
   @Output()
   openProfile = new EventEmitter<{
     userSeq: number;
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization-tree.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization-tree.component.ts
index 16699925..42973256 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization-tree.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization-tree.component.ts
@@ -35,12 +35,13 @@ import { OrganizationService } from '@ucap-webmessenger/ui-organization';
   animations: ucapAnimations
 })
 export class OrganizationTreeComponent implements OnInit, OnDestroy {
-  @Input()
   gotoDeptTree: number;
 
   companyList$: Observable<Company[]>;
   companyCode: string;
 
+  changedTreeCurrentSeqSubscription: Subscription;
+
   departmentInfoList$: Observable<DeptInfo[]>;
   myDepartmentUserInfoListSubscription: Subscription;
 
@@ -76,6 +77,15 @@ export class OrganizationTreeComponent implements OnInit, OnDestroy {
       select(AppStore.MessengerSelector.QuerySelector.departmentInfoList)
     );
 
+    this.changedTreeCurrentSeqSubscription = this.store
+      .pipe(select(AppStore.MessengerSelector.QuerySelector.selectedTree))
+      .subscribe(curDeptSeq => {
+        if (!!curDeptSeq && curDeptSeq > -1) {
+          // 트리에 포커싱 되어야 할 deptseq 를 구독했다가 밀어 넣어준다.
+          this.gotoDeptTree = curDeptSeq;
+        }
+      });
+
     this.loginResSubscription = this.store
       .pipe(
         take(1),
@@ -137,6 +147,9 @@ export class OrganizationTreeComponent implements OnInit, OnDestroy {
     if (!!this.loginResSubscription) {
       this.loginResSubscription.unsubscribe();
     }
+    if (!!this.changedTreeCurrentSeqSubscription) {
+      this.changedTreeCurrentSeqSubscription.unsubscribe();
+    }
     if (!!this.myDepartmentUserInfoListSubscription) {
       this.myDepartmentUserInfoListSubscription.unsubscribe();
     }
@@ -168,6 +181,8 @@ export class OrganizationTreeComponent implements OnInit, OnDestroy {
   onSelectedOrganization(deptInfo: DeptInfo) {
     this.onClickCancel();
 
+    this.store.dispatch(QueryStore.selectedTree({ deptSeq: deptInfo.seq }));
+
     this.store.dispatch(
       QueryStore.selectedDept({
         seq: deptInfo.seq,
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.html
index 05987d7a..2b871b0e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.html
@@ -17,7 +17,6 @@
 <app-layout-messenger-organization
   (openProfile)="onClickOpenProfile($event)"
   (createConference)="onClickConferenceCreate($event)"
-  (gotoDeptTree)="onClickGotoDeptTree($event)"
   [style.display]="
     MainMenu.Organization === (this.gnbMenuIndex$ | async) ? 'block' : 'none'
   "
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.ts
index 718a1881..8bc260d5 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents.component.ts
@@ -20,10 +20,9 @@ export class MainContentsComponent implements OnInit {
   openProfile = new EventEmitter<{
     userSeq: number;
   }>();
+
   @Output()
   sendCall = new EventEmitter<string>();
-  @Output()
-  gotoDeptTree = new EventEmitter<number>();
 
   @Output()
   closeRightDrawer = new EventEmitter();
@@ -54,10 +53,6 @@ export class MainContentsComponent implements OnInit {
     this.sendCall.emit(calleeNumber);
   }
 
-  onClickGotoDeptTree(deptSeq: number) {
-    this.gotoDeptTree.emit(deptSeq);
-  }
-
   onCloseRightDrawer() {
     this.closeRightDrawer.emit();
   }
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
index 80c65968..79414605 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
@@ -32,6 +32,7 @@ import * as AppStore from '@app/store';
 import * as SettingsStore from '@app/store/messenger/settings';
 import * as SyncStore from '@app/store/messenger/sync';
 import * as ChatStore from '@app/store/messenger/chat';
+import * as QueryStore from '@app/store/messenger/query';
 
 import { Observable, Subscription, BehaviorSubject, merge, of } from 'rxjs';
 import { PresenceType, StatusCode } from '@ucap-webmessenger/core';
@@ -78,9 +79,6 @@ export class OrganizationComponent implements OnInit, OnDestroy {
   @Output()
   openProfile = new EventEmitter<number>();
 
-  @Output()
-  gotoDeptTree = new EventEmitter<number>();
-
   @Output()
   createConference = new EventEmitter<number[]>();
 
@@ -492,8 +490,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
 
     smsUtil.openSendSms(this.loginRes.tokenString, employeeNum);
   }
+
   onClickGotoDeptTree(deptSeq: number) {
-    this.gotoDeptTree.emit(deptSeq);
+    // 현재 트리에 포커싱 되어야 할 deptseq 를 지정.
+    this.store.dispatch(QueryStore.selectedTree({ deptSeq }));
   }
 
   /** Handling Filters */
diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
index 95649382..fa61237f 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
+++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
@@ -7,7 +7,6 @@
     <mat-drawer #leftSideDrawer mode="side" [disableClose]="true" opened>
       <app-layout-messenger-left-side
         #leftSideContainer
-        [gotoDeptTree]="gotoDeptTree"
         (openProfile)="onClickOpenProfile($event)"
         (sendCall)="sendClickToCall($event)"
         (sendSms)="openSms($event)"
@@ -29,7 +28,6 @@
       <app-layout-messenger-main-contents
         [selectedChat]="this.selectedChat$ | async"
         (openProfile)="onClickOpenProfile($event)"
-        (gotoDeptTree)="onClickGotoDeptTree($event)"
         (closeRightDrawer)="onCloseRightDrawer()"
         (sendCall)="sendClickToCall($event)"
         (createConference)="conferenceCreate($event)"
diff --git a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts
index 074b79ba..3e91d267 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.ts
@@ -101,8 +101,6 @@ export class MainPageComponent implements OnInit, OnDestroy {
   loginResSubscription: Subscription;
   environmentsInfo: EnvironmentsInfo;
 
-  gotoDeptTree: number;
-
   showLeftDrawer = true;
   showLeftDrawerIndicator = false;
   onLeftDrawerIndicator = false;
@@ -529,10 +527,6 @@ export class MainPageComponent implements OnInit, OnDestroy {
     }
   }
 
-  onClickGotoDeptTree(deptSeq: number) {
-    this.gotoDeptTree = deptSeq;
-  }
-
   onCloseRightDrawer() {
     this.rightDrawer.close();
   }
diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/query/actions.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/query/actions.ts
index b90d6757..61d88ab4 100644
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/query/actions.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/query/actions.ts
@@ -43,6 +43,11 @@ export const deptFailure = createAction(
   props<{ error: any }>()
 );
 
+export const selectedTree = createAction(
+  '[Messenger::Query] selected Department on tree Seq',
+  props<{ deptSeq: number }>()
+);
+
 /** 트리 > 부서 선택 > 부서원 조회 */
 export const selectedDept = createAction(
   '[Messenger::Query] selected Department on tree',
diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/query/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/query/reducers.ts
index 2e345db0..7d3b9e4f 100644
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/query/reducers.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/query/reducers.ts
@@ -16,7 +16,8 @@ import {
   integrateSearchDeptUser,
   integrateSearchDeptUserSuccess,
   integrateSearchDeptUserFailure,
-  integrateClearSearchDeptUser
+  integrateClearSearchDeptUser,
+  selectedTree
 } from './actions';
 
 import * as AuthenticationStore from '@app/store/account/authentication';
@@ -37,6 +38,13 @@ export const reducer = createReducer(
     };
   }),
 
+  on(selectedTree, (state, action) => {
+    return {
+      ...state,
+      selectedTree: action.deptSeq
+    };
+  }),
+
   on(selectedDept, (state, action) => {
     return {
       ...state,
diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/query/state.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/query/state.ts
index 96aa9912..6be30c0b 100644
--- a/projects/ucap-webmessenger-app/src/app/store/messenger/query/state.ts
+++ b/projects/ucap-webmessenger-app/src/app/store/messenger/query/state.ts
@@ -14,6 +14,7 @@ export interface State {
   isSearch: boolean;
   selectedDepartmentProcessing: boolean;
   selectedDepartment: SelectedDept | null;
+  selectedTree: number | null;
 
   searchDepartmentUserInfoList: UserInfoSS[] | null;
   departmentUserInfoList: UserInfoSS[] | null;
@@ -30,6 +31,7 @@ export const initialState: State = {
   isSearch: false,
   selectedDepartmentProcessing: false,
   selectedDepartment: null,
+  selectedTree: null,
 
   searchDepartmentUserInfoList: null,
   departmentUserInfoList: null,
@@ -56,6 +58,10 @@ export function selectors<S>(selector: Selector<any, State>) {
       selector,
       (state: State) => state.selectedDepartment
     ),
+    selectedTree: createSelector(
+      selector,
+      (state: State) => state.selectedTree
+    ),
 
     searchDepartmentUserInfoList: createSelector(
       selector,