비행계획관리 그룹선택 데이터 분리작업

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -33,7 +33,8 @@ const FlightPlanAprvContainer = () => {
   const {
     list: aprvList,
     aprvProc,
-    selectGroup,
+    // selectGroup,
+    aprvSelect,
     total
   } = useSelector(state => state.flightState);
   const { joinList, joinListCount, groupList, groupListCount } = useSelector(
@@ -91,7 +92,8 @@ const FlightPlanAprvContainer = () => {
       name: '',
       sortable: true,
       cell: row => {
-        return selectGroup?.groupId === row?.groupId ? (
+        // return selectGroup?.groupId === row?.groupId ? (
+        return aprvSelect?.groupId === row?.groupId ? (
           <Button.Ripple
             color='danger'
             className='badge badge-danger'
@@ -130,7 +132,12 @@ const FlightPlanAprvContainer = () => {
     param.groupId = groupId;
 
     dispatch(
-      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      // FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      //   cstmrSno: user.cstmrSno,
+      //   groupId: groupId,
+      //   groupNm: groupNm
+      // })
+      FlightAction.FLIGHT_PLAN_APRV_GROUP_SELECT({
         cstmrSno: user.cstmrSno,
         groupId: groupId,
         groupNm: groupNm
@@ -168,7 +175,8 @@ const FlightPlanAprvContainer = () => {
 
   const handlerGroupCancel = () => {
     dispatch(
-      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      // FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      FlightAction.FLIGHT_PLAN_APRV_GROUP_SELECT({
         cstmrSno: 0,
         groupId: '',
         groupNm: ''
@@ -177,10 +185,10 @@ const FlightPlanAprvContainer = () => {
   };
 
   // 최초 비행계획서 목록 조회
-  useEffect(() => {
-    handlerGroupCancel();
-    // handleSearch(searchData);
-  }, []);
+  // useEffect(() => {
+  //   handlerGroupCancel();
+  //   // handleSearch(searchData);
+  // }, []);
   useEffect(() => {
     if (user?.cstmrSno) {
       if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
@@ -284,7 +292,8 @@ const FlightPlanAprvContainer = () => {
           </Col>
           {/* <Col sm='8'> */}
           <Col sm='12' lg='12'>
-            {selectGroup.cstmrSno !== 0 ? (
+            {/* {selectGroup.cstmrSno !== 0 ? ( */}
+            {aprvSelect.cstmrSno !== 0 ? (
               <>
                 <FlightPlanAprvSearch
                   searchData={searchData}
@@ -298,7 +307,8 @@ const FlightPlanAprvContainer = () => {
                   {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
                     ? { joinList: groupList }
                     : { joinList: joinList })}
-                  selectGroup={selectGroup}
+                  // selectGroup={selectGroup}
+                  selectGroup={aprvSelect}
                   handleChangeSelected={handleChangeSelected}
                   selPlanSnoList={selPlanSnoList}
                   setSelPlanSnoList={setSelPlanSnoList}

src/containers/basis/flight/plan/FlightPlanContainer.js

@@ -32,7 +32,8 @@ const FlightPlanContainer = () => {
   const {
     list: planListData,
     detail: planDetailData,
-    selectGroup,
+    listSelect,
+    // selectGroup,
     areaCoordList,
     total
   } = useSelector(state => state.flightState);
@@ -79,7 +80,8 @@ const FlightPlanContainer = () => {
     param.groupId = groupId;
 
     dispatch(
-      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      // FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      FlightAction.FLIGHT_PLAN_LIST_GROUP_SELECT({
         cstmrSno: user.cstmrSno,
         groupId: groupId,
         groupNm: groupNm
@@ -118,7 +120,8 @@ const FlightPlanContainer = () => {
 
   const handlerGroupCancel = () => {
     dispatch(
-      FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      // FlightAction.FLIGHT_PLAN_GROUP_SELECT({
+      FlightAction.FLIGHT_PLAN_LIST_GROUP_SELECT({
         cstmrSno: 0,
         groupId: '',
         groupNm: ''
@@ -140,9 +143,9 @@ const FlightPlanContainer = () => {
     }
   }, [user]);
 
-  useEffect(() => {
-    handlerGroupCancel();
-  }, []);
+  // useEffect(() => {
+  //   handlerGroupCancel();
+  // }, []);
   const onChangePage = page => {
     dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...searchData, page }));
   };
@@ -160,7 +163,8 @@ const FlightPlanContainer = () => {
                   {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
                     ? { count: groupListCount }
                     : { count: joinListCount })}
-                  selectGroup={selectGroup}
+                  // selectGroup={selectGroup}
+                  selectGroup={listSelect}
                   handleGroupSelect={handleGroupSelect}
                   handlerGroupCancel={handlerGroupCancel}
                   pagination={true}
@@ -172,7 +176,8 @@ const FlightPlanContainer = () => {
             )}
           </Col>
           <Col sm='12' lg='12'>
-            {selectGroup.cstmrSno !== 0 ? (
+            {/* {selectGroup.cstmrSno !== 0 ? ( */}
+            {listSelect.cstmrSno !== 0 ? (
               <>
                 <FlightPlanSearch
                   searchData={searchData}

src/modules/basis/flight/actions/basisFlightAction.ts

@@ -80,6 +80,10 @@ const AREA_DETAIL_LIST = 'basis/flight/plan/area/DETAIL_LIST';
 
 // 비행계획서 그룹 선택
 const ROUP_SELECT = 'basis/flight/plan/group/select';
+// 비행계획서 그룹 선택(목록)
+const LIST_GROUP_SELECT = 'basis/flight/plan/group/list/select';
+// 비행계획서 그룹 선택(승인)
+const APRV_GROUP_SELECT = 'basis/flight/plan/group/aprv/select';
 
 // 조종사, 기체 선택 초기화
 const AREA_DETAIL_INITIAL = 'basis/flight/plan/detail/AREA_DETAIL_INIT';
@@ -224,6 +228,14 @@ export const AREA_DETAIL_LIST_SAVE =
 export const FLIGHT_PLAN_GROUP_SELECT =
   createAction(ROUP_SELECT)<SelectGroupData>();
 
+// 비행 계획서 그룹 선택(목록)
+export const FLIGHT_PLAN_LIST_GROUP_SELECT =
+  createAction(LIST_GROUP_SELECT)<SelectGroupData>();
+
+// 비행 계획서 그룹 선택(승인)
+export const FLIGHT_PLAN_APRV_GROUP_SELECT =
+  createAction(APRV_GROUP_SELECT)<SelectGroupData>();
+
 // 비행 구역 상세 값 초기화
 export const AREA_DETAIL_INIT = createAction(AREA_DETAIL_INITIAL)();
 
@@ -285,6 +297,8 @@ const actions = {
   AREA_COORDINATE_LIST_SAVE,
   AREA_DETAIL_LIST_SAVE,
   FLIGHT_PLAN_GROUP_SELECT,
+  FLIGHT_PLAN_APRV_GROUP_SELECT,
+  FLIGHT_PLAN_LIST_GROUP_SELECT,
   FLIGHT_PLAN_AREA_BUFFER_LIST,
   AREA_DETAIL_INIT,
   FLIGHT_APRV_LIST,

src/modules/basis/flight/models/basisFlightModel.ts

@@ -11,7 +11,6 @@ export interface FlightState {
   arcrftSelect: FlightPlanArcrftData | undefined;
   areaCoordList: FlightPlanAreaData[] | undefined;
   areaList: FlightPlanAreaData[] | undefined;
-  selectGroup: SelectGroupData | undefined;
   aprvList: [FlightPlanData] | undefined;
   aprvProc: any | undefined;
   scheduleList: BasFlightScheduleList[] | [];
@@ -19,6 +18,9 @@ export interface FlightState {
   total: number | 0;
   conut: number | 0;
   weather: resweatherData | undefined;
+  selectGroup: SelectGroupData | undefined;
+  listSelect: SelectGroupData | undefined;
+  aprvSelect: SelectGroupData | undefined;
 }
 export interface weatherData {
   serviceKey: string;
@@ -242,6 +244,16 @@ export const initFlight = {
     groupId: '',
     groupNm: ''
   },
+  listSelect: {
+    cstmrSno: 0,
+    groupId: '',
+    groupNm: ''
+  },
+  aprvSelect: {
+    cstmrSno: 0,
+    groupId: '',
+    groupNm: ''
+  },
   publicAreaList: undefined,
   flightPlanArea: undefined,
   list: undefined,

src/modules/basis/flight/reducers/basisFlightReducer.ts

@@ -105,6 +105,21 @@ export const flightReducer = createReducer<FlightState, Actions.FlightAction>(
       draft.selectGroup = data;
     })
   )
+  // 비행 계획서 그룹 선택(목록)
+  .handleAction(Actions.FLIGHT_PLAN_LIST_GROUP_SELECT, (state, action) =>
+    produce(state, draft => {
+      const data = action.payload;
+      draft.listSelect = data;
+    })
+  )
+  // 비행 계획서 그룹 선택(목록)
+  .handleAction(Actions.FLIGHT_PLAN_APRV_GROUP_SELECT, (state, action) =>
+    produce(state, draft => {
+      const data = action.payload;
+      draft.aprvSelect = data;
+    })
+  )
+
   // 비행 계획서 버퍼 영역 조회
   .handleAction(Actions.FLIGHT_PLAN_AREA_BUFFER_LIST.success, (state, action) =>
     produce(state, draft => {