merge

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { AnalysisHistoryGrid } from '../../../components/analysis/history/AnalysisHistoryGrid';
@@ -25,18 +25,10 @@ import { useHistory } from 'react-router-dom';
 import { MessageErrorModal } from '../../../components/message/MessageErrorModal';
 
 export const AnalysisHistoryContainer = props => {
-  const { data, count, searchParams, total } = useSelector(
+  const { data, count, searchParams, total, page } = useSelector(
     state => state.analysisHistoryState
   );
-  const initSearchData = {
-    //stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
-    //endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
-    // stDate: moment().set({ 'date': 1, 'h': 0, 'm': 0, 's': 0 }).format('YYYY-MM-DD HH:mm:ss'),
-    // endDate: moment().set({ 'h': 23, 'm': 59, 's': 59 }).format('YYYY-MM-DD HH:mm:ss'),
-    groupId: ''
-  };
 
-  const [searchData, setSearchData] = useState(initSearchData);
   const {
     list: aprvList,
     aprvProc,
@@ -47,8 +39,8 @@ export const AnalysisHistoryContainer = props => {
   );
   const { user } = useSelector(state => state.authState, shallowEqual);
 
-  const [isClick, setIsClick] = useState(-1);
+  // const [isClick, setIsClick] = useState(-1);
-  const [dateType, setDateType] = useState(1);
+  // const [dateType, setDateType] = useState(1);
 
   const [modal, setModal] = useState({
     isOpen: false,
@@ -57,9 +49,20 @@ export const AnalysisHistoryContainer = props => {
     color: ''
   });
 
+  const [params, setParams] = useState({
+    stDate: selectGroup.stDate
+      ? moment(selectGroup.stDate).format('YYYY-MM-DD')
+      : moment().subtract(7, 'day').format('YYYY-MM-DD'),
+    endDate: selectGroup.endDate
+      ? moment(selectGroup.endDate).format('YYYY-MM-DD')
+      : moment().subtract(0, 'day').format('YYYY-MM-DD'),
+    search1: selectGroup.search1 ? selectGroup.search1 : '',
+    groupId: selectGroup.groupId ? selectGroup.groupId : ''
+  });
+
   useEffect(() => {
     if (aprvProc && aprvProc.result > 0) {
-      handleSearch(searchData);
+      handlerSearch(params);
     }
   }, [aprvProc]);
 
@@ -77,20 +80,6 @@ export const AnalysisHistoryContainer = props => {
     }
   }, [user]);
 
-  useEffect(() => {
-    setParams({
-      ...params,
-      stDate: moment().subtract(7, 'day').format('YYYY-MM-DD'),
-      endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
-      search1: '',
-      groupId: searchData.groupId
-    });
-  }, [searchData.groupId]);
-
-  // useEffect(() => {
-  //   handlerGroupCancel();
-  // }, []);
-
   const onKeyPress = e => {
     if (e.key == 'Enter') {
       handlerSearch();
@@ -99,8 +88,8 @@ export const AnalysisHistoryContainer = props => {
 
   const handleGroupSelect = ({ groupId }) => {
     // 권한 상관 없이 모두 조회 가능
-    const param = searchData;
+    const param = params;
-    // param.cstmrSno = user.cstmrSno;
+
     param.groupId = groupId;
 
     dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ groupId: groupId }));
@@ -109,14 +98,8 @@ export const AnalysisHistoryContainer = props => {
     sessionStorage.setItem('groupId', groupId);
     sessionStorage.setItem('cstmrSno', user.cstmrSno);
 
-    setIsClick(7);
+    // setIsClick(7);
-    setSearchData(prevState => {
+    setParams(prevState => ({ ...prevState, groupId }));
-      return {
-        ...prevState,
-        //    cstmrSno: user.cstmrSno,
-        groupId: groupId
-      };
-    });
     dispatch(Actions.LIST_INITAL());
   };
   const handlerGroupCancel = () => {
@@ -126,10 +109,11 @@ export const AnalysisHistoryContainer = props => {
         groupId: '',
         groupNm: '',
         endDate: '',
-        stDate: ''
+        stDate: '',
+        search1: ''
       })
     );
-    setIsClick(0);
+    // setIsClick(0);
   };
 
   const dispatch = useDispatch();
@@ -243,13 +227,6 @@ export const AnalysisHistoryContainer = props => {
     }
   ];
 
-  const [params, setParams] = useState({
-    stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
-    endDate: moment().subtract(-1, 'day').format('YYYY-MM-DD'),
-    search1: '',
-    groupId: searchData.groupId
-  });
-
   const handlerSearch = () => {
     if (!params.stDate || !params.endDate) {
       setModal({
@@ -266,7 +243,8 @@ export const AnalysisHistoryContainer = props => {
         color: 'modal-danger'
       });
     } else {
-      dispatch(Actions.LIST_INITAL());
+      // dispatch(Actions.LIST_INITAL());
+      dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ ...params }));
       dispatch(Actions.list.request({ searchParams: params, page: 1 }));
     }
   };
@@ -282,18 +260,24 @@ export const AnalysisHistoryContainer = props => {
           stDate: moment(val[0]).format('YYYY-MM-DD'),
           endDate: moment(val[1]).format('YYYY-MM-DD')
         });
-        setIsClick(-1);
+        // setIsClick(-1);
       }
     }
   };
   const handlerClickDate = val => {
-    setDateType(val);
+    // setDateType(val);
-    setIsClick(val);
+    // setIsClick(val);
+    setParams(prev => ({
+      ...prev,
+      stDate: moment().subtract(val, 'day').format('YYYY-MM-DD'),
+      endDate: moment().subtract(0, 'day').format('YYYY-MM-DD')
+    }));
   };
 
   const handlerPageChange = page => {
     dispatch(Actions.list.request({ searchParams: params, page }));
   };
+
   return (
     <CustomMainLayout title={titleName}>
       {/* <div className='pal-card-box'> */}
@@ -341,10 +325,10 @@ export const AnalysisHistoryContainer = props => {
                   params={params}
                   onKeyPress={onKeyPress}
                   setParams={setParams}
-                  isClick={isClick}
+                  // isClick={isClick}
-                  dateType={dateType}
+                  // dateType={dateType}
                   handlerClickDate={handlerClickDate}
-                  searchData={searchData}
+                  searchData={params}
                 />
               </>
             ) : (
@@ -369,6 +353,7 @@ export const AnalysisHistoryContainer = props => {
                   pagination={true}
                   paginationPerPage={10}
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
+                  page={page}
                 />
               </>
             ) : (