Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/crud/grid/GridDatatable.js

@@ -43,7 +43,13 @@ export const GridDatabase = props => {
       }}
       progressPending={props.handlerPageChange ? loading : false}
       progressComponent={
-        <div style={{ width: '100%', height: '504px' }}>
+        <div
+          style={{
+            width: '100%',
+            height: '504px',
+            backgroundColor: 'rgba(35, 41, 58, 0.7)'
+          }}
+        >
           <div className='grid-loading'>
             <div>
               <Spinner color='primary' />

src/components/map/naver/dron/DronToast.js

@@ -11,24 +11,19 @@ import 'react-toastify/dist/ReactToastify.css';
 const DronToast = () => {
     const dispatch = useDispatch(); 
     
-    const { controlGpList } = useSelector(state => state.controlGpState);
     const { controlGpArcrftWarnList } = useSelector(state => state.controlGpLogState);    
     const [toastId, setToastId] = useState();    
 
     useEffect(() => {
         if (controlGpArcrftWarnList) {            
-            // console.log("===================================")
-            // console.log('tastID : ', toastId);
             if (!toastId) {
-                controlGpArcrftWarnList.forEach(warn => {                    
-                    // console.log("Warn ==> ", gps.controlWarnCd);
-                    // console.log("Noti ==> ", gps.controlWarnNotyCd);
-                    if (warn.controlWarnCd) {
-                        // console.log('warn CD : ', warn.controlWarnCd); 
 
+                for (let i=0; i<controlGpArcrftWarnList.length; i++) {
+                    
+                    if (controlGpArcrftWarnList[i].controlWarnCd) {
                         const id = toast.info(
                             toastRender(
-                                `${warn.idntfNum} 비정상 상황 알림`,
+                                `${controlGpArcrftWarnList[i].idntfNum} 비정상 상황 알림`,
                                 `경로 상에 비행 구역을 이탈했습니다.`
                             ),
                             {
@@ -36,25 +31,27 @@ const DronToast = () => {
                                 hideProgressBar: true,
                                 position: toast.POSITION.BOTTOM_RIGHT,
                                 onClick: () => {     
-                                    setToastId(null);
-                                    handleNotiClick(warn.controlId, warn.idntfNum);
+                                    handleNotiClick(controlGpArcrftWarnList[i].cntrlId, controlGpArcrftWarnList[i].idntfNum);
+                                    // setToastId(null);                                    
                                 },
                                 onClose: () => {
                                     setToastId(null);
                                 }
                             }
-                        )
+                        );
                 
                         setToastId(id);
 
-                        return false;
+                        break;
+                    }
                 }
-                })
             }
         }
     }, [controlGpArcrftWarnList]);
 
     const handleNotiClick = (controlId, idntfNum) => {
+        console.log(controlId + ', ' + idntfNum);
+
         dispatch(objectClickAction(controlId));
         dispatch(controlGpDtlAction.request(controlId));
         dispatch(controlGpFlightPlanAction.request(idntfNum));

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -256,7 +256,10 @@ export const AnalysisHistoryContainer = props => {
         desc: '그룹 선택 해주세요.',
         color: 'modal-danger'
       });
-    } else dispatch(Actions.list.request({ searchParams: params, page: 1 }));
+    } else {
+      dispatch(Actions.LIST_INITAL());
+      dispatch(Actions.list.request({ searchParams: params, page: 1 }));
+    }
   };
 
   const handlerInput = (type, val) => {