The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix stale dashboard breadcrumb after rename (#75432)
Anderson8c750b74fb2e
diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 3897c0a727e..220c5b93d16 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -1,6 +1,7 @@import { withRouter } from "react-router";import { push } from "react-router-redux";+import { skipToken, useGetDashboardQuery } from "metabase/api";import { useInitialCollectionId } from "metabase/collections/hooks";import {getCommentSidebarOpen,@@ -87,8 +88,11 @@ function AppBarContainerInner(props: AppBarProps & RouterProps) {const originalQuestion = useSelector(getOriginalQuestion);const { pathname } = props.location;- const dashboard =- pathname && isQuestionPath(pathname) ? question?.dashboard() : undefined;+ const isOnQuestionPage = pathname && isQuestionPath(pathname);+ const dashboardId = isOnQuestionPage ? question?.dashboard()?.id : undefined;+ const { data: dashboard } = useGetDashboardQuery(+ dashboardId != null ? { id: dashboardId } : skipToken,+ );const locationState = props.location.state as { cardId?: number } | undefined;@@ -105,7 +109,11 @@ function AppBarContainerInner(props: AppBarProps & RouterProps) {<AppBarView{...props}collectionId={collectionId}- collectionBreadcrumbs={<CollectionBreadcrumbs dashboard={dashboard} />}+ collectionBreadcrumbs={+ <CollectionBreadcrumbs+ dashboard={dashboardId != null ? dashboard : undefined}+ />+ }questionLineage={<QuestionLineagequestion={question}diff --git a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsxindex 21de43bef90..9726d2dc82c 100644--- a/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/AppBar.unit.spec.tsx@@ -52,6 +52,22 @@ const CARD_IN_DASHBOARD = createMockCard({dashboard_id: 4,dashboard: BAR_DASHBOARD,});+const CARD_IN_RENAMED_DASHBOARD = createMockCard({+ id: 4,+ collection_id: 3,+ dashboard_id: 4,+ dashboard: createMockDashboard({+ id: 4,+ name: "Stale Dashboard Name",+ collection_id: 3,+ }),+});+const CARD_WITH_DASHBOARD_ID = createMockCard({+ id: 5,+ collection_id: 3,+ dashboard_id: 4,+ dashboard: undefined,+});describe("AppBar", () => {const matchMediaSpy = jest.spyOn(window, "matchMedia");@@ -241,6 +257,32 @@ describe("AppBar", () => {expect(await screen.findByText("Bar Dashboard")).toBeInTheDocument();});+ it("should use the latest dashboard name for question breadcrumbs (#75184)", async () => {+ setup({+ embedOptions: {+ breadcrumbs: true,+ },+ card: CARD_IN_RENAMED_DASHBOARD,+ });++ expect(await screen.findByText("Bar Dashboard")).toBeInTheDocument();+ expect(+ screen.queryByText("Stale Dashboard Name"),+ ).not.toBeInTheDocument();+ });++ it("should not show dashboard breadcrumbs without dashboard context", async () => {+ setup({+ embedOptions: {+ breadcrumbs: true,+ },+ card: CARD_WITH_DASHBOARD_ID,+ });++ expect(await screen.findByText("Foo Collection")).toBeInTheDocument();+ expect(screen.queryByText("Bar Dashboard")).not.toBeInTheDocument();+ });+it("should work for dashboards", async () => {setup({initialRoute: `/dashboard/${BAR_DASHBOARD.id}`,