[api꼬임 수정] - 비행계획목록

src/containers/basis/flight/plan/FlightPlanContainer.js

@@ -1,16 +1,17 @@
 import React, { useEffect, useState } from 'react';
-import moment, { suppressDeprecationWarnings } from 'moment';
+import moment from 'moment';
-import { Link, Redirect, useHistory } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import FlightPlanGrid from '../../../../components/basis/flight/plan/FlightPlanGrid';
 import { CustomMainLayout } from '../../../../components/layout/CustomMainLayout';
 import FlightPlanSearch from '../../../../components/basis/flight/plan/FlightPlanSearch';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import * as FlightAction from '../../../../modules/basis/flight/actions/basisFlightAction';
-import { FlightPlanListRqData } from '../../../../modules/basis/flight/models/basisFlightModel';
 import { Row, Col, Button } from 'reactstrap';
-import { JOIN_LIST } from '../../../../modules/basis/group/actions/basisGroupAction';
+import {
+  JOIN_LIST,
+  GROUP_LIST
+} from '../../../../modules/basis/group/actions/basisGroupAction';
 import FlightPlanGroupGrid from '../../../../components/basis/flight/plan/FlightPlanGroupGrid';
-import { BasisGroupDronGrid } from '../../../../components/basis/dron/BasisGroupDronGrid';
 
 const initSearchData = {
   schFltStDt: moment()
@@ -34,7 +35,9 @@ const FlightPlanContainer = () => {
     selectGroup,
     areaCoordList
   } = useSelector(state => state.flightState);
-  const { joinList, joinListCount } = useSelector(state => state.groupState);
+  const { joinList, joinListCount, groupList, groupListCount } = useSelector(
+    state => state.groupState
+  );
   const { user } = useSelector(state => state.authState, shallowEqual);
 
   const [params, setParams] = useState({});
@@ -102,12 +105,16 @@ const FlightPlanContainer = () => {
 
   useEffect(() => {
     if (user?.cstmrSno) {
+      if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
+        dispatch(GROUP_LIST.request(user.cstmrSno));
+      } else {
         dispatch(
           JOIN_LIST.request({
             cstmrSno: user?.cstmrSno
           })
         );
       }
+    }
   }, [user]);
 
   useEffect(() => {
@@ -118,7 +125,7 @@ const FlightPlanContainer = () => {
     <CustomMainLayout title={'비행계획서 신청'}>
       <div className='pal-card-box'>
         <Row>
-          <Col sm='4'>
+          {/* <Col sm='4'>
             <FlightPlanGroupGrid
               data={joinList}
               count={joinListCount}
@@ -126,6 +133,25 @@ const FlightPlanContainer = () => {
               handleGroupSelect={handleGroupSelect}
               handlerGroupCancel={handlerGroupCancel}
             />
+          </Col> */}
+          <Col sm='4'>
+            {user ? (
+              <>
+                <FlightPlanGroupGrid
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
+                    ? { data: groupList }
+                    : { data: joinList })}
+                  {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
+                    ? { count: groupListCount }
+                    : { count: joinListCount })}
+                  selectGroup={selectGroup}
+                  handleGroupSelect={handleGroupSelect}
+                  handlerGroupCancel={handlerGroupCancel}
+                />
+              </>
+            ) : (
+              <></>
+            )}
           </Col>
           <Col sm='8'>
             {selectGroup.cstmrSno !== 0 ? (