From 6dbc64678c9c1e18571c88365bbef9999f915e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Mon, 1 Aug 2022 17:26:22 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=20groupId?=
 =?UTF-8?q?=20session=20storage=20=EB=B3=B4=EA=B4=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/basis/flight/plan/FlightPlanArcrft.js  |  3 +--
 src/components/basis/flight/plan/FlightPlanForm.js    | 11 +++++------
 .../basis/flight/plan/FlightPlanArcrftContainer.js    |  3 ++-
 .../basis/flight/plan/FlightPlanContainer.js          |  5 ++++-
 .../basis/flight/plan/FlightPlanPilotContainer.js     |  6 ++++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/basis/flight/plan/FlightPlanArcrft.js b/src/components/basis/flight/plan/FlightPlanArcrft.js
index f7e4c51..093d341 100644
--- a/src/components/basis/flight/plan/FlightPlanArcrft.js
+++ b/src/components/basis/flight/plan/FlightPlanArcrft.js
@@ -91,8 +91,7 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft }) => {
                     <div className='invoice-list-wrapper'>
                         <Card>
                             <div className='invoice-list-dataTable'>
-                                <GridDatabase
-                                    title={'조종사목록'}
+                                <GridDatabase                                    
                                     data={arcrftList}
                                     count={arcrftList ? arcrftList.length : 0}
                                     columns={columns}
diff --git a/src/components/basis/flight/plan/FlightPlanForm.js b/src/components/basis/flight/plan/FlightPlanForm.js
index a2e53d3..8ede4e8 100644
--- a/src/components/basis/flight/plan/FlightPlanForm.js
+++ b/src/components/basis/flight/plan/FlightPlanForm.js
@@ -21,7 +21,7 @@ import { X } from 'react-feather';
 
 
 const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => {
-    const {groupId ,areaList, pilotList, arcrftList} = data;
+    const {areaList, pilotList, arcrftList} = data;
     
     return (
         <Row>
@@ -335,8 +335,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
             </Col>
             <SelectModal 
                 modal={modal}
-                handleModal={handleModal}
-                groupId={groupId}
+                handleModal={handleModal}                
             />
         </Row>
     )
@@ -344,7 +343,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
 
 export default FlightPlanForm;
 
-const SelectModal = ({handleModal, modal, groupId}) => {
+const SelectModal = ({handleModal, modal}) => {
     let title = '';
     let description = '';
     let type = '';
@@ -354,14 +353,14 @@ const SelectModal = ({handleModal, modal, groupId}) => {
         isOpen = modal.pilot;
         title = '조종사 조회';
         type = 'pilot';
-        description = <FlightPlanPilotContainer handleModal={handleModal} type={type} groupId={groupId} />
+        description = <FlightPlanPilotContainer handleModal={handleModal} type={type} />
     }
 
     if(modal.arcrft) {
         isOpen = modal.arcrft;
         title = '기체 조회';
         type = 'arcrft';
-        description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} groupId={groupId} />;
+        description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} />;
     }
 
     if(modal.area) {
diff --git a/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js b/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js
index 57ff3fc..e6e377c 100644
--- a/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js
@@ -4,13 +4,14 @@ import FlightPlanArcrft from '../../../../components/basis/flight/plan/FlightPla
 import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
 // import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
 
-const FlightPlanArcrftContainer = ({handleModal, type, groupId}) => {
+const FlightPlanArcrftContainer = ({handleModal, type}) => {
     const dispatch = useDispatch();
     const { arcrftList } = useSelector(state => state.flightState);
 
 
     /* 기체 조회 */
     const handleSearch = () => {
+        const groupId = sessionStorage.getItem('groupId');
         
         if(groupId) {
             dispatch(Actions.FLIGHT_PLAN_ARCRFT_LIST.request(groupId));
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index f94f3bd..83d583b 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -1,5 +1,5 @@
 import React, {useEffect, useState} from 'react';
-import moment from 'moment';
+import moment, { suppressDeprecationWarnings } from 'moment';
 import {Link, Redirect, useHistory} from 'react-router-dom';
 import FlightPlanGrid from '../../../../components/basis/flight/plan/FlightPlanGrid';
 import {CustomMainLayout} from '../../../../components/layout/CustomMainLayout';
@@ -63,6 +63,9 @@ const FlightPlanContainer = () => {
 
         dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT( {cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm} ));
 
+        // groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
+        sessionStorage.setItem('groupId', groupId);
+
         setSerchData(prevState => {
             return {
                 ...prevState,
diff --git a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js
index 121d9f2..80efada 100644
--- a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js
@@ -3,13 +3,15 @@ import {useDispatch, useSelector} from 'react-redux';
 import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
 import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
 
-const FlightPlanPilotContainer = ({handleModal, type, groupId}) => {
+const FlightPlanPilotContainer = ({handleModal, type}) => {
     const dispatch = useDispatch();
     const { pilotList, selectGroup } = useSelector(state => state.flightState);
 
 
     /* 조종사 조회 */
-    const handleSearch = () => {        
+    const handleSearch = () => {            
+        const groupId = sessionStorage.getItem('groupId');
+        
         if(groupId) {
             dispatch(Actions.FLIGHT_PLAN_PILOT_LIST.request(groupId));
         }