From 017b1590ab299e6fb56c8a8fdcb0699d298384d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Mon, 26 Sep 2022 16:32:56 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?=
 =?UTF-8?q?=ED=99=A9=20=EC=95=8C=EB=A6=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/naver/dron/DronToast.js | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/components/map/naver/dron/DronToast.js b/src/components/map/naver/dron/DronToast.js
index 1630b92..bbfa6d4 100644
--- a/src/components/map/naver/dron/DronToast.js
+++ b/src/components/map/naver/dron/DronToast.js
@@ -10,51 +10,48 @@ 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 (controlGpArcrftWarnList) {            
             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} 비정상 상황 알림`,
                                 `경로 상에 비행 구역을 이탈했습니다.`
                             ),
                             {
                                 autoClose: false, 
                                 hideProgressBar: true,
                                 position: toast.POSITION.BOTTOM_RIGHT,
-                                onClick: () => {                         
-                                    setToastId(null);
-                                    handleNotiClick(warn.controlId, warn.idntfNum);
+                                onClick: () => {     
+                                    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));

From dd349bdf8595ed7cdbc1d75b5a0d97cff1cc5156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= <kjh@palnet.co.kr>
Date: Mon, 26 Sep 2022 17:29:34 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=EA=B2=80=EC=83=89=EC=98=B5=EC=85=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/crud/grid/GridDatatable.js                 | 8 +++++++-
 .../analysis/history/AnalysisHistoryContainer.js          | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/crud/grid/GridDatatable.js b/src/components/crud/grid/GridDatatable.js
index 167d1c1..76f1c1f 100644
--- a/src/components/crud/grid/GridDatatable.js
+++ b/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' />
diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index 582dd4e..d40d094 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/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) => {