Merge pull request #118 from Weflo-A/develop

Develop: 대시보드 이동시 id null 값 오류 해결
Weflo-A · Mar 10, 2024 · b7f1868 · b7f1868
2 parents 7f161e1 + a588055
commit b7f1868
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 47 deletions.
diff --git a/src/Router.tsx b/src/Router.tsx
@@ -8,56 +8,62 @@ import CostPartPage from './pages/CostPartPage';
 import EstimatePartPage from './pages/EstimatePartPage';
 import PurchasePartPage from './pages/PurchasePartPage';
 import TestDetailPage from './pages/TestDetailPage';
+import ScrollToTop from './components/common/ScrollToTop';
 
 const Router = () => {
   return (
     <BrowserRouter>
-      <NavBar />
-      <Routes>
-        <Route
-          path='/'
-          element={<Navigate replace to='/monitoring/drone-search' />}
-        />
-        {/* 드론 검색(조회) */}
-        <Route path='/monitoring/drone-search' element={<DroneSearchPage />} />
-        {/* 드론 목록 */}
-        <Route
-          path='/monitoring/drone-group/:groupId'
-          element={<DroneGroupPage />}
-        />
-        {/* 중고 거래 */}
-        <Route path='/trade' element={<PurchasePartPage />} />
-        {/* 대시보드 메인 */}
-        <Route
-          path='/drone-group/drone/:id/dashboard'
-          element={<DashBoard />}
-        />
-        {/* 대시보드 진단 상세 */}
-        <Route
-          path='/drone-group/drone/:id/dashboard/test'
-          element={<TestDetailPage />}
-        />
-        {/* 견적서 */}
-        <Route
-          path='/drone-group/drone/:id/estimate'
-          element={<EstimatePage />}
-        />
-        {/* 부품 구매 */}
-        <Route
-          path='/drone-group/drone/parts/purchase'
-          element={<PurchasePartPage />}
-        />
-        {/* 부품 예측 관리 */}
-        <Route
-          path='/drone-group/drone/parts/manage'
-          element={<EstimatePartPage />}
-        />
-        {/* 투입 비용 현황 */}
-        <Route
-          path='/drone-group/drone/parts/cost'
-          element={<CostPartPage />}
-        />
-      </Routes>
+      <ScrollToTop>
+        <NavBar />
+        <Routes>
+          <Route
+            path='/'
+            element={<Navigate replace to='/monitoring/drone-search' />}
+          />
+          {/* 드론 검색(조회) */}
+          <Route
+            path='/monitoring/drone-search'
+            element={<DroneSearchPage />}
+          />
+          {/* 드론 목록 */}
+          <Route
+            path='/monitoring/drone-group/:groupId'
+            element={<DroneGroupPage />}
+          />
+          {/* 중고 거래 */}
+          <Route path='/trade' element={<PurchasePartPage />} />
+          {/* 대시보드 메인 */}
+          <Route
+            path='/drone-group/drone/:id/dashboard'
+            element={<DashBoard />}
+          />
+          {/* 대시보드 진단 상세 */}
+          <Route
+            path='/drone-group/drone/:id/dashboard/test'
+            element={<TestDetailPage />}
+          />
+          {/* 견적서 */}
+          <Route
+            path='/drone-group/drone/:id/estimate'
+            element={<EstimatePage />}
+          />
+          {/* 부품 구매 */}
+          <Route
+            path='/drone-group/drone/parts/purchase'
+            element={<PurchasePartPage />}
+          />
+          {/* 부품 예측 관리 */}
+          <Route
+            path='/drone-group/drone/parts/manage'
+            element={<EstimatePartPage />}
+          />
+          {/* 투입 비용 현황 */}
+          <Route
+            path='/drone-group/drone/parts/cost'
+            element={<CostPartPage />}
+          />
+        </Routes>
+      </ScrollToTop>
     </BrowserRouter>
   );
 };

diff --git a/src/components/common/ScrollToTop.tsx b/src/components/common/ScrollToTop.tsx
@@ -0,0 +1,13 @@
+import { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+
+export default function ScrollToTop(props: any) {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    console.log('Scrolling to top');
+    window.scrollTo(0, 0);
+  }, [pathname]);
+
+  return <>{props.children}</>;
+}
diff --git a/src/components/onboarding/droneSearch/DroneLists.tsx b/src/components/onboarding/droneSearch/DroneLists.tsx
@@ -7,6 +7,7 @@ import { useNavigate } from 'react-router-dom';
 import { DroneGroupBox } from './DroneGroupBox';
 
 interface DroneInfo {
+  droneId: number;
   name: string;
   model: string;
   year: number;
@@ -52,7 +53,7 @@ function DroneLists({ data }: Props) {
                       </>
                     }
                     buttonType='accentLight'
-                    onClick={() => goToDashboard(index)}
+                    onClick={() => goToDashboard(data.droneId)}
                     style={{ width: '110px', height: '32px', fontSize: '14px' }}
                   />
                 </Drone>

diff --git a/src/components/onboarding/droneSearch/DroneSearch.tsx b/src/components/onboarding/droneSearch/DroneSearch.tsx
@@ -21,6 +21,8 @@ const DroneSearch: React.FC = () => {
     droneInfo: [],
   });
 
+  console.log('search', searchDrones);
+
   useEffect(() => {
     postSearch(searchTerm, selectedModels, selectedYears, selectedGroups).then(
       (res) => {