Skip to content

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

preserve navbar status in the url update at the end of handleQBInit (#71505)

Nick Fitzpatricka57a1c0ab8fb
diff --git a/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx b/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
index cea100a86d7..a0e0230e73e 100644
--- a/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
+++ b/frontend/src/metabase/nav/containers/Navbar.unit.spec.tsx
@@ -140,6 +140,19 @@ describe("nav > containers > Navbar > Core App", () => {
await expectNavbarClosed();
});
+ it("should not close navbar when preserveNavbarState is set", async () => {
+ const store = await setup({ isOpen: true });
+ await expectNavbarOpen();
+ store.dispatch({
+ type: "@@router/LOCATION_CHANGE",
+ payload: {
+ pathname: "/question/1",
+ state: { preserveNavbarState: true },
+ },
+ });
+ await expectNavbarOpen();
+ });
+
it("should preserve state when navigating collections", async () => {
const store = await setup({ pathname: "/collection/1" });
await expectNavbarOpen();
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 6968ddb8852..a39468ab0ac 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -427,6 +427,7 @@ async function handleQBInit(
updateUrl(question, {
replaceState: true,
preserveParameters: hasCard,
+ preserveNavbarState: true,
objectId,
}),
);
diff --git a/frontend/src/metabase/query_builder/actions/url.ts b/frontend/src/metabase/query_builder/actions/url.ts
index 27ebe253ab7..ec520ca2a74 100644
--- a/frontend/src/metabase/query_builder/actions/url.ts
+++ b/frontend/src/metabase/query_builder/actions/url.ts
@@ -35,6 +35,7 @@ export const updateUrl = createThunkAction(
dirty,
replaceState,
preserveParameters = true,
+ preserveNavbarState = false,
queryBuilderMode,
datasetEditorTab,
objectId,
@@ -130,7 +131,13 @@ export const updateUrl = createThunkAction(
try {
if (replaceState) {
- dispatch(replace(locationDescriptor));
+ const replaceDescriptor = preserveNavbarState
+ ? {
+ ...locationDescriptor,
+ state: { ...locationDescriptor.state, preserveNavbarState },
+ }
+ : locationDescriptor;
+ dispatch(replace(replaceDescriptor));
} else {
dispatch(push(locationDescriptor));
}