Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

scroll to top on page change in admin settings (#71369)

Nicolò Prettoa0a14a42d3e7
diff --git a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
index ce823b03667..e65a62fc625 100644
--- a/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/embedding-hub/embedding-hub.cy.spec.ts
@@ -684,6 +684,7 @@ describe("scenarios - embedding hub", () => {
cy.findByTestId("admin-layout-content")
.findByText("Configure data permissions and enable tenants")
.closest("button")
+ .scrollIntoView()
.findByText("Done")
.should("be.visible");
diff --git a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
index 95fd31833db..f350ff23be0 100644
--- a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
+++ b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.tsx
@@ -1,6 +1,8 @@
import type React from "react";
+import { useEffect, useRef } from "react";
import ErrorBoundary from "metabase/ErrorBoundary";
+import { useRouter } from "metabase/router/useRouter";
import { Box } from "metabase/ui";
import { NotFound } from "../ErrorPages";
@@ -18,6 +20,9 @@ export const AdminSettingsLayout = ({
fullWidth?: boolean;
maw?: string;
}) => {
+ const contentRef = useRef<HTMLDivElement>(null);
+ useScrollToTop(contentRef);
+
return (
<Box className={S.Wrapper}>
<Box className={S.Main}>
@@ -27,6 +32,7 @@ export const AdminSettingsLayout = ({
</Box>
)}
<Box
+ ref={contentRef}
className={S.Content}
data-testid="admin-layout-content"
p={fullWidth ? 0 : "2rem"}
@@ -41,3 +47,11 @@ export const AdminSettingsLayout = ({
</Box>
);
};
+
+const useScrollToTop = (contentRef: React.RefObject<HTMLDivElement | null>) => {
+ const { location } = useRouter();
+
+ useEffect(() => {
+ contentRef.current?.scrollTo(0, 0);
+ }, [location?.pathname, contentRef]);
+};