관제과 페이지 팝업 url 수정

src/containers/flight/ControlApprovalsContainer.js

@@ -227,7 +227,7 @@ export default function ControlApprovalsContainer({ mode }) {
       window.screenY + window.outerHeight / 2 - popupHeight / 2
     );
     const option = `width=${popupWidth},height=${popupHeight},left=${popupX},top=${popupY}`;
-    popupRef.current = window.open('/control/rightMenu', 'NewWindow', option);
+    popupRef.current = window.open('/control/popup', 'NewWindow', option);
     // setPopupOption(option);
     setPopup(popupRef.current);
   };

src/containers/flight/OperationApprovalsContainer.js

@@ -271,7 +271,7 @@ export default function OperationApprovalsContainer({ mode }) {
       window.screenY + window.outerHeight / 2 - popupHeight / 2
     );
     const option = `width=${popupWidth},height=${popupHeight},left=${popupX},top=${popupY}`;
-    popupRef.current = window.open('/rightMenu', 'NewWindow', option);
+    popupRef.current = window.open('/operation/popup', 'NewWindow', option);
     // setPopupOption(option);
     setPopup(popupRef.current);
   };

src/containers/flight/popup/ControlApprovalsPopupContainer.js

@@ -5,7 +5,7 @@ import { getLaancAprvList } from '@src/redux/features/laanc/laancThunk';
 import ControlApprovalsTable from '@src/components/flight/ControlApprovalsTable';
 import NewFlightApprovalsReport from '@src/components/flight/NewFlightApprovalsReport';
 
-function ControlRightMenuContainer() {
+function ControlApprovalsPopupContainer() {
   const [filter, setFilter] = useState('');
   const [startDate, setStartDate] = useState(dayjs().format('YYYY-MM-DD'));
   const [endDate, setEndDate] = useState();
@@ -175,4 +175,4 @@ function ControlRightMenuContainer() {
   );
 }
 
-export default ControlRightMenuContainer;
+export default ControlApprovalsPopupContainer;

src/containers/flight/popup/OperationApprovalsPopupContainer.js

@@ -5,7 +5,7 @@ import { getLaancAprvList } from '@src/redux/features/laanc/laancThunk';
 import OperationApprovalsTable from '@src/components/flight/OperationApprovalsTable';
 import NewFlightApprovalsReport from '@src/components/flight/NewFlightApprovalsReport';
 
-function RightMenuContainer() {
+function OperationApprovalsPopupContainer() {
   const [filter, setFilter] = useState('');
   const [startDate, setStartDate] = useState(dayjs().format('YYYY-MM-DD'));
   const [endDate, setEndDate] = useState();
@@ -210,4 +210,4 @@ function RightMenuContainer() {
   );
 }
 
-export default RightMenuContainer;
+export default OperationApprovalsPopupContainer;

src/router/routes/index.js

@@ -7,7 +7,6 @@ import RouteWeather from './RouteWeather';
 import RouteLaance from './RouteLaance';
 import RouterCstmrService from './RouterCstmrService';
 import RouteStatistics from './RouteStatistics';
-import RouteFlight from './RouteFlight';
 
 // ** Document title
 const TemplateTitle = '%s - Dron Control System';
@@ -97,22 +96,26 @@ const Routes = [
       authRoute: true
     }
   },
-  {
+  // {
-    path: '/rightMenu',
+  //   path: '/operation/popup',
-    component: lazy(() => import('../../views/rightMenuView')),
+  //   component: lazy(() =>
-    layout: 'BlankLayout',
+  //     import('../../views/flight/popup/OperationApprovalsPopupView')
-    meta: {
+  //   ),
-      authRoute: true
+  //   layout: 'BlankLayout',
-    }
+  //   meta: {
-  },
+  //     authRoute: true
-  {
+  //   }
-    path: '/control/rightMenu',
+  // },
-    component: lazy(() => import('../../views/rightMenuView')),
+  // {
-    layout: 'BlankLayout',
+  //   path: '/control/popup',
-    meta: {
+  //   component: lazy(() =>
-      authRoute: true
+  //     import('../../views/flight/popup/ControlApprovalsPopupView')
-    }
+  //   ),
-  },
+  //   layout: 'BlankLayout',
+  //   meta: {
+  //     authRoute: true
+  //   }
+  // },
   {
     path: '/history/record/sample1',
     component: lazy(() =>
@@ -257,8 +260,10 @@ const GimpoControlRoutes = [
     }
   },
   {
-    path: '/control/rightMenu',
+    path: '/control/popup',
-    component: lazy(() => import('../../views/controlMenuView')),
+    component: lazy(() =>
+      import('../../views/flight/popup/ControlApprovalsPopupView')
+    ),
     layout: 'BlankLayout',
     meta: {
       authRoute: true,
@@ -266,8 +271,10 @@ const GimpoControlRoutes = [
     }
   },
   {
-    path: '/rightMenu',
+    path: '/operation/popup',
-    component: lazy(() => import('../../views/rightMenuView')),
+    component: lazy(() =>
+      import('../../views/flight/popup/OperationApprovalsPopupView')
+    ),
     layout: 'BlankLayout',
     meta: {
       authRoute: true,

src/views/controlMenuView.js

@@ -1,12 +0,0 @@
-import '@styles/react/libs/flatpickr/flatpickr.scss';
-import '@styles/react/libs/tables/react-dataTable-component.scss';
-import '../assets/css/custom.css';
-import ControlRightMenuContainer from '../containers/controlRightMenuContainer';
-
-export default function rightMenuView() {
-  return (
-    <div className='pal-container'>
-      <ControlRightMenuContainer />
-    </div>
-  );
-}

src/views/flight/popup/ControlApprovalsPopupView.js

@@ -0,0 +1,12 @@
+import '@styles/react/libs/flatpickr/flatpickr.scss';
+import '@styles/react/libs/tables/react-dataTable-component.scss';
+import '@src/assets/css/custom.css';
+import ControlApprovalsPopupContainer from '@src/containers/flight/popup/ControlApprovalsPopupContainer';
+
+export default function ControlApprovalsPopupView() {
+  return (
+    <div className='pal-container'>
+      <ControlApprovalsPopupContainer />
+    </div>
+  );
+}

src/views/flight/popup/OperationApprovalsPopupView.js

@@ -0,0 +1,12 @@
+import '@styles/react/libs/flatpickr/flatpickr.scss';
+import '@styles/react/libs/tables/react-dataTable-component.scss';
+import '@src/assets/css/custom.css';
+import OperationApprovalsPopupContainer from '@src/containers/flight/popup/OperationApprovalsPopupContainer';
+
+export default function OperationApprovalsPopupView() {
+  return (
+    <div className='pal-container'>
+      <OperationApprovalsPopupContainer />
+    </div>
+  );
+}

src/views/rightMenuView.js

@@ -1,13 +0,0 @@
-import '@styles/react/libs/flatpickr/flatpickr.scss';
-import '@styles/react/libs/tables/react-dataTable-component.scss';
-import '../assets/css/custom.css';
-import RightMenuContainer from '../containers/rightMenuContainer';
-import FlightApprovalsContainer from '../containers/flight/flightApprovalsContainer';
-
-export default function rightMenuView() {
-  return (
-    <div className='pal-container'>
-      <RightMenuContainer />
-    </div>
-  );
-}