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

src/components/account/find/AccountFindPassword.js

@@ -57,9 +57,11 @@ export const AccountFindPassword = props => {
   const [isCrtfy, setIsCrtfy] = useState(false);
 
   useEffect(() => {
+    setIsRunning(true);
     if (isRunning) clearInterval(timer);
     return () => {
       clearInterval(timer);
+      setIsRunning(false);
     };
   }, []);
 
@@ -413,7 +415,9 @@ export const AccountFindPassword = props => {
                 비밀번호 확인
               </ModalHeader>
               <ModalBody>
-                <span class='etc-txt'>새로운 비밀번호로 변경해 주세요.</span>
+                <span className='etc-txt'>
+                  새로운 비밀번호로 변경해 주세요.
+                </span>
                 <FormGroup className='form-label-group position-relative has-icon-left'>
                   <InputGroup>
                     <InputGroupAddon addonType='prepend'>

src/components/account/find/AccountFindUserId.js

@@ -62,9 +62,11 @@ export const AccountFindUserId = props => {
   const [isCrtfy, setIsCrtfy] = useState(false);
 
   useEffect(() => {
+    setIsRunning(true);
     if (isRunning) clearInterval(timer);
     return () => {
       clearInterval(timer);
+      setIsRunning(false);
     };
   }, []);
 

src/containers/basis/dron/BasisDronContainer.js

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import { useEffect, useState } from 'react';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { useHistory,Link } from 'react-router-dom';
+import { useHistory, Link } from 'react-router-dom';
 import { Button, Col, Row } from 'reactstrap';
 import { BasisDronGrid } from '../../../components/basis/dron/BasisDronGrid';
 import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid';
@@ -128,7 +128,7 @@ export const BasisDronContainer = props => {
       cell: row => {
         return (
           <Link
-          to={`/basis/dron/detail/${row.arcrftSno}`}
+            to={`/basis/dron/detail/${row.arcrftSno}`}
           >
             상세보기
           </Link>
@@ -170,9 +170,10 @@ export const BasisDronContainer = props => {
   };
 
   const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => {
+
     if (
       // groupAuthCd === 'CREATER' ||
-      groupAuthCd === 'MASTER' ||
+      groupAuthCd === 'MASTER' || user.authId ==='SUPER' ||
       // (aprvlYn === 'Y' && groupAuthCd === 'ADMIN')
       (aprvlYn === 'Y' && groupAuthCd === 'LEADER')
     ) {

src/containers/basis/dron/BasisDronDetailContainer.js

@@ -124,6 +124,8 @@ export const BasisDronDetailContainer = props => {
       if (detail?.createUserId != user?.userId) {
         props.setIsDisabled(true);
       }
+    } if (user.authId === 'SUPER') {
+      props.setIsDisabled(false);
     }
   }, [selectData, detail]);
 

src/containers/basis/dron/BasisIdntfContainer.js

@@ -54,6 +54,8 @@ export const BasisIdntfContainer = props => {
       if (detail?.createUserId != user?.userId) {
         props.setIsDisabled(true);
       }
+    } if (user.authId === 'SUPER') {
+      props.setIsDisabled(false);
     }
   }, [detail]);
 

src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@@ -101,7 +101,11 @@ const FlightPlanAprvContainer = () => {
     param.cstmrSno = user.cstmrSno;
     param.groupId = groupId;
     // if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') {
-    if (groupAuthCd === 'MASTER' || groupAuthCd === 'LEADER') {
+    if (
+      groupAuthCd === 'MASTER' ||
+      groupAuthCd === 'LEADER' ||
+      user.authId === 'SUPER'
+    ) {
       dispatch(
         FlightAction.FLIGHT_PLAN_GROUP_SELECT({
           cstmrSno: user.cstmrSno,
@@ -173,7 +177,6 @@ const FlightPlanAprvContainer = () => {
     }));
   };
   const handleChangeSelected = ({ selectedRows }) => {
-    console.log(selectedRows);
     setSelPlanSnoList(selectedRows?.map(item => item.planSno));
   };
   // const handleChangeCheckbox = (e, row) => {

src/containers/basis/group/BasisGroupContainer.js

@@ -12,7 +12,7 @@ export const BasisGroupContainer = props => {
   const { myList, myListCount, mainList, mainListCount } = useSelector(
     state => state.groupState
   );
-    console.log(mainList);
+
   const { user } = useSelector(state => state.authState);
 
   const dispatch = useDispatch();

src/modules/basis/group/reducers/basisGroupReducer.ts

@@ -33,7 +33,6 @@ export const groupReducer = createReducer<GroupState, Actions.GroupAction>(
   .handleAction(Actions.GROUP_MAIN_LIST.success, (state, action) =>
     produce(state, draft => {
       const { data, count } = action.payload;
-      console.log(data);
       // const agreeList = data.filter(res => {
       //   if (res.aprvlYn === 'Y') {
       //     return res;