From 2df1b0c3940d61ede0aa4fd4307d183c29a0cf47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sanguu=28=EB=B0=95=EC=83=81=ED=98=84=29?=
 <sanguu516@naver.com>
Date: Fri, 7 Oct 2022 16:22:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D-=ED=8E=98=EC=9D=B4=EC=A7=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/basis/flight/plan/FlightPlanGrid.js  |  8 ++++++--
 .../basis/flight/plan/FlightPlanContainer.js        | 13 +++++++++----
 .../basis/flight/actions/basisFlightAction.ts       | 10 +++++++++-
 .../basis/flight/reducers/basisFlightReducer.ts     |  4 +++-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js
index aed58fa..eebbb28 100644
--- a/src/components/basis/flight/plan/FlightPlanGrid.js
+++ b/src/components/basis/flight/plan/FlightPlanGrid.js
@@ -12,7 +12,9 @@ const FlightPlanGrid = ({
   paginationPerPage,
   paginationRowsPerPageOptions,
   isMyGroup,
-  user
+  user,
+  handlerPageChange,
+  total
 }) => {
   const { loading } = useSelector(state => state.loadingReducer);
   const columns = [
@@ -113,7 +115,9 @@ const FlightPlanGrid = ({
                   pagination={pagination}
                   paginationPerPage={paginationPerPage}
                   paginationRowsPerPageOptions={paginationRowsPerPageOptions}
-                  // pagination={props.pagination}
+                  handlerPageChange={handlerPageChange}
+                  total={total}
+                // pagination={props.pagination}
                 />
                 {/* 검색된 데이터가 없습니다. */}
               </div>
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index 5d0b399..f7d162b 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -33,7 +33,8 @@ const FlightPlanContainer = () => {
     list: planListData,
     detail: planDetailData,
     selectGroup,
-    areaCoordList
+    areaCoordList,
+    total
   } = useSelector(state => state.flightState);
   const { joinList, joinListCount, groupList, groupListCount } = useSelector(
     state => state.groupState
@@ -54,7 +55,7 @@ const FlightPlanContainer = () => {
   };
 
   const handleSearch = data => {
-    dispatch(FlightAction.FLIGHT_PLAN_LIST.request(data));
+    dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...data, page: 1 }));
   };
 
   const handleChangeSearchData = values => {
@@ -91,7 +92,7 @@ const FlightPlanContainer = () => {
       };
     });
 
-    dispatch(FlightAction.FLIGHT_PLAN_LIST.request(param));
+    dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...param, page: 1 }));
 
     let my = false;
     if (user.authId === 'SUPER') {
@@ -131,7 +132,9 @@ const FlightPlanContainer = () => {
   useEffect(() => {
     handlerGroupCancel();
   }, []);
-
+  const onChangePage = page => {
+    dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...searchData, page }));
+  };
   return (
     <CustomMainLayout title={'비행계획서 신청'}>
       <div className='pal-card-box'>
@@ -173,6 +176,8 @@ const FlightPlanContainer = () => {
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
                   isMyGroup={isMyGroup}
                   user={user}
+                  total={total}
+                  handlerPageChange={onChangePage}
                 />
               </>
             ) : (
diff --git a/src/modules/basis/flight/actions/basisFlightAction.ts b/src/modules/basis/flight/actions/basisFlightAction.ts
index 1380c34..30d5d4c 100644
--- a/src/modules/basis/flight/actions/basisFlightAction.ts
+++ b/src/modules/basis/flight/actions/basisFlightAction.ts
@@ -136,7 +136,15 @@ export const FLIGHT_PLAN_LIST = createAsyncAction(
   FLIGHT_PLAN_LIST_REQUEST,
   FLIGHT_PLAN_LIST_SUCCESS,
   FLIGHT_PLAN_LIST_FAILURE
-)<FlightPlanListRqData, [FlightPlanData], AxiosError>();
+)<
+  FlightPlanListRqData,
+  {
+    items: [FlightPlanData];
+    total: number;
+    count: number;
+  },
+  AxiosError
+>();
 
 // 상세
 export const FLIGHT_PLAN_DETAIL = createAsyncAction(
diff --git a/src/modules/basis/flight/reducers/basisFlightReducer.ts b/src/modules/basis/flight/reducers/basisFlightReducer.ts
index 240c3a4..2b283df 100644
--- a/src/modules/basis/flight/reducers/basisFlightReducer.ts
+++ b/src/modules/basis/flight/reducers/basisFlightReducer.ts
@@ -28,7 +28,9 @@ export const flightReducer = createReducer<FlightState, Actions.FlightAction>(
   .handleAction(Actions.FLIGHT_PLAN_LIST.success, (state, action) =>
     produce(state, draft => {
       const data = action.payload;
-      draft.list = data;
+      draft.list = data.items;
+      draft.total = data.total;
+      draft.conut = data.count;
     })
   )
   // 상세