From a99cf15fbce795cbec66c4c8498931fb2f0289f6 Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Thu, 25 Jul 2024 13:42:53 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=EA=B3=BC=20=EC=A7=80?=
 =?UTF-8?q?=EC=97=AD=20select=20option=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/NewFlightApprovalsReport.js        | 22 ++++++-------------
 src/containers/controlRightMenuContainer.js   |  1 +
 .../flight/ControlApprovalsContainer.js       |  1 +
 .../flight/OperationApprovalsContainer.js     |  1 +
 src/containers/rightMenuContainer.js          |  1 +
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js
index e0fbc5ef..7bd1fa10 100644
--- a/src/components/flight/NewFlightApprovalsReport.js
+++ b/src/components/flight/NewFlightApprovalsReport.js
@@ -119,21 +119,13 @@ export default function NewFlightApprovalsReport(props) {
                 })
               }
             >
-              {location.pathname === '/operation/approvals' || '/rightMenu'
-                ? DistrictCategories['operation'][props.filterArea.ctprvn]?.map(
-                    district => (
-                      <option key={district} value={district}>
-                        {district}
-                      </option>
-                    )
-                  )
-                : DistrictCategories['control'][props.filterArea.ctprvn]?.map(
-                    district => (
-                      <option key={district} value={district}>
-                        {district}
-                      </option>
-                    )
-                  )}
+              {DistrictCategories[props.pageName][props.filterArea.ctprvn]?.map(
+                district => (
+                  <option key={district} value={district}>
+                    {district}
+                  </option>
+                )
+              )}
             </CustomInput>
           </div>
           <div className='list-input'>
diff --git a/src/containers/controlRightMenuContainer.js b/src/containers/controlRightMenuContainer.js
index 5edbc2c9..ea4c0b34 100644
--- a/src/containers/controlRightMenuContainer.js
+++ b/src/containers/controlRightMenuContainer.js
@@ -147,6 +147,7 @@ function ControlRightMenuContainer() {
             setFilterId={setFilterId}
             filterArea={filterArea}
             setFilterArea={setFilterArea}
+            pageName='control'
           />
           <ControlApprovalsTable
             filter={filter}
diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js
index 7e19d1a0..97012388 100644
--- a/src/containers/flight/ControlApprovalsContainer.js
+++ b/src/containers/flight/ControlApprovalsContainer.js
@@ -695,6 +695,7 @@ export default function ControlApprovalsContainer({ mode }) {
                 setFilterId={setFilterId}
                 filterArea={filterArea}
                 setFilterArea={setFilterArea}
+                pageName='control'
               />
               <ControlApprovalsTable
                 filter={filter}
diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index efd03a83..d1a69884 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -799,6 +799,7 @@ export default function OperationApprovalsContainer({ mode }) {
                 setFilterId={setFilterId}
                 filterArea={filterArea}
                 setFilterArea={setFilterArea}
+                pageName='operation'
               />
               <OperationApprovalsTable
                 filter={filter}
diff --git a/src/containers/rightMenuContainer.js b/src/containers/rightMenuContainer.js
index a42db109..fd20e441 100644
--- a/src/containers/rightMenuContainer.js
+++ b/src/containers/rightMenuContainer.js
@@ -181,6 +181,7 @@ function RightMenuContainer() {
             setFilterId={setFilterId}
             filterArea={filterArea}
             setFilterArea={setFilterArea}
+            pageName='operation'
           />
           <OperationApprovalsTable
             filter={filter}