비행 이력 loading 노출 작업중

src/components/crud/grid/GridDatatable.js

@@ -8,10 +8,11 @@ import {
   ChevronDown
 } from 'react-feather';
 import { useSelector } from 'react-redux';
-import { Card } from 'reactstrap';
 import LoadingSpinner from '../../../@core/components/spinner/Loading-spinner';
+import { Spinner } from 'reactstrap';
 export const GridDatabase = props => {
   const { loading } = useSelector(state => state.loadingReducer);
+
   return props[`${props.handlerPageChange ? 'total' : 'count'}`] <= 0 ? (
     <div className='no-dataTable'>표시할 데이터가 없습니다.</div>
   ) : (
@@ -41,7 +42,14 @@ export const GridDatabase = props => {
         noRowsPerPage: props.handlerPageChange ? true : false
       }}
       progressPending={props.handlerPageChange ? loading : false}
-      progressComponent={<LoadingSpinner />}
+      progressComponent={
+        <div className='grid-loading'>
+          <div>
+            <Spinner color='primary' />
+            <span>Loading...</span>
+          </div>
+        </div>
+      }
     />
   );
 };

src/modules/analysis/history/reducers/analysisHitoryReducer.ts

@@ -51,5 +51,6 @@ export const analysisHistoryReducer = createReducer<
     produce(state, draft => {
       draft.data = initResponseAnalysisHistoryData.data;
       draft.count = initResponseAnalysisHistoryData.count;
+      draft.total = initResponseAnalysisHistoryData.total;
     })
   );