From d2b7c79d0ee0a450637a6891763366793e07c369 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: Thu, 6 Oct 2022 19:09:30 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC(=EB=A1=9C=EB=94=A9=EC=B0=BD=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/aprv/FlightPlanAprvGrid.js          | 12 +++++++++++-
 src/components/basis/flight/plan/FlightPlanGrid.js   | 12 +++++++++++-
 .../basis/flight/plan/FlightPlanContainer.js         |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
index 2ef5152..a69ff1a 100644
--- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
+++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js
@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Card, Col, Row, CustomInput } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Link } from 'react-router-dom';
 import { selectableRowsComponent } from '../../../crud/grid/selectableRowsComponent';
+import { useSelector } from 'react-redux';
 
 const FlightPlanAprvGrid = ({
   data,
@@ -17,6 +18,7 @@ const FlightPlanAprvGrid = ({
   paginationRowsPerPageOptions
 }) => {
   const [aprvAuth, setAprvAuth] = useState('');
+  const { loading } = useSelector(state => state.loadingReducer);
 
   useEffect(() => {
     joinList.forEach(c => {
@@ -126,6 +128,14 @@ const FlightPlanAprvGrid = ({
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={data}
diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js
index 6fbfb37..0418c36 100644
--- a/src/components/basis/flight/plan/FlightPlanGrid.js
+++ b/src/components/basis/flight/plan/FlightPlanGrid.js
@@ -1,10 +1,12 @@
 import React from 'react';
-import { Button, Card, Col, Row } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Redirect } from 'react-router-dom';
 import { Link, useHistory } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 
 const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage, paginationRowsPerPageOptions }) => {
+  const { loading } = useSelector(state => state.loadingReducer);
   const columns = [
     { id: 'planSno', name: '번호', cell: (row, i) => <div>{i + 1}</div> },
     {
@@ -64,6 +66,14 @@ const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage,
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={planListData}
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index d9e87cb..96e150d 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -173,6 +173,7 @@ const FlightPlanContainer = () => {
                   pagination={true}
                   paginationPerPage={10}
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
+                // handlerPageChange={handlerPageChange}
                 // columns={columns}
                 />
               </>