Merge pull request #97 from intellica-tech/DVT-84

fix: DVT-84
intellica-tech · Dec 29, 2023 · 4a72934 · 4a72934
2 parents 4c70893 + e27f3f1
commit 4a72934
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/superset-frontend/src/components/DvtNavigation/index.tsx b/superset-frontend/src/components/DvtNavigation/index.tsx
@@ -49,4 +49,5 @@ const DvtNavigation: React.FC<DvtNavigationProps> = ({ data }) => (
       ))}
   </StyledDvtNavigation>
 );
+
 export default DvtNavigation;
diff --git a/superset-frontend/src/views/dvt-layout.tsx b/superset-frontend/src/views/dvt-layout.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { Suspense } from 'react';
-import { Switch, Route, useHistory } from 'react-router-dom';
+import { Switch, Route, useLocation } from 'react-router-dom';
 import { GlobalStyles } from 'src/GlobalStyles';
 import ErrorBoundary from 'src/components/ErrorBoundary';
 import Loading from 'src/components/Loading';
@@ -60,8 +60,8 @@ const Main = styled.main<StyledLayoutProps>`
 const bootstrapData = getBootstrapData();
 
 const DvtLayout = () => {
-  const history = useHistory();
-  const { pathname } = history.location;
+  const location = useLocation();
+  const { pathname } = location;
 
   return (
     <StyledApp navbarInHeight={WithNavbarBottom.includes(pathname)}>