Skip to content

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

Show 'See it' link next to 'Saved' button after x-ray is saved as dashboard (#64265)

Andersond56be957f0e2
diff --git a/e2e/test/scenarios/dashboard/x-rays.cy.spec.js b/e2e/test/scenarios/dashboard/x-rays.cy.spec.js
index 710f8c729c9..59767826d70 100644
--- a/e2e/test/scenarios/dashboard/x-rays.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/x-rays.cy.spec.js
@@ -177,10 +177,16 @@ describe("scenarios > x-rays", { tags: "@slow" }, () => {
cy.button("Save this").click();
- // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
- cy.findByText("Your dashboard was saved");
- // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
- cy.findByText("See it").click();
+ cy.log(
+ "'See it' link should be displayed both in the header and in the toast",
+ );
+ H.undoToast()
+ .should("contain", "Your dashboard was saved")
+ .and("contain", "See it");
+
+ cy.findByTestId("automatic-dashboard-header").within(() => {
+ cy.findByRole("link", { name: "See it" }).should("be.visible").click();
+ });
cy.url().should("contain", "a-look-at-orders");
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
index 346ebb90598..1ab1799aadd 100644
--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.tsx
@@ -17,15 +17,15 @@ import {
DashboardContextProvider,
useDashboardContext,
} from "metabase/dashboard/context";
+import { useDashboardUrlQuery } from "metabase/dashboard/hooks";
import { SetTitle } from "metabase/hoc/Title";
import { useDispatch } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { addUndo } from "metabase/redux/undo";
-import { Box } from "metabase/ui";
-import type { DashboardId, Dashboard as IDashboard } from "metabase-types/api";
+import { Box, Flex, Group } from "metabase/ui";
+import type { Dashboard as IDashboard } from "metabase-types/api";
import { FixedWidthContainer } from "../../components/Dashboard/DashboardComponents";
-import { useDashboardUrlQuery } from "../../hooks/use-dashboard-url-query";
import { XrayIcon } from "../XrayIcon";
import S from "./AutomaticDashboardApp.module.css";
@@ -46,14 +46,10 @@ const AutomaticDashboardAppInner = () => {
dispatch(dashboardApi.endpoints.saveDashboard.initiate(newDashboard));
const invalidateCollections = () => invalidateTags(null, ["collection"]);
- const [savedDashboardId, setSavedDashboardId] = useState<DashboardId | null>(
- null,
- );
+ const [savedDashboardUrl, setSavedDashboardUrl] = useState<string>();
useEffect(() => {
- if (dashboard?.id) {
- setSavedDashboardId(null);
- }
+ setSavedDashboardUrl(undefined);
}, [dashboard?.id]);
const save = async () => {
@@ -66,6 +62,9 @@ const AutomaticDashboardAppInner = () => {
if (!newDashboard) {
return;
}
+
+ const newDashboardUrl = Urls.dashboard(newDashboard);
+
dispatch(dashboardApi.util.invalidateTags(invalidateCollections()));
dispatch(
addUndo({
@@ -74,7 +73,7 @@ const AutomaticDashboardAppInner = () => {
{t`Your dashboard was saved`}
<Link
className={cx(CS.link, CS.textBold, CS.ml1)}
- to={Urls.dashboard(newDashboard)}
+ to={newDashboardUrl}
>
{t`See it`}
</Link>
@@ -83,7 +82,7 @@ const AutomaticDashboardAppInner = () => {
icon: "dashboard",
}),
);
- setSavedDashboardId(newDashboard.id);
+ setSavedDashboardUrl(newDashboardUrl);
}
};
@@ -111,23 +110,38 @@ const AutomaticDashboardAppInner = () => {
<FixedWidthContainer
isFixedWidth={dashboard?.width === "fixed" && !hasSidebar}
>
- <div className={cx(CS.flex, CS.alignCenter, CS.py2)}>
+ <Flex
+ columnGap="md"
+ justify="space-between"
+ py="md"
+ wrap={{ base: "wrap", sm: "nowrap" }}
+ >
<FixedWidthContainer
data-testid="fixed-width-dashboard-header"
className={cx(CS.flex, CS.alignCenter)}
isFixedWidth={dashboard?.width === "fixed"}
>
<XrayIcon />
- <Dashboard.Title
- className={cx(CS.textWrap, CS.mr2, CS.h2)}
- />
+ <Dashboard.Title className={cx(CS.textWrap, CS.h2)} />
</FixedWidthContainer>
- <div
- className={cx(CS.flex, CS.flexGrow1)}
- style={{ maxWidth: SIDEBAR_W }}
+ <Group
+ align="center"
+ gap="md"
+ justify="flex-end"
+ w={{ base: "auto", md: SIDEBAR_W }}
+ wrap="nowrap"
>
- {savedDashboardId != null ? (
- <Button className={CS.mlAuto} disabled>{t`Saved`}</Button>
+ {savedDashboardUrl ? (
+ <>
+ <Link
+ className={cx(CS.link, CS.textBold)}
+ style={{ whiteSpace: "nowrap" }}
+ to={savedDashboardUrl}
+ >
+ {t`See it`}
+ </Link>
+ <Button disabled>{t`Saved`}</Button>
+ </>
) : (
<ActionButton
className={cx(CS.mlAuto, CS.textNoWrap)}
@@ -141,8 +155,8 @@ const AutomaticDashboardAppInner = () => {
{t`Save this`}
</ActionButton>
)}
- </div>
- </div>
+ </Group>
+ </Flex>
{dashboard && tabs.length > 1 && (
<div className={cx(CS.wrapper, CS.flex, CS.alignCenter)}>
<Dashboard.Tabs />
diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx
new file mode 100644
index 00000000000..b7bc20e0d5f
--- /dev/null
+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.unit.spec.tsx
@@ -0,0 +1,71 @@
+import userEvent from "@testing-library/user-event";
+import { Route } from "react-router";
+
+import { setupAutoDashboardEndpoints } from "__support__/server-mocks";
+import { createMockEntitiesState } from "__support__/store";
+import {
+ renderWithProviders,
+ screen,
+ waitForLoaderToBeRemoved,
+ within,
+} from "__support__/ui";
+import {
+ createMockDashboard,
+ createMockDashboardQueryMetadata,
+ createMockDatabase,
+} from "metabase-types/api/mocks";
+import { createMockDashboardState } from "metabase-types/store/mocks";
+
+import { AutomaticDashboardApp } from "./AutomaticDashboardApp";
+
+const TEST_DATABASE_WITH_ACTIONS = createMockDatabase({
+ settings: { "database-enable-actions": true },
+});
+
+const setup = async () => {
+ const mockDashboard = createMockDashboard();
+ const dashboardId = mockDashboard.id;
+
+ setupAutoDashboardEndpoints(
+ mockDashboard,
+ createMockDashboardQueryMetadata({
+ databases: [TEST_DATABASE_WITH_ACTIONS],
+ }),
+ );
+
+ renderWithProviders(
+ <Route path="/auto/dashboard/*" component={AutomaticDashboardApp} />,
+ {
+ withRouter: true,
+ initialRoute: `/auto/dashboard/table/${dashboardId}`,
+ storeInitialState: {
+ dashboard: createMockDashboardState({ dashboardId }),
+ entities: createMockEntitiesState({
+ databases: [TEST_DATABASE_WITH_ACTIONS],
+ }),
+ },
+ },
+ );
+
+ await waitForLoaderToBeRemoved();
+
+ return {
+ dashboardId,
+ };
+};
+
+describe("AutomaticDashboardApp", () => {
+ it("Shows 'See it' link next to Save button when dashboard is saved", async () => {
+ const { dashboardId } = await setup();
+ await userEvent.click(screen.getByRole("button", { name: "Save this" }));
+ const savedButton = await screen.findByRole("button", { name: "Saved" });
+ expect(savedButton).toBeDisabled();
+ const seeItLink = within(
+ screen.getByTestId("automatic-dashboard-header"),
+ ).getByRole("link", { name: "See it" });
+ expect(seeItLink).toHaveAttribute(
+ "href",
+ `/dashboard/${dashboardId}-dashboard`,
+ );
+ });
+});
diff --git a/frontend/test/__support__/server-mocks/dashboard.ts b/frontend/test/__support__/server-mocks/dashboard.ts
index 0f95d2347ab..b41637a04f2 100644
--- a/frontend/test/__support__/server-mocks/dashboard.ts
+++ b/frontend/test/__support__/server-mocks/dashboard.ts
@@ -18,6 +18,21 @@ export function setupDashboardEndpoints(dashboard: Dashboard) {
});
}
+export function setupAutoDashboardEndpoints(
+ dashboard: Dashboard,
+ metadata: DashboardQueryMetadata,
+) {
+ fetchMock.get(
+ `path:/api/automagic-dashboards/table/${dashboard.id}`,
+ dashboard,
+ );
+ fetchMock.get(
+ `path:/api/automagic-dashboards/table/${dashboard.id}/query_metadata`,
+ metadata,
+ );
+ fetchMock.post(`path:/api/dashboard/save`, dashboard);
+}
+
export function setupDashboardCreateEndpoint(dashboard: Partial<Dashboard>) {
fetchMock.post(
`path:/api/dashboard`,