나의그룹목록 Grid 분리

src/components/basis/group/BasisGroupGrid.js

@@ -1,5 +1,5 @@
 import { GridDatabase } from '../../crud/grid/GridDatatable';
-import { Card } from 'reactstrap';
+import { Card, Row, Col, Button } from 'reactstrap';
 
 export const BasisGroupGrid = props => {
   return (
@@ -13,14 +13,14 @@ export const BasisGroupGrid = props => {
           <span className='search-case'>검색결과 총 {props.count}건</span>
         </div>
         {/* <div className='d-flex align-items-center'>
-              <Button.Ripple
+                <Button.Ripple
-                color='primary'
+                  color='primary'
-                size='sm'
+                  size='sm'
-                onClick={props.handlerGroupCreate}
+                  onClick={props.handlerGroupCreate}
-              >
+                >
-                그룹생성
+                  그룹생성
-              </Button.Ripple>
+                </Button.Ripple>
-            </div> */}
+              </div> */}
       </div>
       <div className='invoice-list-wrapper'>
         <Card>

src/components/basis/group/BasisGroupMyGrid.js

@@ -0,0 +1,46 @@
+import { GridDatabase } from '../../crud/grid/GridDatatable';
+import { Card, Row, Col, Button } from 'reactstrap';
+
+export const BasisGroupMyGrid = props => {
+  return (
+    <div className='pal-card-box'>
+      <Row>
+        <Col>
+          <>
+            <div className='cont-ti d-flex justify-content-between align-items-sm-center align-items-start flex-sm-row'>
+              <div>
+                <h4>{props.title} 목록</h4>
+                <span className='search-case'>검색결과 총 {props.count}건</span>
+              </div>
+              <div className='d-flex align-items-center'>
+                <Button.Ripple
+                  color='primary'
+                  size='sm'
+                  onClick={props.handlerGroupCreate}
+                >
+                  그룹생성
+                </Button.Ripple>
+              </div>
+            </div>
+            <div className='invoice-list-wrapper'>
+              <Card>
+                {/* <div className='grid-loading'>
+                <div><Spinner color='primary' /><span>Loading...</span></div>
+              </div> */}
+                <div className='invoice-list-dataTable'>
+                  <GridDatabase
+                    title={'비행이력'}
+                    data={props.data}
+                    count={props.count}
+                    columns={props.columns}
+                    pagination={props.pagination}
+                  />
+                </div>
+              </Card>
+            </div>
+          </>
+        </Col>
+      </Row>
+    </div>
+  );
+};

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -6,9 +6,8 @@ import { BasisGroupApprovalSearch } from '../../../components/basis/group/BasisG
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
-import * as GroupActions from '../../../modules/basis/group/actions/basisGroupAction';
-import { BasisGroupDronGrid } from '../../../components/basis/dron/BasisGroupDronGrid';
 import { InfoModal } from '../../../components/modal/InfoModal';
+import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 
 export const BasisGroupApprovalContainer = props => {
   const { aprvList, aprvCount } = useSelector(state => state.groupState);
@@ -135,8 +134,8 @@ export const BasisGroupApprovalContainer = props => {
         aprvYn: 'A'
       });
       dispatch(
-        GroupActions.JOIN_LIST.request({
+        // GroupActions.JOIN_LIST.request({
-          // Actions.JOIN_LIST.request({
+        Actions.JOIN_LIST.request({
           cstmrSno: user?.cstmrSno,
           groupId: selectData?.groupId
         })
@@ -357,7 +356,8 @@ export const BasisGroupApprovalContainer = props => {
       <div className='pal-card-box'>
         <Row>
           <Col sm='4'>
-            <BasisGroupDronGrid
+            {/* <BasisGroupDronGrid */}
+            <BasisGroupGrid
               data={joinList}
               title={'그룹'}
               columns={column}

src/containers/basis/group/BasisGroupContainer.js

@@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link, useHistory } from 'react-router-dom';
 import { Button } from 'reactstrap';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
+import { BasisGroupMyGrid } from '../../../components/basis/group/BasisGroupMyGrid';
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';
@@ -197,7 +197,7 @@ export const BasisGroupContainer = props => {
         params={params}
         setParams={setParams}
       /> */}
-      <BasisGroupGrid
+      <BasisGroupMyGrid
         data={myList}
         title={'그룹'}
         columns={columns}

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -50,7 +50,6 @@ export const BasisGroupUsersContainer = props => {
       sortable: true,
       cell: row => {
         return row?.groupNm;
-        // return selectData;
       }
     },
     {
@@ -178,11 +177,7 @@ export const BasisGroupUsersContainer = props => {
               n_disabled = true;
             }
           } else if (my.groupAuthCd === 'LEADER') {
-            if (row.groupAuthCd === 'MASTER') {
+            if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') {
-              m_disabled = true;
-              l_disabled = true;
-              n_disabled = true;
-            } else if (row.groupAuthCd === 'LEADER') {
               m_disabled = true;
               l_disabled = true;
               n_disabled = true;
@@ -196,7 +191,8 @@ export const BasisGroupUsersContainer = props => {
             l_disabled = true;
             n_disabled = true;
           }
-        } else if (user.authId === 'ROLE_USER') {
+          // } else if (user.authId === 'ROLE_USER') {
+        } else if (user.authId === 'USER') {
           if (my.groupAuthCd === 'MASTER') {
             if (row.groupAuthCd === 'LEADER') {
               l_disabled = true;
@@ -205,11 +201,7 @@ export const BasisGroupUsersContainer = props => {
               n_disabled = true;
             }
           } else if (my.groupAuthCd === 'LEADER') {
-            if (row.groupAuthCd === 'MASTER') {
+            if (row.groupAuthCd === 'MASTER' || row.groupAuthCd === 'LEADER') {
-              m_disabled = true;
-              l_disabled = true;
-              n_disabled = true;
-            } else if (row.groupAuthCd === 'LEADER') {
               m_disabled = true;
               l_disabled = true;
               n_disabled = true;
@@ -495,7 +487,7 @@ export const BasisGroupUsersContainer = props => {
               title={'그룹'}
               columns={columns}
               count={joinListCount}
-              pagination={true}
+              // pagination={true}
             />
           </Col>
           <Col sm='8'>

src/containers/system/auth/SystemAuthContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/code/SystemCodeContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Row, Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/menu/SystemMenuContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Row, Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';

src/containers/system/user/SystemUserContainer.js

@@ -6,7 +6,6 @@ import { Link, useHistory } from 'react-router-dom';
 
 import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { BasisGroupSearch } from '../../../components/basis/group/BasisGroupSearch';
-import { BasisGroupGrid } from '../../../components/basis/group/BasisGroupGrid';
 import { BasisGroupJoinGrid } from '../../../components/basis/group/BasisGroupJoinGrid';
 import { Badge, Button } from 'reactstrap';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';