Skip to content

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

New Metric Home page (#71055)

Aleksandr Lesnenko1132bfd402c0
diff --git a/e2e/support/helpers/e2e-ad-hoc-question-helpers.js b/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
index 36c07bb9b9f..f14e90d4ba7 100644
--- a/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
+++ b/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
@@ -55,11 +55,10 @@ export function startNewModel() {
}
/**
- * This is the query generated by clicking "New" and then choosing "Metric".
+ * Navigate to the new metric creation page.
*/
export function startNewMetric() {
- const hash = newCardHash("metric");
- cy.visit(`/metric/query#${hash}`);
+ cy.visit("/metric/new");
}
/**
diff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.ts
index 086248e6819..a43591c1a7a 100644
--- a/e2e/support/helpers/e2e-data-studio-helpers.ts
+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts
@@ -6,6 +6,7 @@ import type {
} from "metabase-types/api";
import { codeMirrorHelpers } from "./e2e-codemirror-helpers";
+import { MetricPage } from "./e2e-metric-page-helpers";
import { popover } from "./e2e-ui-elements-helpers";
const { H } = cy;
@@ -14,8 +15,6 @@ const libraryPage = () => cy.findByTestId("library-page");
const newSnippetPage = () => cy.findByTestId("new-snippet-page");
const archivedSnippetsPage = () => cy.findByTestId("archived-snippets-page");
const editSnippetPage = () => cy.findByTestId("edit-snippet-page");
-const metricOverviewPage = () => cy.findByTestId("metric-overview-page");
-const metricQueryEditor = () => cy.findByTestId("metric-query-editor");
export const DataStudio = {
nav: () => cy.findByTestId("data-studio-nav"),
@@ -96,24 +95,7 @@ export const DataStudio = {
cancelButton: () => cy.findByRole("button", { name: "Cancel" }),
editor: codeMirrorHelpers("snippet-editor", {}),
},
- Metrics: {
- overviewPage: metricOverviewPage,
- queryEditor: metricQueryEditor,
- nameInput: () => metricQueryEditor().findByPlaceholderText("New metric"),
- saveButton: () =>
- metricQueryEditor().findByRole("button", { name: "Save" }),
- cancelButton: () =>
- metricQueryEditor().findByRole("button", { name: "Cancel" }),
- header: () => cy.findByTestId("metric-header"),
- moreMenu: () => DataStudio.Metrics.header().icon("ellipsis"),
- overviewTab: () => DataStudio.Metrics.header().findByText("Overview"),
- definitionTab: () => DataStudio.Metrics.header().findByText("Definition"),
- dependenciesTab: () =>
- DataStudio.Metrics.header().findByText("Dependencies"),
- cachingTab: () => DataStudio.Metrics.header().findByText("Caching"),
- overviewPageDescriptionSidebar: () =>
- metricOverviewPage().findByTestId("metric-description-sidebar"),
- },
+ Metrics: MetricPage,
Tables: {
overviewPage: () => cy.findByTestId("table-overview-page"),
fieldsPage: () => cy.findByTestId("table-fields-page"),
diff --git a/e2e/support/helpers/e2e-metric-page-helpers.ts b/e2e/support/helpers/e2e-metric-page-helpers.ts
new file mode 100644
index 00000000000..e5a05f0f4da
--- /dev/null
+++ b/e2e/support/helpers/e2e-metric-page-helpers.ts
@@ -0,0 +1,24 @@
+const metricAboutPage = () => cy.findByTestId("metric-about-page");
+const metricOverviewPage = () => cy.findByTestId("metric-overview-page");
+const metricQueryEditor = () => cy.findByTestId("metric-query-editor");
+
+export const MetricPage = {
+ aboutPage: metricAboutPage,
+ overviewPage: metricOverviewPage,
+ queryEditor: metricQueryEditor,
+ nameInput: () => metricQueryEditor().findByPlaceholderText("New metric"),
+ saveButton: () => metricQueryEditor().findByRole("button", { name: "Save" }),
+ cancelButton: () =>
+ metricQueryEditor().findByRole("button", { name: "Cancel" }),
+ header: () => cy.findByTestId("metric-header"),
+ moreMenu: () => cy.findByLabelText("More options"),
+ aboutTab: () => MetricPage.header().findByText("About"),
+ overviewTab: () => MetricPage.header().findByText("Overview"),
+ definitionTab: () => MetricPage.header().findByText("Definition"),
+ dependenciesTab: () => MetricPage.header().findByText("Dependencies"),
+ cachingTab: () => MetricPage.header().findByText("Caching"),
+ historyTab: () => MetricPage.header().findByText("History"),
+ aboutPageDescriptionSidebar: () =>
+ metricAboutPage().findByTestId("metric-description-sidebar"),
+ exploreLink: () => cy.findByTestId("explore-link"),
+};
diff --git a/e2e/support/helpers/e2e-misc-helpers.js b/e2e/support/helpers/e2e-misc-helpers.js
index bb6023c69d0..b9b663b136e 100644
--- a/e2e/support/helpers/e2e-misc-helpers.js
+++ b/e2e/support/helpers/e2e-misc-helpers.js
@@ -154,14 +154,10 @@ export function visitModel(id, { hasDataAccess = true } = {}) {
*
* @param {number} id
*/
-export function visitMetric(id, { hasDataAccess = true } = {}) {
+export function visitMetric(id) {
const alias = "metricQuery" + id;
- if (hasDataAccess) {
- cy.intercept("POST", "/api/dataset").as(alias);
- } else {
- cy.intercept("POST", `/api/card/**/${id}/query`).as(alias);
- }
+ cy.intercept("POST", `/api/card/${id}/query`).as(alias);
cy.visit(`/metric/${id}`);
diff --git a/e2e/support/helpers/index.ts b/e2e/support/helpers/index.ts
index b8588620b8a..6a6e1b64400 100644
--- a/e2e/support/helpers/index.ts
+++ b/e2e/support/helpers/index.ts
@@ -33,6 +33,7 @@ export * from "./e2e-enterprise-helpers";
export * from "./e2e-filter-helpers";
export * from "./e2e-ldap-helpers";
export * from "./e2e-metabot-helpers";
+export * from "./e2e-metric-page-helpers";
export * from "./e2e-metrics-viewer-helpers";
export * from "./e2e-misc-helpers";
export * from "./e2e-mock-app-settings-helpers";
diff --git a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
index 868acf8394b..4ad6317656a 100644
--- a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js
@@ -381,7 +381,7 @@ describe("issue 16559", () => {
cy.findByRole("tab", { name: "History" }).click();
cy.log("Dashboard creation");
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText("You created this.")
.should("be.visible");
@@ -399,7 +399,7 @@ describe("issue 16559", () => {
H.openDashboardInfoSidebar().within(() => {
cy.contains("button", "History").click();
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText("You added a card.")
.should("be.visible");
@@ -414,7 +414,7 @@ describe("issue 16559", () => {
cy.contains("button", "History").click();
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText(
'You renamed this Dashboard from "16559 Dashboard" to "16559 Dashboard modified".',
@@ -433,7 +433,7 @@ describe("issue 16559", () => {
cy.contains("button", "History").click();
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText("You added a description.")
.should("be.visible");
@@ -451,7 +451,7 @@ describe("issue 16559", () => {
cy.contains("button", "History").click();
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText("You set auto apply filters to false.")
.should("be.visible");
@@ -470,7 +470,7 @@ describe("issue 16559", () => {
H.openDashboardInfoSidebar().within(() => {
cy.contains("button", "History").click();
cy.findByTestId("dashboard-history-list")
- .findAllByRole("listitem")
+ .findAllByTestId("revision-history-event")
.eq(0)
.findByText("You moved this Dashboard to First collection.")
.should("be.visible");
diff --git a/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
index 9b8c0f10256..9558736b456 100644
--- a/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-library.cy.spec.ts
@@ -94,7 +94,8 @@ describe("scenarios > data studio > library", () => {
it("should let you move metrics into the library, even when empty", () => {
H.createLibrary();
H.createQuestion(TRUSTED_ORDERS_METRIC, { visitQuestion: true });
- H.openQuestionActions("Duplicate");
+ H.DataStudio.Metrics.moreMenu().click();
+ H.popover().findByText("Duplicate").click();
H.modal().findByTestId("dashboard-and-collection-picker-button").click();
H.entityPickerModalItem(0, "Library").click();
diff --git a/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
index f5dbef913b0..8d6568cc73a 100644
--- a/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/data-studio-metrics.cy.spec.ts
@@ -45,7 +45,7 @@ describe("scenarios > data studio > library > metrics", () => {
H.modal().within(() => {
cy.findByText("Save your metric").should("be.visible");
- cy.findByLabelText("Name").type("Total Revenue");
+ cy.findByLabelText("Name").clear().type("Total Revenue");
cy.findByLabelText("Description").type(
"Sum of all order totals across the store",
);
@@ -65,14 +65,14 @@ describe("scenarios > data studio > library > metrics", () => {
cy.log("Verify metric overview page");
cy.url().should("match", /\/data-studio\/library\/metrics\/\d+$/);
- H.DataStudio.Metrics.overviewPage().within(() => {
+ H.DataStudio.Metrics.aboutPage().within(() => {
cy.findAllByText("Total Revenue").should("have.length", 2); // breadcrumbs + header
cy.findByText("Sum of all order totals across the store").should(
"be.visible",
);
});
- H.DataStudio.Metrics.overviewPageDescriptionSidebar().within(() => {
+ H.DataStudio.Metrics.aboutPageDescriptionSidebar().within(() => {
cy.findByText("Last edited by Bobby Tables").should("be.visible");
cy.findByText("Sample Database").should("be.visible");
@@ -119,12 +119,12 @@ describe("scenarios > data studio > library > metrics", () => {
.click();
cy.log("Verify metric overview page displays correct data");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.should("be.visible");
cy.log("Update the metric name");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.clear()
.type("Updated Orders Metric{enter}");
@@ -132,7 +132,7 @@ describe("scenarios > data studio > library > metrics", () => {
cy.wait("@updateCard");
cy.log("Verify updated name appears in overview");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Updated Orders Metric")
.should("be.visible");
@@ -209,7 +209,7 @@ describe("scenarios > data studio > library > metrics", () => {
.click();
cy.log("Verify metric is loaded before archiving");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.should("be.visible");
@@ -241,9 +241,6 @@ describe("scenarios > data studio > library > metrics", () => {
cy.log("Restore the metric");
cy.findByRole("table").findByText("Trusted Orders Metric").click();
-
- H.MetricsViewer.openMetricHomePage("Trusted Orders Metric");
-
cy.findByTestId("archive-banner").should("be.visible");
cy.findByTestId("archive-banner").findByText("Restore").click();
cy.wait("@updateCard");
@@ -255,7 +252,7 @@ describe("scenarios > data studio > library > metrics", () => {
.should("be.visible");
});
- it("should view metric in question view via more menu", () => {
+ it("should view metric in the metrics explorer view via more menu", () => {
cy.log("Navigate to Data Studio Library");
cy.visit("/data-studio/library");
@@ -265,15 +262,13 @@ describe("scenarios > data studio > library > metrics", () => {
.click();
cy.log("Verify metric is loaded");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.should("be.visible");
cy.log("Verify View link opens in new tab");
H.DataStudio.Metrics.moreMenu().click();
- H.popover()
- .findByText("View")
- .closest("a")
+ H.DataStudio.Metrics.exploreLink()
.should("have.attr", "target", "_blank")
.should("have.attr", "href")
.and("match", /\/explore\?metricId=\d+/);
@@ -289,7 +284,7 @@ describe("scenarios > data studio > library > metrics", () => {
.click();
cy.log("Verify metric is loaded");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.should("be.visible");
@@ -319,7 +314,7 @@ describe("scenarios > data studio > library > metrics", () => {
H.modal().should("not.exist");
cy.log("Verify duplicate metric is created");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findAllByText("Trusted Orders Metric - Duplicate")
.should("have.length", 2); // breadcrumbs + header
@@ -341,7 +336,7 @@ describe("scenarios > data studio > library > metrics", () => {
.click();
cy.log("Verify metric is loaded");
- H.DataStudio.Metrics.overviewPage()
+ H.DataStudio.Metrics.aboutPage()
.findByDisplayValue("Trusted Orders Metric")
.should("be.visible");
@@ -378,7 +373,7 @@ describe("scenarios > data studio > library > metrics", () => {
});
cy.log("Verify we're on the new metric page");
- cy.url().should("match", /\/metric\/query/);
+ cy.url().should("match", /\/metric\/new/);
cy.findByPlaceholderText(/Search for tables/).type("Orders");
H.popover()
@@ -412,7 +407,7 @@ describe("scenarios > data studio > library > metrics", () => {
});
cy.log("Verify we're on the new metric page");
- cy.url().should("match", /\/metric\/query/);
+ cy.url().should("match", /\/metric\/new/);
});
});
diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
index 0676318ecac..530ff91d267 100644
--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts
@@ -2590,10 +2590,9 @@ LIMIT
cy.intercept("GET", "/api/transform/*").as("transformReload");
cy.findByTestId("transform-history-list")
.findByText(/created this/)
- .parent()
- .within(() => {
- cy.findByTestId("question-revert-button").click();
- });
+ .closest('[data-testid="revision-history-event"]')
+ .findByTestId("question-revert-button")
+ .click();
cy.wait(["@revert", "@transformReload"]);
cy.log("Verify transform was reverted");
diff --git a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
index 1f3ca2e9212..6a3379a0227 100644
--- a/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
+++ b/e2e/test/scenarios/dependencies/dependency-checks.cy.spec.ts
@@ -41,11 +41,12 @@ describe("scenarios > dependencies > dependency checks", () => {
describe("metrics", () => {
it("should not show a warning when a change to a metric is backward-compatible with existing content", () => {
createMetricWithDependentMbqlQuestionsAndTransforms();
- cy.get<number>("@metricId").then(H.visitMetric);
- H.openQuestionActions("Edit metric definition");
+ cy.get<number>("@metricId").then((metricId) => {
+ cy.visit(`/metric/${metricId}/query`);
+ });
H.getNotebookStep("summarize").findByText("Min of Score").click();
H.popover().findByText("Name").click();
- cy.findByTestId("edit-bar").button("Save changes").click();
+ cy.button("Save").click();
cy.wait("@updateCard");
});
});
diff --git a/e2e/test/scenarios/documents/documents.cy.spec.ts b/e2e/test/scenarios/documents/documents.cy.spec.ts
index b47b47b7e8b..4d9cb6b7c74 100644
--- a/e2e/test/scenarios/documents/documents.cy.spec.ts
+++ b/e2e/test/scenarios/documents/documents.cy.spec.ts
@@ -1849,10 +1849,9 @@ describe("documents", () => {
cy.intercept("GET", "/api/document/*").as("documentReload");
cy.findByTestId("document-history-list")
.findByText(/created this/)
- .parent()
- .within(() => {
- cy.findByTestId("question-revert-button").click();
- });
+ .closest('[data-testid="revision-history-event"]')
+ .findByTestId("question-revert-button")
+ .click();
cy.wait(["@revert", "@documentReload"]);
cy.log("Verify document was reverted");
diff --git a/e2e/test/scenarios/filters-reproductions/dashboard-filters-with-question-revert.cy.spec.js b/e2e/test/scenarios/filters-reproductions/dashboard-filters-with-question-revert.cy.spec.js
index be1282feff1..dac44f2c455 100644
--- a/e2e/test/scenarios/filters-reproductions/dashboard-filters-with-question-revert.cy.spec.js
+++ b/e2e/test/scenarios/filters-reproductions/dashboard-filters-with-question-revert.cy.spec.js
@@ -101,7 +101,7 @@ describe("issue 35954", () => {
cy.findByRole("tab", { name: "History" }).click();
cy.findByTestId("saved-question-history-list")
- .find("li")
+ .findAllByTestId("revision-history-event")
.filter(":contains(You created this)")
.findByTestId("question-revert-button")
.click();
@@ -173,7 +173,7 @@ describe("issue 35954", () => {
H.questionInfoButton().click();
cy.findByRole("tab", { name: "History" }).click();
cy.findByTestId("saved-question-history-list")
- .find("li")
+ .findAllByTestId("revision-history-event")
.filter(":contains(You edited this)")
.findByTestId("question-revert-button")
.click();
diff --git a/e2e/test/scenarios/metrics/browse.cy.spec.ts b/e2e/test/scenarios/metrics/browse.cy.spec.ts
index 0a82dc79cdd..6dbddc11fe7 100644
--- a/e2e/test/scenarios/metrics/browse.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/browse.cy.spec.ts
@@ -107,7 +107,7 @@ describe("scenarios > browse > metrics", () => {
).should("be.visible");
cy.findByText("Create metric").should("be.visible").click();
});
- cy.location("pathname").should("eq", "/metric/query");
+ cy.location("pathname").should("eq", "/metric/new");
});
it("should not show the create metric button if the user does not have data access", () => {
@@ -135,22 +135,24 @@ describe("scenarios > browse > metrics", () => {
cy.findByTestId("browse-metrics-header")
.findByLabelText("Create a new metric")
.click();
+ H.MetricPage.queryEditor().should("be.visible");
H.miniPicker().within(() => {
cy.findByText("Sample Database").click();
cy.findByText("People").click();
});
- cy.findByTestId("edit-bar")
- .should("contain", "New metric")
- .button("Save")
- .click();
- H.modal()
- .should("contain", "Save metric")
- .and("contain", H.getPersonalCollectionName(USERS["nocollection"]))
- .button("Save")
- .click();
+ H.MetricPage.saveButton().click();
+ H.modal().within(() => {
+ cy.findByPlaceholderText("What is the name of your metric?").type(
+ "My metric",
+ );
+ cy.findByText("Save your metric");
+ cy.findByText(H.getPersonalCollectionName(USERS["nocollection"]));
+ cy.button("Save").click();
+ });
cy.wait("@createMetric");
- cy.location("pathname").should("match", /^\/metric\/\d+-.*$/);
+ H.MetricPage.aboutPage().should("be.visible");
+ cy.location("pathname").should("match", /^\/metric\/\d+/);
});
});
@@ -169,9 +171,8 @@ describe("scenarios > browse > metrics", () => {
createMetrics([ORDERS_SCALAR_METRIC]);
cy.visit("/browse/metrics");
findMetric(ORDERS_SCALAR_METRIC.name).should("be.visible").click();
- cy.location("pathname").should("match", /^\/explore/);
- H.MetricsViewer.openMetricHomePage("Count of orders");
- cy.location("pathname").should("match", /^\/metric\/\d+-.*$/);
+ cy.location("pathname").should("match", /^\/metric\//);
+ H.MetricPage.aboutPage().should("be.visible");
});
it("should navigate to that collection when clicking a collection title", () => {
@@ -200,7 +201,7 @@ describe("scenarios > browse > metrics", () => {
cy.get("@open").should("have.been.calledOnce");
cy.get("@open").should(
"have.been.calledWithMatch",
- /^\/explore/,
+ /^\/metric\//,
"_blank",
);
@@ -447,6 +448,7 @@ describe("scenarios > browse > metrics", () => {
cy.visit("/browse/metrics");
verifyMetric(ORDERS_SCALAR_METRIC);
+ findMetric(ORDERS_SCALAR_METRIC.name).should("be.visible");
cy.findByRole("switch", { name: /show.*verified.*metrics/i }).should(
"have.attr",
"aria-selected",
@@ -495,12 +497,11 @@ function shouldNotHaveBookmark(name: string) {
function verifyMetric(metric: StructuredQuestionDetailsWithName) {
metricsTable().findByText(metric.name).should("be.visible").click();
- H.MetricsViewer.openMetricHomePage(metric.name);
+ H.MetricPage.aboutPage().should("be.visible");
- cy.findByLabelText("Move, trash, and more…").click();
+ H.MetricPage.moreMenu().click();
H.popover().findByText("Verify this metric").click();
-
- H.openNavigationSidebar();
+ cy.icon("verified").should("be.visible");
H.navigationSidebar()
.findByRole("listitem", { name: "Browse metrics" })
.click();
@@ -508,12 +509,11 @@ function verifyMetric(metric: StructuredQuestionDetailsWithName) {
function unverifyMetric(metric: StructuredQuestionDetailsWithName) {
metricsTable().findByText(metric.name).should("be.visible").click();
- H.MetricsViewer.openMetricHomePage(metric.name);
+ H.MetricPage.aboutPage().should("be.visible");
- cy.findByLabelText("Move, trash, and more…").click();
+ H.MetricPage.moreMenu().click();
H.popover().findByText("Remove verification").click();
-
- H.openNavigationSidebar();
+ cy.icon("verified").should("not.exist");
H.navigationSidebar()
.findByRole("listitem", { name: "Browse metrics" })
.click();
diff --git a/e2e/test/scenarios/metrics/metric-page.cy.spec.ts b/e2e/test/scenarios/metrics/metric-page.cy.spec.ts
new file mode 100644
index 00000000000..ba3592ce97a
--- /dev/null
+++ b/e2e/test/scenarios/metrics/metric-page.cy.spec.ts
@@ -0,0 +1,382 @@
+const { H } = cy;
+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
+import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";
+import {
+ TRUSTED_ORDERS_METRIC,
+ createLibraryWithItems,
+} from "e2e/support/test-library-data";
+import type { Card } from "metabase-types/api";
+
+const { ORDERS_ID, ORDERS } = SAMPLE_DATABASE;
+
+const ORDERS_SCALAR_METRIC = {
+ name: "Orders count",
+ description: "Total number of orders",
+ type: "metric" as const,
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ },
+ display: "scalar" as const,
+};
+
+const ORDERS_TIMESERIES_METRIC = {
+ name: "Orders over time",
+ description: "Count of orders broken down by month",
+ type: "metric" as const,
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ [
+ "field",
+ ORDERS.CREATED_AT,
+ { "base-type": "type/DateTime", "temporal-unit": "month" },
+ ],
+ ],
+ },
+ display: "line" as const,
+};
+
+describe("scenarios > metrics > metric page", () => {
+ beforeEach(() => {
+ H.restore();
+ cy.signInAsAdmin();
+ });
+
+ it("should display scalar metric, edit name and description, explore link, and more menu actions", () => {
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
+ cy.intercept("POST", "/api/card").as("createCard");
+
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ cy.log("about page with description sidebar");
+ H.MetricPage.aboutPage().should("be.visible");
+ H.MetricPage.aboutPageDescriptionSidebar().within(() => {
+ cy.findByText("Total number of orders").should("be.visible");
+ cy.findByText("Sample Database").should("be.visible");
+ cy.findByText("Source table").should("be.visible");
+ cy.findByText("Orders").should("be.visible");
+ });
+
+ cy.log("explore link");
+ H.MetricPage.header()
+ .findByText("Explore")
+ .closest("a")
+ .should("have.attr", "href")
+ .and("include", "/explore");
+
+ cy.log("edit description");
+ H.MetricPage.aboutPageDescriptionSidebar().within(() => {
+ cy.findByText("Total number of orders").click();
+ });
+ cy.focused().clear().type("Updated description").blur();
+ cy.wait("@updateCard");
+ H.MetricPage.aboutPageDescriptionSidebar()
+ .findByText("Updated description")
+ .should("be.visible");
+
+ cy.log("edit name inline");
+ H.MetricPage.aboutPage()
+ .findByDisplayValue("Orders count")
+ .clear()
+ .type("Renamed metric{enter}");
+ cy.wait("@updateCard");
+ H.MetricPage.aboutPage()
+ .findByDisplayValue("Renamed metric")
+ .should("be.visible");
+
+ cy.log("duplicate via more menu");
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Duplicate").click();
+ H.modal().within(() => {
+ cy.findByLabelText("Name")
+ .should("have.value", "Renamed metric - Duplicate")
+ .clear()
+ .type("Renamed metric copy");
+ cy.button("Duplicate").click();
+ });
+ cy.wait("@createCard");
+ H.MetricPage.aboutPage().should("be.visible");
+ });
+
+ it("should open alert channel setup modal from more menu when no channels configured", () => {
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Create an alert").click();
+
+ H.modal().within(() => {
+ cy.findByText(
+ "To get notified when something happens, or to send this chart on a schedule, first set up email, Slack, or a webhook.",
+ ).should("be.visible");
+
+ cy.findByText("Set up email")
+ .should("be.visible")
+ .closest("a")
+ .should("have.attr", "href", "/admin/settings/email");
+ cy.findByText("Set up Slack")
+ .should("be.visible")
+ .closest("a")
+ .should("have.attr", "href", "/admin/settings/slack");
+ cy.findByText("Add a webhook")
+ .should("be.visible")
+ .closest("a")
+ .should("have.attr", "href", "/admin/settings/webhooks");
+ });
+ });
+
+ it(
+ "should create an alert with webhook and show Edit alerts after",
+ { tags: ["@external"] },
+ () => {
+ H.setupNotificationChannel({
+ name: "Foo Hook",
+ description: "This is a hook",
+ });
+ H.setupNotificationChannel({
+ name: "Bar Hook",
+ description: "This is another hook",
+ });
+ cy.setCookie("metabase.SEEN_ALERT_SPLASH", "true");
+
+ cy.intercept("POST", "/api/notification").as("createAlert");
+
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Create an alert").click();
+
+ H.addNotificationHandlerChannel("Bar Hook");
+
+ cy.findByRole("button", { name: "Done" }).click();
+
+ cy.wait("@createAlert").then(({ response }) => {
+ expect(response?.body?.payload?.send_condition).to.equal("has_result");
+ });
+
+ H.notificationList().findByText("Your alert is all set up.");
+
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Edit alerts").should("be.visible");
+ },
+ );
+
+ it("should display timeseries metric and navigate between tabs", () => {
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ H.MetricPage.aboutPage().should("be.visible");
+ H.echartsContainer().should("be.visible");
+
+ H.MetricPage.aboutTab().should("be.visible");
+ H.MetricPage.overviewTab().should("be.visible");
+ H.MetricPage.definitionTab().should("be.visible");
+ H.MetricPage.historyTab().should("be.visible");
+
+ H.MetricPage.definitionTab().click();
+ H.MetricPage.queryEditor().should("be.visible");
+ H.getNotebookStep("data").findByText("Orders").should("be.visible");
+
+ H.MetricPage.historyTab().click();
+ cy.findAllByTestId("revision-history-event").should("have.length.gte", 1);
+
+ H.MetricPage.aboutTab().click();
+ H.MetricPage.aboutPage().should("be.visible");
+ });
+
+ it("should render dimension charts on the overview tab and show more", () => {
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ H.MetricPage.overviewTab().click();
+ H.MetricPage.overviewPage().should("be.visible");
+
+ H.MetricPage.overviewPage().within(() => {
+ cy.findByText("By Created At").should("exist");
+ cy.findByText("By State").should("exist");
+ cy.findByText("By Category").should("exist");
+ cy.findByText("By Name").should("exist");
+ cy.findAllByText(/^By /).should("have.length", 4);
+
+ cy.findByText("Show more").scrollIntoView().click();
+
+ cy.findByText("By Source").should("exist");
+ cy.findByText("By Title").should("exist");
+ cy.findByText("By Vendor").should("exist");
+ cy.findAllByText(/^By /).should("have.length", 7);
+ });
+ });
+
+ it("should edit, save, and cancel metric definition changes", () => {
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
+
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ cy.visit(`/metric/${metric.id}/query`);
+ });
+
+ H.MetricPage.queryEditor().should("be.visible");
+
+ cy.log("cancel reverts changes");
+ H.getNotebookStep("summarize").button("Count").click();
+ H.popover().within(() => {
+ cy.findByText("Sum of ...").click();
+ cy.findByText("Total").click();
+ });
+ H.MetricPage.saveButton().should("be.visible");
+ H.MetricPage.cancelButton().click();
+ H.getNotebookStep("summarize").findByText("Count").should("be.visible");
+
+ cy.log("save persists changes");
+ H.getNotebookStep("summarize").button("Count").click();
+ H.popover().within(() => {
+ cy.findByText("Sum of ...").click();
+ cy.findByText("Total").click();
+ });
+ H.MetricPage.saveButton().click();
+ cy.wait("@updateCard");
+ H.getNotebookStep("summarize")
+ .findByText("Sum of Total")
+ .should("be.visible");
+ });
+
+ it("should add metric to dashboard and move to trash via more menu", () => {
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
+
+ H.createQuestion(ORDERS_SCALAR_METRIC, {
+ wrapId: true,
+ idAlias: "metricId",
+ });
+
+ cy.get<number>("@metricId").then((metricId) => {
+ H.visitMetric(metricId);
+ });
+
+ cy.log("add to dashboard");
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Add to a dashboard").click();
+ H.modal().within(() => {
+ cy.findByRole("heading", {
+ name: "Add this metric to a dashboard",
+ }).should("be.visible");
+ cy.findByText("Orders in a dashboard").click();
+ cy.button("Select").click();
+ });
+ cy.location("pathname").should(
+ "eq",
+ `/dashboard/${ORDERS_DASHBOARD_ID}-orders-in-a-dashboard`,
+ );
+
+ cy.log("move to trash");
+ cy.get<number>("@metricId").then((metricId) => {
+ H.visitMetric(metricId);
+ });
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Move to trash").click();
+ H.modal().button("Move to trash").click();
+ cy.wait("@updateCard");
+ H.main().findByText("This metric is in the trash.");
+ });
+
+ it("should restrict editing controls and definition tab for read-only users", () => {
+ cy.signInAsAdmin();
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ cy.signIn("readonly");
+ H.visitMetric(metric.id);
+
+ cy.log("about page hides editing controls");
+ H.MetricPage.aboutPage().should("be.visible");
+ cy.findByDisplayValue("Orders count").should("not.exist");
+ H.MetricPage.moreMenu().click();
+ H.popover().within(() => {
+ cy.findByText("Bookmark").should("be.visible");
+ cy.findByText("Add to a dashboard").should("be.visible");
+ cy.findByText("Move").should("not.exist");
+ cy.findByText("Duplicate").should("not.exist");
+ cy.findByText("Move to trash").should("not.exist");
+ });
+
+ cy.log("overview and definition tabs are hidden for read-only users");
+ cy.realPress("Escape");
+ H.MetricPage.overviewTab().should("not.exist");
+ H.MetricPage.definitionTab().should("not.exist");
+ });
+ });
+
+ describe("ee features", () => {
+ beforeEach(() => {
+ H.activateToken("bleeding-edge");
+ });
+
+ it("should show and hide 'Open in Data Studio' based on context", () => {
+ createLibraryWithItems();
+
+ cy.request("GET", "/api/card").then(({ body: cards }) => {
+ const metric = cards.find(
+ (card: Card) =>
+ card.type === "metric" && card.name === TRUSTED_ORDERS_METRIC.name,
+ );
+
+ cy.log("metric page shows 'Open in Data Studio'");
+ H.visitMetric(metric.id);
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Open in Data Studio").should("be.visible");
+ cy.realPress("Escape");
+
+ cy.log("Data Studio route hides 'Open in Data Studio'");
+ cy.visit(`/data-studio/library/metrics/${metric.id}`);
+ H.MetricPage.aboutPage().should("be.visible");
+ H.MetricPage.moreMenu().click();
+ H.popover().findByText("Open in Data Studio").should("not.exist");
+ });
+ });
+
+ it("should navigate to usage analytics dashboard from more menu", () => {
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+
+ H.MetricPage.moreMenu().click();
+ H.popover()
+ .findByText("Metric usage analytics")
+ .closest("a")
+ .should("have.attr", "href")
+ .and("include", `question_id=${metric.id}`);
+
+ H.popover()
+ .findByText("Metric usage analytics")
+ .closest("a")
+ .invoke("removeAttr", "target")
+ .click();
+
+ cy.location("search").should("include", `question_id=${metric.id}`);
+ H.main().findByText("Question overview").should("be.visible");
+ });
+ });
+
+ it("should show the Dependencies tab with dependency graph in EE", () => {
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.visitMetric(metric.id);
+ });
+
+ H.MetricPage.aboutPageDescriptionSidebar().within(() => {
+ cy.findByText("Dependencies").should("be.visible");
+ cy.findByText("Dependents").should("be.visible");
+ });
+
+ H.MetricPage.dependenciesTab().click();
+ H.DependencyGraph.graph().within(() => {
+ cy.findByText("Table");
+ cy.findByText("Orders").should("be.visible");
+ cy.findByText("Orders count").should("be.visible");
+ });
+ });
+ });
+});
diff --git a/e2e/test/scenarios/metrics/metrics-dashboard.cy.spec.js b/e2e/test/scenarios/metrics/metrics-dashboard.cy.spec.js
index 27b06b52fb9..6fbb1007a76 100644
--- a/e2e/test/scenarios/metrics/metrics-dashboard.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-dashboard.cy.spec.js
@@ -142,14 +142,12 @@ describe("scenarios > metrics > dashboard", () => {
it("should be possible to add metric to a dashboard via context menu (metabase#44220)", () => {
H.createQuestion(ORDERS_SCALAR_METRIC).then(
({ body: { id: metricId } }) => {
- cy.intercept("POST", "/api/dataset").as("dataset");
- cy.visit(`/metric/${metricId}`);
- cy.wait("@dataset");
- cy.findByTestId("scalar-value").should("have.text", "18,760");
+ H.visitMetric(metricId);
+ H.MetricPage.aboutPage().should("be.visible");
cy.log("Add metric to a dashboard via context menu");
- H.openQuestionActions();
- H.popover().findByTextEnsureVisible("Add to dashboard").click();
+ H.MetricPage.moreMenu().click();
+ H.popover().findByTextEnsureVisible("Add to a dashboard").click();
H.modal().within(() => {
cy.findByRole("heading", {
name: "Add this metric to a dashboard",
diff --git a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
index db302ad1a93..f90f72f3165 100644
--- a/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-editing.cy.spec.js
@@ -66,6 +66,128 @@ const ORDERS_MULTI_STAGE_QUESTION = {
display: "table",
};
+function startNewMetricWithTable(database, table) {
+ H.startNewMetric();
+ H.MetricPage.queryEditor().should("be.visible");
+ H.miniPicker().within(() => {
+ cy.findByText(database).click();
+ cy.findByText(table).click();
+ });
+}
+
+function startNewMetricWithSavedItem(collection, name) {
+ H.startNewMetric();
+ H.MetricPage.queryEditor().should("be.visible");
+ H.miniPicker().within(() => {
+ cy.findByText(collection).click();
+ cy.findByText(name).click();
+ });
+}
+
+function saveNewMetric({ name } = {}) {
+ cy.intercept("POST", "/api/card").as("createCard");
+ H.MetricPage.saveButton().click();
+ H.modal().within(() => {
+ cy.findByText("Save your metric").should("be.visible");
+ if (name) {
+ cy.findByLabelText("Name").clear().type(name);
+ }
+ cy.button("Save").click();
+ });
+ cy.wait("@createCard");
+}
+
+function getActionButton(title) {
+ return cy.findByTestId("action-buttons").button(title);
+}
+
+function getPlusButton() {
+ // eslint-disable-next-line metabase/no-unsafe-element-filtering
+ return cy.findAllByTestId("notebook-cell-item").last();
+}
+
+function startNewJoin({ stageIndex } = {}) {
+ H.getNotebookStep("data", { stage: stageIndex }).within(() =>
+ getActionButton("Join data").click(),
+ );
+}
+
+function startNewCustomColumn({ stageIndex } = {}) {
+ H.getNotebookStep("data", { stage: stageIndex }).within(() =>
+ getActionButton("Custom column").click(),
+ );
+}
+
+function startNewFilter({ stageIndex } = {}) {
+ H.getNotebookStep("filter", { stage: stageIndex }).within(() =>
+ getPlusButton().click(),
+ );
+}
+
+function startNewAggregation({ stageIndex } = {}) {
+ H.getNotebookStep("summarize", { stage: stageIndex })
+ .findByTestId("aggregate-step")
+ .within(() => getPlusButton().click());
+}
+
+function startNewBreakout({ stageIndex } = {}) {
+ H.getNotebookStep("summarize", { stage: stageIndex })
+ .findByTestId("breakout-step")
+ .within(() => getPlusButton().click());
+}
+
+function addStringCategoryFilter({ tableName, columnName, values }) {
+ startNewFilter();
+ H.popover().within(() => {
+ if (tableName) {
+ cy.findByText(tableName).click();
+ }
+ cy.findByText(columnName).click();
+ values.forEach((value) => cy.findByText(value).click());
+ cy.button("Add filter").click();
+ });
+}
+
+function addNumberBetweenFilter({ tableName, columnName, minValue, maxValue }) {
+ startNewFilter();
+ H.popover().within(() => {
+ if (tableName) {
+ cy.findByText(tableName).click();
+ }
+ cy.findByText(columnName).click();
+ cy.findByPlaceholderText("Min").type(String(minValue));
+ cy.findByPlaceholderText("Max").type(String(maxValue));
+ cy.button("Add filter").click();
+ });
+}
+
+function addBreakout({ tableName, columnName, bucketName, stageIndex }) {
+ startNewBreakout({ stageIndex });
+ if (tableName) {
+ H.popover().findByText(tableName).click();
+ }
+ if (bucketName) {
+ H.changeBinningForDimension({
+ name: columnName,
+ fromBinning: "by month",
+ toBinning: bucketName,
+ });
+ } else {
+ H.popover().findByText(columnName).click();
+ }
+}
+
+function verifyScalarValue(value) {
+ cy.findByTestId("scalar-value").should("have.text", value).and("be.visible");
+}
+
+function verifyLineAreaBarChart({ xAxis, yAxis }) {
+ H.echartsContainer().within(() => {
+ cy.findByText(yAxis).should("be.visible");
+ cy.findByText(xAxis).should("be.visible");
+ });
+}
+
describe("scenarios > metrics > editing", () => {
beforeEach(() => {
H.restore();
@@ -75,25 +197,30 @@ describe("scenarios > metrics > editing", () => {
describe("organization", () => {
it("should be able to rename a metric", () => {
- const newTitle = "New metric name";
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) => {
H.visitMetric(card.id);
- renameMetric(newTitle);
- H.visitMetric(card.id);
- H.queryBuilderHeader()
- .findByDisplayValue(newTitle)
- .should("be.visible");
});
+ H.MetricPage.aboutPage()
+ .findByDisplayValue(ORDERS_SCALAR_METRIC.name)
+ .clear()
+ .type("New metric name{enter}");
+ cy.wait("@updateCard");
+ H.MetricPage.aboutPage()
+ .findByDisplayValue("New metric name")
+ .should("be.visible");
});
it("should be able to change the query definition of a metric", () => {
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) =>
- H.visitMetric(card.id),
+ cy.visit(`/metric/${card.id}/query`),
);
- H.openQuestionActions();
- H.popover().findByText("Edit metric definition").click();
+ H.MetricPage.queryEditor().should("be.visible");
addBreakout({ tableName: "Product", columnName: "Created At" });
- updateMetric();
+ H.MetricPage.saveButton().click();
+ H.MetricPage.saveButton().should("not.exist");
+ H.MetricPage.aboutTab().click();
verifyLineAreaBarChart({
xAxis: "Product → Created At: Month",
yAxis: "Count",
@@ -101,13 +228,15 @@ describe("scenarios > metrics > editing", () => {
});
it("should be able to change the query definition of a metric based on a model", () => {
+ cy.intercept("PUT", "/api/card/*").as("updateCard");
H.createQuestion(ORDERS_SCALAR_MODEL_METRIC).then(({ body: card }) =>
- H.visitMetric(card.id),
+ cy.visit(`/metric/${card.id}/query`),
);
- H.openQuestionActions();
- H.popover().findByText("Edit metric definition").click();
+ H.MetricPage.queryEditor().should("be.visible");
addBreakout({ tableName: "Product", columnName: "Created At" });
- updateMetric();
+ H.MetricPage.saveButton().click();
+ cy.wait("@updateCard");
+ H.MetricPage.aboutTab().click();
verifyLineAreaBarChart({
xAxis: "Product → Created At: Month",
yAxis: "Count",
@@ -121,29 +250,26 @@ describe("scenarios > metrics > editing", () => {
.should("be.visible")
.click();
- cy.log("Verify metric_create_started event was tracked");
H.expectUnstructuredSnowplowEvent({
event: "metric_create_started",
triggered_from: "browse_metrics",
});
+ H.MetricPage.queryEditor().should("be.visible");
H.miniPicker().within(() => {
cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
- saveMetric();
+ saveNewMetric();
- cy.log("Verify metric_created event was tracked");
H.expectUnstructuredSnowplowEvent({
event: "metric_created",
triggered_from: "main_app",
result: "success",
});
- cy.log("Go to the collection this metric was saved in");
- cy.findByTestId("head-crumbs-container")
- .find('a[href*="collection"]')
- .click();
+ H.MetricPage.aboutPage().should("be.visible");
+ H.MetricPage.header().findByText("Our analytics").click();
cy.findByTestId("pinned-items").within(() => {
cy.findByRole("heading", { name: "Metrics" }).should("be.visible");
@@ -151,122 +277,95 @@ describe("scenarios > metrics > editing", () => {
});
});
- it("should not crash when cancelling creation of a new metric (metabase#48024)", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
- cancelMetricEditing();
- });
+ it("should not crash when cancelling creation or editing of a metric (metabase#48024)", () => {
+ cy.log("cancel new metric creation");
+ startNewMetricWithTable("Sample Database", "Orders");
+ H.MetricPage.cancelButton().click();
- it("should not crash when cancelling editing of an existing metric (metabase#48024)", () => {
+ cy.log("cancel editing an existing metric");
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) =>
- H.visitMetric(card.id),
+ cy.visit(`/metric/${card.id}/query`),
);
- H.openQuestionActions();
- H.popover().findByText("Edit metric definition").click();
+ H.MetricPage.queryEditor().should("be.visible");
addBreakout({ tableName: "Product", columnName: "Created At" });
- cancelMetricEditing();
- verifyScalarValue("18,760");
+ H.MetricPage.cancelButton().click();
+ H.getNotebookStep("summarize").findByText("Count").should("be.visible");
});
});
describe("data source", () => {
it("should create a metric based on a table", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ startNewMetricWithTable("Sample Database", "Orders");
addStringCategoryFilter({
tableName: "Product",
columnName: "Category",
values: ["Gadget"],
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("4,939");
});
it("should create a metric based on a saved question", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText("Orders").click();
- });
+ startNewMetricWithSavedItem("Our analytics", "Orders");
addStringCategoryFilter({
tableName: "Product",
columnName: "Category",
values: ["Gadget"],
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("4,939");
});
it("should create a metric based on a multi-stage saved question", () => {
H.createQuestion(ORDERS_MULTI_STAGE_QUESTION);
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText(ORDERS_MULTI_STAGE_QUESTION.name).click();
- });
+ startNewMetricWithSavedItem(
+ "Our analytics",
+ ORDERS_MULTI_STAGE_QUESTION.name,
+ );
addNumberBetweenFilter({
columnName: "Count",
minValue: 5,
maxValue: 100,
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("5");
});
it("should create a metric based on a model", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText("Orders Model").click();
- });
+ startNewMetricWithSavedItem("Our analytics", "Orders Model");
addStringCategoryFilter({
tableName: "Product",
columnName: "Category",
values: ["Gadget"],
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("4,939");
});
it("should create a metric based on a multi-stage model", () => {
H.createQuestion({ ...ORDERS_MULTI_STAGE_QUESTION, type: "model" });
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText(ORDERS_MULTI_STAGE_QUESTION.name).click();
- });
+ startNewMetricWithSavedItem(
+ "Our analytics",
+ ORDERS_MULTI_STAGE_QUESTION.name,
+ );
addNumberBetweenFilter({
columnName: "Count",
minValue: 5,
maxValue: 100,
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("5");
});
it("should not allow to create a multi-stage metric", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Our analytics").click();
- cy.findByText("Orders Model").click();
- });
+ startNewMetricWithSavedItem("Our analytics", "Orders Model");
getActionButton("Summarize").should("not.exist");
});
it("should allow to run the query from the metric empty state", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ startNewMetricWithTable("Sample Database", "Orders");
cy.intercept("POST", "/api/dataset").as("dataset");
- cy.findByTestId("metric-empty-state").button("Visualize").click();
+ H.runButtonInOverlay().click();
cy.wait("@dataset");
verifyScalarValue("18,760");
});
@@ -274,11 +373,7 @@ describe("scenarios > metrics > editing", () => {
describe("joins", () => {
it("should join a table", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Products").click();
- });
+ startNewMetricWithTable("Sample Database", "Products");
startNewJoin();
H.miniPicker().within(() => {
cy.findByText("Sample Database").click();
@@ -291,23 +386,19 @@ describe("scenarios > metrics > editing", () => {
cy.findByText("CA").click();
cy.button("Add filter").click();
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("613");
});
it("should not be possible to join a metric", () => {
H.createQuestion(ORDERS_SCALAR_METRIC);
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ startNewMetricWithTable("Sample Database", "Orders");
startNewJoin();
H.miniPicker().within(() => {
cy.findByText("Our analytics").click();
cy.findByText("Orders").should("be.visible");
cy.findByText(ORDERS_SCALAR_METRIC.name).should("not.exist");
- cy.findByText("Our analytics").click(); // go back
+ cy.findByText("Our analytics").click();
});
H.miniPickerBrowseAll().click();
H.entityPickerModal().within(() => {
@@ -332,12 +423,9 @@ describe("scenarios > metrics > editing", () => {
});
describe("custom columns", () => {
- it("should be able to use custom columns in metric queries (metabase#42360)", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ it("should be able to use custom columns and implicitly joinable columns in metric queries (metabase#42360)", () => {
+ cy.log("custom column from same table");
+ startNewMetricWithTable("Sample Database", "Orders");
startNewCustomColumn();
H.enterCustomColumnDetails({
formula: "[Total] / 2",
@@ -349,16 +437,11 @@ describe("scenarios > metrics > editing", () => {
cy.findByText("Sum of ...").click();
cy.findByText("Total2").click();
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("755,310.84");
- });
- it("should be able to use implicitly joinable columns in custom columns in metric queries (metabase#42360)", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ cy.log("custom column from implicitly joined table");
+ startNewMetricWithTable("Sample Database", "Orders");
startNewCustomColumn();
H.enterCustomColumnDetails({
formula: "[Product → Price] * 2",
@@ -370,25 +453,21 @@ describe("scenarios > metrics > editing", () => {
cy.findByText("Average of ...").click();
cy.findByText("Price2").click();
});
- saveMetric();
+ saveNewMetric();
verifyScalarValue("111.38");
});
});
describe("breakouts", () => {
it("should create a timeseries metric", () => {
- H.startNewMetric();
- H.miniPicker().within(() => {
- cy.findByText("Sample Database").click();
- cy.findByText("Orders").click();
- });
+ startNewMetricWithTable("Sample Database", "Orders");
H.getNotebookStep("summarize").findByText("Count").click();
H.popover().within(() => {
cy.findByText("Sum of ...").click();
cy.findByText("Total").click();
});
addBreakout({ columnName: "Created At" });
- saveMetric();
+ saveNewMetric();
verifyLineAreaBarChart({
xAxis: "Created At: Month",
yAxis: "Sum of Total",
@@ -400,6 +479,7 @@ describe("scenarios > metrics > editing", () => {
it("should create a metric with a custom aggregation expression based on 1 metric", () => {
H.createQuestion(ORDERS_SCALAR_METRIC);
H.startNewMetric();
+ H.MetricPage.queryEditor().should("be.visible");
cy.intercept("POST", "/api/dataset/query_metadata").as("metadata");
H.miniPicker().within(() => {
cy.findByText("Our analytics").click();
@@ -415,18 +495,16 @@ describe("scenarios > metrics > editing", () => {
blur: true,
});
H.popover().button("Update").should("not.be.disabled").click();
- saveMetric();
+ saveNewMetric();
verifyScalarValue("9,380");
});
it("should have metric-specific summarize step copy", () => {
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) =>
- H.visitMetric(card.id),
+ cy.visit(`/metric/${card.id}/query`),
);
- H.openQuestionActions();
- H.popover().findByText("Edit metric definition").click();
+ H.MetricPage.queryEditor().should("be.visible");
- cy.log("regular screen");
H.getNotebookStep("summarize").within(() => {
cy.findByText("Formula").should("be.visible");
cy.findAllByText("Default time dimension")
@@ -434,7 +512,6 @@ describe("scenarios > metrics > editing", () => {
.should("have.length", 1);
});
- cy.log("mobile screen");
cy.viewport(800, 600);
H.getNotebookStep("summarize").within(() => {
cy.findByText("Formula").should("be.visible");
@@ -500,7 +577,6 @@ describe("scenarios > metrics > editing", () => {
cy.findByText("Metrics").click();
cy.findByText(ORDERS_SCALAR_FILTER_METRIC.name).should("be.visible");
cy.findByText(ORDERS_SCALAR_FILTER_METRIC.name).realHover();
-
cy.findByLabelText("More info").should("exist").realHover();
});
@@ -511,130 +587,3 @@ describe("scenarios > metrics > editing", () => {
});
});
});
-
-function getActionButton(title) {
- return cy.findByTestId("action-buttons").button(title);
-}
-
-function getPlusButton() {
- // eslint-disable-next-line metabase/no-unsafe-element-filtering
- return cy.findAllByTestId("notebook-cell-item").last();
-}
-
-function startNewJoin({ stageIndex } = {}) {
- H.getNotebookStep("data", { stage: stageIndex }).within(() =>
- getActionButton("Join data").click(),
- );
-}
-
-function startNewCustomColumn({ stageIndex } = {}) {
- H.getNotebookStep("data", { stage: stageIndex }).within(() =>
- getActionButton("Custom column").click(),
- );
-}
-
-function startNewFilter({ stageIndex } = {}) {
- H.getNotebookStep("filter", { stage: stageIndex }).within(() =>
- getPlusButton().click(),
- );
-}
-
-function startNewAggregation({ stageIndex } = {}) {
- H.getNotebookStep("summarize", { stage: stageIndex })
- .findByTestId("aggregate-step")
- .within(() => getPlusButton().click());
-}
-
-function startNewBreakout({ stageIndex } = {}) {
- H.getNotebookStep("summarize", { stage: stageIndex })
- .findByTestId("breakout-step")
- .within(() => getPlusButton().click());
-}
-
-function addStringCategoryFilter({ tableName, columnName, values }) {
- startNewFilter();
- H.popover().within(() => {
- if (tableName) {
- cy.findByText(tableName).click();
- }
- cy.findByText(columnName).click();
- values.forEach((value) => cy.findByText(value).click());
- cy.button("Add filter").click();
- });
-}
-
-function addNumberBetweenFilter({ tableName, columnName, minValue, maxValue }) {
- startNewFilter();
- H.popover().within(() => {
- if (tableName) {
- cy.findByText(tableName).click();
- }
- cy.findByText(columnName).click();
- cy.findByPlaceholderText("Min").type(String(minValue));
- cy.findByPlaceholderText("Max").type(String(maxValue));
- cy.button("Add filter").click();
- });
-}
-
-function addBreakout({ tableName, columnName, bucketName, stageIndex }) {
- startNewBreakout({ stageIndex });
- if (tableName) {
- H.popover().findByText(tableName).click();
- }
- if (bucketName) {
- H.popover().findByLabelText(columnName).findByText("by month").click();
- // eslint-disable-next-line metabase/no-unsafe-element-filtering
- H.popover().last().findByText(bucketName).click();
- } else {
- H.popover().findByText(columnName).click();
- }
-}
-
-function saveMetric({ name } = {}) {
- cy.intercept("POST", "/api/card").as("createCard");
- cy.button("Save").click();
- H.modal().within(() => {
- cy.findByText("Save metric").should("be.visible");
- if (name) {
- cy.findByLabelText("Name").clear().type(name);
- }
- cy.button("Save").click();
- });
- cy.wait("@createCard");
-}
-
-function updateMetric() {
- cy.intercept("PUT", "/api/card/*").as("updateCard");
- cy.button("Save changes").click();
- cy.wait("@updateCard");
-}
-
-function renameMetric(newName) {
- cy.intercept("PUT", "/api/card/*").as("updateCard");
- cy.findByTestId("saved-question-header-title").clear().type(newName).blur();
- cy.wait("@updateCard");
-}
-
-function verifyScalarValue(value) {
- cy.findByTestId("scalar-value").should("have.text", value).and("be.visible");
-}
-
-function verifyLineAreaBarChart({ xAxis, yAxis }) {
- H.echartsContainer().within(() => {
- cy.findByText(yAxis).should("be.visible");
- cy.findByText(xAxis).should("be.visible");
- });
-}
-
-function cancelMetricEditing() {
- cy.log("click cancel but do not confirm");
- cy.button("Cancel").click();
- H.modal().button("Cancel").click();
- H.modal().should("not.exist");
- H.appBar().should("not.exist");
-
- cy.log("click cancel and confirm");
- cy.button("Cancel").click();
- H.modal().button("Discard changes").click();
- H.appBar().should("be.visible");
-}
diff --git a/e2e/test/scenarios/metrics/metrics-question.cy.spec.js b/e2e/test/scenarios/metrics/metrics-question.cy.spec.js
index 7f0ec0ca6b0..1ff5eac4e84 100644
--- a/e2e/test/scenarios/metrics/metrics-question.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-question.cy.spec.js
@@ -45,6 +45,29 @@ const ORDERS_TIMESERIES_METRIC = {
display: "line",
};
+const MONTH_BREAKOUT = [
+ "field",
+ ORDERS.CREATED_AT,
+ { "base-type": "type/DateTime", "temporal-unit": "month" },
+];
+
+function createQuestionWithMetric(
+ metricId,
+ { display = "line", breakout } = {},
+) {
+ const query = {
+ "source-table": ORDERS_ID,
+ aggregation: [["metric", metricId]],
+ };
+ if (breakout) {
+ query.breakout = [breakout];
+ }
+ return H.createQuestion(
+ { name: "Question with metric", type: "question", display, query },
+ { visitQuestion: true },
+ );
+}
+
describe("scenarios > metrics > question", () => {
beforeEach(() => {
H.restore();
@@ -54,7 +77,7 @@ describe("scenarios > metrics > question", () => {
it("should be able to move a metric to a different collection", () => {
H.createQuestion(ORDERS_SCALAR_METRIC, { visitQuestion: true });
- H.openQuestionActions();
+ H.MetricPage.moreMenu().click();
H.popover().findByText("Move").click();
H.modal().within(() => {
cy.findByText("First collection").click();
@@ -64,30 +87,34 @@ describe("scenarios > metrics > question", () => {
cy.findByText(/Metric moved to/).should("be.visible");
cy.findByText("First collection").should("be.visible");
});
- H.queryBuilderHeader().findByText("First collection").should("be.visible");
+ H.MetricPage.header().findByText("First collection").should("be.visible");
});
- it("should be able to add a filter with an ad-hoc question", () => {
- H.createQuestion(ORDERS_SCALAR_METRIC, { visitQuestion: true });
- H.filter();
+ it("should be able to add a filter to a question that uses a metric", () => {
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { display: "scalar" });
+ });
+ H.openNotebook();
+ H.filter({ mode: "notebook" });
H.popover().within(() => {
cy.findByText("Product").click();
cy.findByText("Category").click();
cy.findByText("Gadget").click();
- cy.button("Apply filter").click();
+ cy.button("Add filter").click();
});
+ H.visualize();
cy.findByTestId("scalar-container")
.findByText("4,939")
.should("be.visible");
});
it("should be able to add a custom aggregation expression based on a metric", () => {
- H.createQuestion(ORDERS_TIMESERIES_METRIC, { visitQuestion: true });
- cy.findByTestId("qb-header-action-panel")
- .button(/Summarize/)
- .click();
- cy.findByTestId("sidebar-content")
- .button(ORDERS_TIMESERIES_METRIC.name)
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { breakout: MONTH_BREAKOUT });
+ });
+ H.openNotebook();
+ H.getNotebookStep("summarize")
+ .findByText(ORDERS_TIMESERIES_METRIC.name)
.click();
H.enterCustomColumnDetails({
formula: `[${ORDERS_TIMESERIES_METRIC.name}] * 2`,
@@ -95,39 +122,50 @@ describe("scenarios > metrics > question", () => {
format: true,
});
H.popover().button("Update").should("not.be.disabled").click();
+ H.visualize();
H.echartsContainer().findByText("Expression").should("be.visible");
});
- it("should be able to add a breakout with an ad-hoc question", () => {
- H.createQuestion(ORDERS_TIMESERIES_METRIC, { visitQuestion: true });
- cy.findByTestId("qb-header-action-panel")
- .button(/Summarize/)
+ it("should be able to add a breakout to a question that uses a metric", () => {
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { breakout: MONTH_BREAKOUT });
+ });
+ H.openNotebook();
+ H.getNotebookStep("summarize")
+ .findByTestId("breakout-step")
+ .findByText("Created At: Month")
.click();
- cy.findByTestId("sidebar-content").findByText("Category").click();
+ H.popover().within(() => {
+ cy.findByText("Product").click();
+ cy.findByText("Category").click();
+ });
+ H.visualize();
H.echartsContainer().findByText("Product → Category").should("be.visible");
});
it("should be able to change the temporal unit when consuming a timeseries metric", () => {
- H.createQuestion(ORDERS_TIMESERIES_METRIC, { visitQuestion: true });
- H.assertQueryBuilderRowCount(49);
- cy.findByTestId("qb-header-action-panel")
- .button(/Summarize/)
- .click();
- cy.findByTestId("sidebar-content")
- .findByTestId("pinned-dimensions")
- .findByLabelText("Created At")
- .findByText("by month")
- .realHover()
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { breakout: MONTH_BREAKOUT });
+ });
+ H.openNotebook();
+ H.getNotebookStep("summarize")
+ .findByTestId("breakout-step")
+ .findByText("Created At: Month")
.click();
- H.popover().findByText("Year").click();
+ H.changeBinningForDimension({
+ name: "Created At",
+ fromBinning: "by month",
+ toBinning: "Year",
+ });
+ H.visualize();
H.assertQueryBuilderRowCount(5);
});
it("should be able to drill-thru with a metric", () => {
- H.createQuestion(ORDERS_TIMESERIES_METRIC, { visitQuestion: true });
- H.cartesianChartCircle()
- .eq(23) // random dot
- .click({ force: true });
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { breakout: MONTH_BREAKOUT });
+ });
+ H.cartesianChartCircle().eq(23).click({ force: true });
H.popover().within(() => {
cy.findByText("Break out by…").click();
cy.findByText("Category").click();
@@ -138,10 +176,10 @@ describe("scenarios > metrics > question", () => {
});
it("should be able to drill-thru with a metric without the aggregation clause", () => {
- H.createQuestion(ORDERS_TIMESERIES_METRIC, { visitQuestion: true });
- H.cartesianChartCircle()
- .eq(23) // random dot
- .click({ force: true });
+ H.createQuestion(ORDERS_TIMESERIES_METRIC).then(({ body: metric }) => {
+ createQuestionWithMetric(metric.id, { breakout: MONTH_BREAKOUT });
+ });
+ H.cartesianChartCircle().eq(23).click({ force: true });
H.popover().findByText("See these Orders").click();
cy.wait("@dataset");
cy.findByTestId("qb-filters-panel")
@@ -153,12 +191,12 @@ describe("scenarios > metrics > question", () => {
it("should be able to view a table-based metric without data access", () => {
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) => {
cy.signInAsSandboxedUser();
- H.visitMetric(card.id, { hasDataAccess: false });
+ H.visitMetric(card.id);
});
cy.findByTestId("scalar-container")
.findByText("18,760")
.should("be.visible");
- cy.findByTestId("qb-header-action-panel").within(() => {
+ H.MetricPage.aboutPage().within(() => {
cy.button(/Filter/).should("not.exist");
cy.button(/Summarize/).should("not.exist");
});
@@ -167,12 +205,12 @@ describe("scenarios > metrics > question", () => {
it("should be able to view a model-based metric without data access", () => {
H.createQuestion(ORDERS_SCALAR_MODEL_METRIC).then(({ body: card }) => {
cy.signInAsSandboxedUser();
- H.visitMetric(card.id, { hasDataAccess: false });
+ H.visitMetric(card.id);
});
cy.findByTestId("scalar-container")
.findByText("18,760")
.should("be.visible");
- cy.findByTestId("qb-header-action-panel").within(() => {
+ H.MetricPage.aboutPage().within(() => {
cy.button(/Filter/).should("not.exist");
cy.button(/Summarize/).should("not.exist");
});
@@ -191,27 +229,16 @@ describe("scenarios > metrics > question", () => {
collection_id: FIRST_COLLECTION_ID,
}).then(({ body: card }) => {
cy.signIn("nocollection");
- H.visitMetric(card.id, { hasDataAccess: false });
+ H.visitMetric(card.id);
});
cy.findByTestId("scalar-container")
.findByText("18,760")
.should("be.visible");
- cy.findByTestId("qb-header-action-panel").within(() => {
+ H.MetricPage.aboutPage().within(() => {
cy.button(/Filter/).should("not.exist");
cy.button(/Summarize/).should("not.exist");
});
});
-
- it("should not show 'Replace existing question' option when saving an edited ad-hoc question from a metric (metabase#48555)", () => {
- cy.signInAsNormalUser();
- H.createQuestion(ORDERS_SCALAR_METRIC, { visitQuestion: true });
-
- H.summarize();
- cy.button("Done").click();
-
- H.queryBuilderHeader().button("Save").click();
- H.modal().findByText("Replace or save as new?").should("not.exist");
- });
});
describe("metrics", () => {
@@ -233,12 +260,9 @@ describe("metrics", () => {
{ ...ORDERS_SCALAR_METRIC, name: "Metric Baz" },
{ visitQuestion: true },
);
- cy.findByTestId("qb-header").findByLabelText("Bookmark").click();
- H.expectUnstructuredSnowplowEvent({
- event: "bookmark_added",
- event_detail: "metric",
- triggered_from: "qb_action_panel",
- });
+ H.MetricPage.moreMenu().click();
+ H.popover().findByTextEnsureVisible("Bookmark").click();
+ H.navigationSidebar().findByText("Metric Baz").should("be.visible");
H.navigationSidebar().findByText("Our analytics").click();
cy.findAllByTestId("collection-entry")
diff --git a/e2e/test/scenarios/metrics/metrics-search.cy.spec.js b/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
index cc14e8dcff3..e1e002ded83 100644
--- a/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
+++ b/e2e/test/scenarios/metrics/metrics-search.cy.spec.js
@@ -29,10 +29,7 @@ describe("scenarios > metrics > search", () => {
H.commandPalette()
.findByRole("option", { name: ORDERS_SCALAR_METRIC.name })
.click();
- cy.wait("@metricDataset");
- H.MetricsViewer.searchBarPills()
- .contains("Count of orders")
- .should("be.visible");
+ H.MetricPage.aboutPage().should("be.visible");
});
it("should be able to search for metrics on the search page", () => {
@@ -53,25 +50,18 @@ describe("scenarios > metrics > search", () => {
cy.findByText("1 result").should("be.visible");
cy.findByText(ORDERS_SCALAR_METRIC.name).click();
});
- cy.wait("@metricDataset");
- H.MetricsViewer.searchBarPills()
- .contains("Count of orders")
- .should("be.visible");
+ H.MetricPage.aboutPage().should("be.visible");
});
it("should see metrics in recent items in global search", () => {
H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) => {
H.visitMetric(card.id);
- cy.wait("@dataset");
});
- H.navigationSidebar().findByText("Home").click();
+ cy.visit("/");
H.commandPaletteSearch(ORDERS_SCALAR_METRIC.name, false);
H.commandPalette()
.findByRole("option", { name: ORDERS_SCALAR_METRIC.name })
.click();
- cy.wait("@metricDataset");
- H.MetricsViewer.searchBarPills()
- .contains("Count of orders")
- .should("be.visible");
+ H.MetricPage.aboutPage().should("be.visible");
});
});
diff --git a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
index 6109e3c86a7..36400ea4754 100644
--- a/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
+++ b/e2e/test/scenarios/metrics/reproductions/metrics-reproductions.cy.spec.ts
@@ -46,9 +46,6 @@ describe("issue 47058", () => {
cy.findByText("[Unknown Metric]").should("not.exist");
cy.wait("@metadata");
- cy.log(
- "Only renders the notebook editor (with the summarize button that has the metrics' name on it) after the metadata is loaded",
- );
cy.findByText("Loading...").should("not.exist");
H.getNotebookStep("summarize").should("be.visible");
@@ -98,7 +95,7 @@ describe("issue 44171", () => {
cy.signInAsAdmin();
H.createQuestion(METRIC_A);
- H.createQuestion(METRIC_B, { visitQuestion: true });
+ H.createQuestion(METRIC_B, { wrapId: true, idAlias: "metricBId" });
H.createDashboard(
{
name: "Dashboard 44171",
@@ -112,23 +109,23 @@ describe("issue 44171", () => {
cy.intercept("PUT", "/api/card/*").as("saveCard");
cy.intercept("POST", "/api/card/*/query").as("cardQuery");
- H.openQuestionActions();
- H.popover().findByText("Edit metric definition").click();
- H.getNotebookStep("summarize").button("Count").click();
+ cy.get<number>("@metricBId").then((metricBId) => {
+ cy.visit(`/metric/${metricBId}/query`);
+ });
+ H.MetricPage.queryEditor().should("be.visible");
+
+ H.getNotebookStep("summarize").findByText("Count").click();
H.popover().within(() => {
cy.findByText("Sum of ...").click();
cy.findByText("Total").click();
});
- cy.button("Save changes").click();
+ H.MetricPage.saveButton().click();
+ cy.wait("@saveCard");
+
cy.get<number>("@dashboardId").then((id) => {
H.visitDashboard(id);
});
- cy.get("@saveCard")
- .its("request.body")
- .its("visualization_settings")
- .should("not.exist");
-
H.editDashboard();
cy.findByTestId("dashboard-header")
.findByLabelText("Add questions")
@@ -154,53 +151,52 @@ describe("issue 32037", () => {
beforeEach(() => {
H.restore();
cy.signInAsNormalUser();
- H.createQuestion({
- name: "Metric 32037",
- type: "metric",
- display: "line",
- query: {
- "source-table": ORDERS_ID,
- aggregation: [["count"]],
- breakout: [
- [
- "field",
- ORDERS.CREATED_AT,
- { "temporal-unit": "month", "base-type": "type/DateTime" },
+ H.createQuestion(
+ {
+ name: "Metric 32037",
+ type: "metric",
+ display: "line",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ [
+ "field",
+ ORDERS.CREATED_AT,
+ { "temporal-unit": "month", "base-type": "type/DateTime" },
+ ],
],
- ],
+ },
},
- });
+ { wrapId: true, idAlias: "metricId" },
+ );
});
it("should show unsaved changes modal and allow to discard changes when editing a metric (metabase#32037)", () => {
- cy.visit("/browse/metrics");
- cy.findByLabelText("Metric 32037").click();
-
- H.MetricsViewer.openMetricHomePage("Metric 32037");
+ cy.get<number>("@metricId").then((metricId) => {
+ cy.visit(`/metric/${metricId}/query`);
+ });
+ H.MetricPage.queryEditor().should("be.visible");
+ H.MetricPage.saveButton().should("not.exist");
- H.cartesianChartCircle().should("be.visible");
- cy.location("pathname").as("metricPathname");
- H.openQuestionActions("Edit metric definition");
- cy.button("Save changes").should("be.disabled");
- H.filter({ mode: "notebook" });
+ H.getNotebookStep("summarize").findByText("Count").click();
H.popover().within(() => {
+ cy.findByText("Sum of ...").click();
cy.findByText("Total").click();
- cy.findByPlaceholderText("Min").type("0");
- cy.findByPlaceholderText("Max").type("100");
- cy.button("Add filter").click();
});
- cy.button("Save changes").should("be.enabled");
- cy.go("back");
+
+ H.MetricPage.saveButton().should("be.visible");
+
+ H.MetricPage.aboutTab().click();
H.modal().within(() => {
cy.findByText("Discard your changes?").should("be.visible");
cy.findByText("Discard changes").click();
});
- H.appBar().should("be.visible");
- cy.button("Save changes").should("not.exist");
- cy.get("@metricPathname").then((metricPathname) => {
- cy.location("pathname").should("eq", metricPathname);
+ H.MetricPage.aboutPage().should("be.visible");
+ cy.get<number>("@metricId").then((metricId) => {
+ cy.location("pathname").should("eq", `/metric/${metricId}`);
});
});
});
@@ -216,21 +212,22 @@ describe("issue 30574", () => {
cy.log("create the first metric");
H.main().findByText("Create metric").click();
+ H.MetricPage.queryEditor().should("be.visible");
H.miniPicker().within(() => {
cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
});
- cy.findByTestId("edit-bar").button("Save").click();
+ H.MetricPage.saveButton().click();
H.modal().within(() => {
cy.findByLabelText("Name").clear().type("M1");
cy.button("Save").click();
});
- H.queryBuilderHeader().should("be.visible");
+ H.MetricPage.aboutPage().should("be.visible");
cy.log("create the second metric");
- H.openNavigationSidebar();
H.navigationSidebar().findByText("Metrics").click();
H.main().findByLabelText("Create a new metric").click();
+ H.MetricPage.queryEditor().should("be.visible");
H.miniPicker().within(() => {
cy.findByText("Sample Database").click();
cy.findByText("Orders").click();
@@ -242,12 +239,11 @@ describe("issue 30574", () => {
formula: "[M1]/[M1]",
});
H.popover().button("Update").click();
- cy.findByTestId("edit-bar").button("Save").click();
+ H.MetricPage.saveButton().click();
H.modal().within(() => {
cy.findByLabelText("Name").clear().type("M2");
cy.button("Save").click();
});
- H.queryBuilderHeader().should("be.visible");
- H.assertQueryBuilderRowCount(1);
+ H.MetricPage.aboutPage().should("be.visible");
});
});
diff --git a/e2e/test/scenarios/models/models-revision-history.cy.spec.js b/e2e/test/scenarios/models/models-revision-history.cy.spec.js
index d742a2a12b8..e65b1b2679c 100644
--- a/e2e/test/scenarios/models/models-revision-history.cy.spec.js
+++ b/e2e/test/scenarios/models/models-revision-history.cy.spec.js
@@ -47,5 +47,8 @@ function openRevisionHistory() {
function revertTo(history) {
const r = new RegExp(history);
- cy.findByText(r).closest("li").findByTestId("question-revert-button").click();
+ cy.findByText(r)
+ .closest('[data-testid="revision-history-event"]')
+ .findByTestId("question-revert-button")
+ .click();
}
diff --git a/e2e/test/scenarios/models/reproductions-3.cy.spec.ts b/e2e/test/scenarios/models/reproductions-3.cy.spec.ts
index dfd9f5a4e2b..4c742130f8d 100644
--- a/e2e/test/scenarios/models/reproductions-3.cy.spec.ts
+++ b/e2e/test/scenarios/models/reproductions-3.cy.spec.ts
@@ -974,7 +974,7 @@ describe("issue 45926", () => {
cy.findByText(
"changed the visualization settings and edited the metadata.",
)
- .closest("li")
+ .closest('[data-testid="revision-history-event"]')
.findByTestId("question-revert-button")
.click();
});
diff --git a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js b/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
index f13a1a73925..331628b3803 100644
--- a/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
+++ b/e2e/test/scenarios/onboarding/command-palette.cy.spec.js
@@ -421,7 +421,7 @@ describe("command palette", () => {
H.commandPaletteInput().should("exist").type("Me");
cy.findByText("New metric").should("be.visible").click();
- cy.location("pathname").should("eq", "/metric/query");
+ cy.location("pathname").should("eq", "/metric/new");
});
});
diff --git a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
index e295f0d39a7..7556c190510 100644
--- a/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
+++ b/e2e/test/scenarios/question-reproductions/reproductions-1.cy.spec.js
@@ -677,7 +677,7 @@ describe("issue 17910", () => {
.blur();
cy.findByRole("tab", { name: "History" }).click();
cy.findByTestId("saved-question-history-list")
- .children()
+ .findAllByTestId("revision-history-event")
.should("have.length", 2);
});
});
diff --git a/e2e/test/scenarios/question/offset.cy.spec.ts b/e2e/test/scenarios/question/offset.cy.spec.ts
index 6a104fded71..57aeb891250 100644
--- a/e2e/test/scenarios/question/offset.cy.spec.ts
+++ b/e2e/test/scenarios/question/offset.cy.spec.ts
@@ -1250,9 +1250,30 @@ describe("scenarios > question > offset", () => {
display: "scalar",
};
- H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: card }) =>
- H.visitMetric(card.id),
- );
+ H.createQuestion(ORDERS_SCALAR_METRIC).then(({ body: metric }) => {
+ H.createQuestion(
+ {
+ name: "Question with metric",
+ type: "question",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["metric", metric.id]],
+ breakout: [
+ [
+ "field",
+ ORDERS.CREATED_AT,
+ {
+ "base-type": "type/DateTime",
+ "temporal-unit": "month",
+ },
+ ],
+ ],
+ },
+ display: "line",
+ },
+ { visitQuestion: true },
+ );
+ });
H.openNotebook();
@@ -1263,7 +1284,9 @@ describe("scenarios > question > offset", () => {
H.visualize();
- cy.findByTestId("chart-container").should("contain", "January 2024");
+ H.echartsContainer().within(() => {
+ cy.contains("January 2024").should("be.visible");
+ });
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx
new file mode 100644
index 00000000000..1d823d8b0c5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/components/InsightsMenuItem.tsx
@@ -0,0 +1,37 @@
+import { t } from "ttag";
+
+import { ForwardRefLink } from "metabase/common/components/Link";
+import * as Urls from "metabase/lib/urls";
+import type { InsightsMenuItemProps } from "metabase/plugins";
+import { Icon, Menu } from "metabase/ui";
+import { useGetAuditInfoQuery } from "metabase-enterprise/api";
+
+export const InsightsMenuItem = ({
+ card,
+ label,
+ iconName = "external",
+}: InsightsMenuItemProps) => {
+ const { data: auditInfo, error, isLoading } = useGetAuditInfoQuery();
+
+ if (isLoading || error || !auditInfo?.question_overview) {
+ return null;
+ }
+
+ if (card.collection?.type === "instance-analytics") {
+ return null;
+ }
+
+ const params = new URLSearchParams({ question_id: String(card.id) });
+ const url = `${Urls.dashboard({ id: auditInfo.question_overview, name: "" })}?${params}`;
+
+ return (
+ <Menu.Item
+ component={ForwardRefLink}
+ to={url}
+ target="_blank"
+ leftSection={<Icon name={iconName} />}
+ >
+ {label ?? t`Insights`}
+ </Menu.Item>
+ );
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
index cafbfc6a0c9..91ddf71e387 100644
--- a/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
+++ b/enterprise/frontend/src/metabase-enterprise/audit_app/index.js
@@ -11,6 +11,7 @@ import { Menu } from "metabase/ui";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { InsightsLink } from "./components/InsightsLink";
+import { InsightsMenuItem } from "./components/InsightsMenuItem";
import { getUserMenuRotes } from "./routes";
import { isAuditDb } from "./utils";
@@ -38,5 +39,6 @@ export function initializePlugin() {
PLUGIN_ADMIN_USER_MENU_ROUTES.push(getUserMenuRotes);
PLUGIN_AUDIT.isAuditDb = isAuditDb;
PLUGIN_AUDIT.InsightsLink = InsightsLink;
+ PLUGIN_AUDIT.InsightsMenuItem = InsightsMenuItem;
}
}
diff --git a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
index 246d8d992b7..1ead3257726 100644
--- a/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/caching/pages/MetricCachingPage/MetricCachingPage.tsx
@@ -11,16 +11,23 @@ import CS from "metabase/css/core/index.css";
import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
import * as Urls from "metabase/lib/urls";
+import { MetricPageShell } from "metabase/metrics/components/MetricPageShell";
+import { metricUrls as defaultUrls } from "metabase/metrics/urls";
import type { MetricSettingsPageProps } from "metabase/plugins/oss/caching";
import { Card, Center } from "metabase/ui";
import { getItemName } from "metabase-enterprise/caching/components/utils";
-import { MetricHeader } from "metabase-enterprise/data-studio/library/metrics/components/MetricHeader";
import Question from "metabase-lib/v1/Question";
import type { CacheableModel } from "metabase-types/api";
-const model: CacheableModel[] = ["question"];
+const cachingModel: CacheableModel[] = ["question"];
-export function MetricCachingPage({ params }: MetricSettingsPageProps) {
+export function MetricCachingPage({
+ params,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricSettingsPageProps) {
const cardId = Urls.extractEntityId(params.cardId);
const {
card,
@@ -34,7 +41,7 @@ export function MetricCachingPage({ params }: MetricSettingsPageProps) {
isLoading: isLoadingConfigs,
error: configsError,
} = useCacheConfigs({
- model,
+ model: cachingModel,
id: cardId,
});
@@ -52,14 +59,24 @@ export function MetricCachingPage({ params }: MetricSettingsPageProps) {
const isLoading = isLoadingCard || isLoadingConfigs;
const error = cardError || configsError;
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
return (
<PageContainer pos="relative" data-testid="metric-caching" gap="xl">
- {card && <MetricHeader card={card} />}
- {isLoading || error != null ? (
- <Center h="100%">
- <LoadingAndErrorWrapper loading={isLoading} error={error} />
- </Center>
- ) : question ? (
+ <MetricPageShell
+ card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
+ {question ? (
<Card withBorder flex={1} p={0}>
<StrategyForm
targetId={question.id()}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
new file mode 100644
index 00000000000..38e86949f2e
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/DataStudioMetricBreadcrumbs.tsx
@@ -0,0 +1,33 @@
+import { Link } from "metabase/common/components/Link";
+import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import * as Urls from "metabase/lib/urls";
+import type { Card } from "metabase-types/api";
+
+interface DataStudioMetricBreadcrumbsProps {
+ card: Card;
+}
+
+export function DataStudioMetricBreadcrumbs({
+ card,
+}: DataStudioMetricBreadcrumbsProps) {
+ const { path, isLoadingPath } = useCollectionPath({
+ collectionId: card.collection_id,
+ });
+
+ return (
+ <DataStudioBreadcrumbs loading={isLoadingPath}>
+ {path?.map((collection, index) => (
+ <Link
+ key={collection.id}
+ to={Urls.dataStudioLibrary({
+ expandedIds: path.slice(1, index + 1).map((c) => c.id),
+ })}
+ >
+ {collection.name}
+ </Link>
+ ))}
+ <span>{card.name}</span>
+ </DataStudioBreadcrumbs>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/index.ts
new file mode 100644
index 00000000000..c312164dc52
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/DataStudioMetricBreadcrumbs/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricBreadcrumbs } from "./DataStudioMetricBreadcrumbs";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx
deleted file mode 100644
index 97b1f17b2c7..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricHeader.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import type { ReactNode } from "react";
-
-import { Link } from "metabase/common/components/Link";
-import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs/DataStudioBreadcrumbs";
-import {
- PaneHeader,
- PanelHeaderTitle,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
-import * as Urls from "metabase/lib/urls";
-import type { Card } from "metabase-types/api";
-
-import { MetricMoreMenu } from "./MetricMoreMenu";
-import { MetricNameInput } from "./MetricNameInput";
-import { MetricTabs } from "./MetricTabs";
-
-type MetricHeaderProps = {
- card: Card;
- actions?: ReactNode;
-};
-
-export function MetricHeader({ card, actions }: MetricHeaderProps) {
- const { path, isLoadingPath } = useCollectionPath({
- collectionId: card.collection_id,
- });
-
- return (
- <PaneHeader
- data-testid="metric-header"
- title={
- card.can_write ? (
- <MetricNameInput card={card} />
- ) : (
- <PanelHeaderTitle>{card.name}</PanelHeaderTitle>
- )
- }
- icon="metric"
- menu={<MetricMoreMenu card={card} />}
- tabs={<MetricTabs card={card} />}
- actions={actions}
- breadcrumbs={
- <DataStudioBreadcrumbs loading={isLoadingPath}>
- {path?.map((collection, i) => (
- <Link
- key={collection.id}
- to={Urls.dataStudioLibrary({
- expandedIds: path.slice(1, i + 1).map((c) => c.id),
- })}
- >
- {collection.name}
- </Link>
- ))}
- <span>{card.name}</span>
- </DataStudioBreadcrumbs>
- }
- />
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
deleted file mode 100644
index 12f84e30d6e..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/MetricMoreMenu.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { type ReactNode, useState } from "react";
-import { push } from "react-router-redux";
-import { c, t } from "ttag";
-
-import { ForwardRefLink } from "metabase/common/components/Link";
-import { useDispatch, useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
-import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";
-import { CardCopyModal } from "metabase/questions/components/CardCopyModal";
-import { MoveCardModal } from "metabase/questions/components/MoveCardModal";
-import { getMetadata } from "metabase/selectors/metadata";
-import { ActionIcon, Icon, Menu } from "metabase/ui";
-import * as Lib from "metabase-lib";
-import type { Card } from "metabase-types/api";
-
-type MetricModalType = "move" | "copy" | "archive";
-
-type MetricMoreMenuProps = {
- card: Card;
-};
-
-export function MetricMoreMenu({ card }: MetricMoreMenuProps) {
- const [modalType, setModalType] = useState<MetricModalType>();
-
- return (
- <>
- <MetricMenu card={card} onOpenModal={setModalType} />
- {modalType != null && (
- <MetricModal
- card={card}
- modalType={modalType}
- onClose={() => setModalType(undefined)}
- />
- )}
- </>
- );
-}
-
-type MetricMenuProps = {
- card: Card;
- onOpenModal: (modalType: MetricModalType) => void;
-};
-
-function MetricMenu({ card, onOpenModal }: MetricMenuProps) {
- const menuItems: ReactNode[] = [];
- const metadata = useSelector(getMetadata);
- const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
- const queryInfo = Lib.queryDisplayInfo(query);
-
- menuItems.push(
- <Menu.Item
- key="view"
- leftSection={<Icon name="external" />}
- component={ForwardRefLink}
- to={Urls.exploreMetric(card.id)}
- target="_blank"
- >
- {c("A verb, not a noun").t`View`}
- </Menu.Item>,
- );
-
- if (card.can_write) {
- menuItems.push(
- <Menu.Item
- key="move"
- leftSection={<Icon name="move" />}
- onClick={() => onOpenModal("move")}
- >
- {c("A verb, not a noun").t`Move`}
- </Menu.Item>,
- );
- }
-
- if (queryInfo.isEditable) {
- menuItems.push(
- <Menu.Item
- key="duplicate"
- leftSection={<Icon name="clone" />}
- onClick={() => onOpenModal("copy")}
- >
- {c("A verb, not a noun").t`Duplicate`}
- </Menu.Item>,
- );
- }
-
- if (card.can_write) {
- menuItems.push(
- <Menu.Item
- key="archive"
- leftSection={<Icon name="trash" />}
- onClick={() => onOpenModal("archive")}
- >
- {t`Move to trash`}
- </Menu.Item>,
- );
- }
-
- if (menuItems.length === 0) {
- return null;
- }
-
- return (
- <Menu>
- <Menu.Target>
- <ActionIcon size="sm">
- <Icon name="ellipsis" />
- </ActionIcon>
- </Menu.Target>
- <Menu.Dropdown>{menuItems}</Menu.Dropdown>
- </Menu>
- );
-}
-
-type MetricModalProps = {
- card: Card;
- modalType: MetricModalType;
- onClose: () => void;
-};
-
-function MetricModal({ card, modalType, onClose }: MetricModalProps) {
- const dispatch = useDispatch();
-
- const handleCopy = (newCard: Card) => {
- dispatch(push(Urls.dataStudioMetric(newCard.id)));
- };
-
- const handleArchive = () => {
- dispatch(push(Urls.dataStudioLibrary()));
- };
-
- const handleUnarchive = () => {
- dispatch(push(Urls.dataStudioMetric(card.id)));
- };
-
- switch (modalType) {
- case "move":
- return <MoveCardModal card={card} onClose={onClose} />;
- case "copy":
- return (
- <CardCopyModal card={card} onCopy={handleCopy} onClose={onClose} />
- );
- case "archive":
- return (
- <ArchiveCardModal
- card={card}
- onArchive={handleArchive}
- onUnarchive={handleUnarchive}
- onClose={onClose}
- />
- );
- default:
- return null;
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/index.ts
deleted file mode 100644
index 4b4cd4b1064..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricMoreMenu/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./MetricMoreMenu";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx
new file mode 100644
index 00000000000..b1a7216121c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/DataStudioMetricAboutPage.tsx
@@ -0,0 +1,23 @@
+import { MetricAboutPage } from "metabase/metrics/pages/MetricAboutPage";
+import type { MetricPageParams } from "metabase/metrics/types";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricAboutPageProps {
+ params: MetricPageParams;
+}
+
+export function DataStudioMetricAboutPage({
+ params,
+}: DataStudioMetricAboutPageProps) {
+ return (
+ <MetricAboutPage
+ params={params}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/index.ts
new file mode 100644
index 00000000000..735c06ff337
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricAboutPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricAboutPage } from "./DataStudioMetricAboutPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/DataStudioMetricCachingPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/DataStudioMetricCachingPage.tsx
new file mode 100644
index 00000000000..064c62ff324
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/DataStudioMetricCachingPage.tsx
@@ -0,0 +1,24 @@
+import type { MetricPageParams } from "metabase/metrics/types";
+import { PLUGIN_CACHING } from "metabase/plugins";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricCachingPageProps {
+ params: MetricPageParams;
+}
+
+export function DataStudioMetricCachingPage({
+ params,
+}: DataStudioMetricCachingPageProps) {
+ const CachingPage = PLUGIN_CACHING.MetricCachingPage;
+ return (
+ <CachingPage
+ params={params}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/index.ts
new file mode 100644
index 00000000000..ddc713cfc57
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricCachingPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricCachingPage } from "./DataStudioMetricCachingPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx
new file mode 100644
index 00000000000..3b8416bccad
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/DataStudioMetricDependenciesPage.tsx
@@ -0,0 +1,29 @@
+import type { ReactNode } from "react";
+
+import { MetricDependenciesPage } from "metabase/metrics/pages/MetricDependenciesPage";
+import type { MetricPageParams } from "metabase/metrics/types";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricDependenciesPageProps {
+ params: MetricPageParams;
+ children?: ReactNode;
+}
+
+export function DataStudioMetricDependenciesPage({
+ params,
+ children,
+}: DataStudioMetricDependenciesPageProps) {
+ return (
+ <MetricDependenciesPage
+ params={params}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ >
+ {children}
+ </MetricDependenciesPage>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/index.ts
new file mode 100644
index 00000000000..46feeb333f1
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricDependenciesPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricDependenciesPage } from "./DataStudioMetricDependenciesPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx
new file mode 100644
index 00000000000..20f6fd2e75b
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/DataStudioMetricHistoryPage.tsx
@@ -0,0 +1,23 @@
+import { MetricHistoryPage } from "metabase/metrics/pages/MetricHistoryPage";
+import type { MetricPageParams } from "metabase/metrics/types";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricHistoryPageProps {
+ params: MetricPageParams;
+}
+
+export function DataStudioMetricHistoryPage({
+ params,
+}: DataStudioMetricHistoryPageProps) {
+ return (
+ <MetricHistoryPage
+ params={params}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/index.ts
new file mode 100644
index 00000000000..ef2fdee84af
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricHistoryPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricHistoryPage } from "./DataStudioMetricHistoryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx
new file mode 100644
index 00000000000..f32472701db
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/DataStudioMetricOverviewPage.tsx
@@ -0,0 +1,23 @@
+import { MetricOverviewPage } from "metabase/metrics/pages/MetricOverviewPage";
+import type { MetricPageParams } from "metabase/metrics/types";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricOverviewPageProps {
+ params: MetricPageParams;
+}
+
+export function DataStudioMetricOverviewPage({
+ params,
+}: DataStudioMetricOverviewPageProps) {
+ return (
+ <MetricOverviewPage
+ params={params}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/index.ts
new file mode 100644
index 00000000000..795a8399750
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricOverviewPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricOverviewPage } from "./DataStudioMetricOverviewPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx
new file mode 100644
index 00000000000..084a7f97fa5
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/DataStudioMetricQueryPage.tsx
@@ -0,0 +1,28 @@
+import type { Route } from "react-router";
+
+import { MetricQueryPage } from "metabase/metrics/pages/MetricQueryPage";
+import type { MetricPageParams } from "metabase/metrics/types";
+
+import { DataStudioMetricBreadcrumbs } from "../../components/DataStudioMetricBreadcrumbs";
+import { dataStudioMetricUrls } from "../../urls";
+
+interface DataStudioMetricQueryPageProps {
+ params: MetricPageParams;
+ route: Route;
+}
+
+export function DataStudioMetricQueryPage({
+ params,
+ route,
+}: DataStudioMetricQueryPageProps) {
+ return (
+ <MetricQueryPage
+ params={params}
+ route={route}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ showDataStudioLink={false}
+ renderBreadcrumbs={(card) => <DataStudioMetricBreadcrumbs card={card} />}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/index.ts
new file mode 100644
index 00000000000..ca2a5f6e25c
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/DataStudioMetricQueryPage/index.ts
@@ -0,0 +1 @@
+export { DataStudioMetricQueryPage } from "./DataStudioMetricQueryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.module.css
deleted file mode 100644
index cf6fd02c163..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.module.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.metricLink {
- :hover {
- color: var(--mb-color-brand);
- }
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
deleted file mode 100644
index d683f06cd89..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.root {
- overflow: auto;
-}
-
-.descriptionSection {
- background-color: var(--mb-color-background-primary);
- border: 1px solid var(--mb-color-border);
- border-left: none;
- border-top-right-radius: var(--default-border-radius);
- border-bottom-right-radius: var(--default-border-radius);
- overflow: auto;
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
deleted file mode 100644
index 873aa0798a6..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/MetricOverview.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
-import { Flex, Stack } from "metabase/ui";
-import type { Card } from "metabase-types/api";
-
-import { DescriptionSection } from "./DescriptionSection";
-import S from "./MetricOverview.module.css";
-
-type MetricOverviewProps = {
- card: Card;
-};
-
-export function MetricOverview({ card }: MetricOverviewProps) {
- return (
- <Flex className={S.root} flex={1}>
- <Flex direction="column" flex={1} mah={700}>
- <OverviewVisualization card={card} />
- </Flex>
- <Stack flex="0 0 360px" className={S.descriptionSection} mah={700}>
- <DescriptionSection card={card} />
- </Stack>
- </Flex>
- );
-}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
deleted file mode 100644
index 18a00fa75cc..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./MetricOverview";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
index 69822a251b1..114526f632a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -1,143 +1,39 @@
-import { useDisclosure } from "@mantine/hooks";
import type { Location } from "history";
-import { useMemo, useState } from "react";
import { Link, type Route } from "react-router";
-import { push } from "react-router-redux";
import { t } from "ttag";
-import { useGetDefaultCollectionId } from "metabase/collections/hooks";
-import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";
-import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
-import {
- PaneHeader,
- PaneHeaderActions,
- PaneHeaderInput,
-} from "metabase/data-studio/common/components/PaneHeader";
-import { getResultMetadata } from "metabase/data-studio/common/utils";
-import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
-import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
-import { getMetadata } from "metabase/selectors/metadata";
-import { Card } from "metabase/ui";
-import * as Lib from "metabase-lib";
-import type { Card as CardType } from "metabase-types/api";
+import { NewMetricPage } from "metabase/metrics/pages/NewMetricPage";
-import { MetricQueryEditor } from "../../components/MetricQueryEditor";
-import { NAME_MAX_LENGTH } from "../../constants";
-import { getValidationResult } from "../../utils";
+import { dataStudioMetricUrls } from "../../urls";
-import { CreateMetricModal } from "./CreateMetricModal";
-import { getInitialQuery, getQuery } from "./utils";
-
-type NewMetricPageQuery = {
+interface NewMetricPageQuery {
collectionId?: string;
-};
+}
-type NewMetricPageProps = {
+interface DataStudioNewMetricPageProps {
location: Location<NewMetricPageQuery>;
route: Route;
-};
-
-export function NewMetricPage({ location, route }: NewMetricPageProps) {
- const metadata = useSelector(getMetadata);
- const [name, setName] = useState("");
- const [datasetQuery, setDatasetQuery] = useState(() =>
- Lib.toJsQuery(getInitialQuery(metadata)),
- );
- const [uiState, setUiState] = useState(getInitialUiState);
- const [isModalOpened, { open: openModal, close: closeModal }] =
- useDisclosure();
- const initialCollectionId = Urls.extractCollectionId(
- location.query.collectionId,
- );
- const defaultCollectionId = useGetDefaultCollectionId();
- const dispatch = useDispatch();
-
- const query = useMemo(
- () => getQuery(datasetQuery, metadata),
- [datasetQuery, metadata],
- );
-
- const resultMetadata = useMemo(() => {
- return getResultMetadata(
- datasetQuery,
- uiState.lastRunQuery,
- uiState.lastRunResult,
- );
- }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
-
- const validationResult = useMemo(() => getValidationResult(query), [query]);
-
- const defaultValues = useMemo(
- () => ({
- name,
- result_metadata: resultMetadata,
- collection_id: initialCollectionId ?? defaultCollectionId,
- }),
- [name, resultMetadata, initialCollectionId, defaultCollectionId],
- );
-
- const handleCreate = (card: CardType) => {
- dispatch(push(Urls.dataStudioMetric(card.id)));
- };
-
- const handleChangeQuery = (query: Lib.Query) => {
- setDatasetQuery(Lib.toJsQuery(query));
- };
-
- const handleCancel = () => {
- dispatch(push(Urls.dataStudioLibrary()));
- };
+}
+export function DataStudioNewMetricPage({
+ location,
+ route,
+}: DataStudioNewMetricPageProps) {
return (
- <>
- <PageContainer pos="relative" data-testid="metric-query-editor">
- <PaneHeader
- title={
- <PaneHeaderInput
- initialValue={name}
- placeholder={t`New metric`}
- maxLength={NAME_MAX_LENGTH}
- isOptional
- onChange={setName}
- />
- }
- icon="metric"
- actions={
- <PaneHeaderActions
- errorMessage={validationResult.errorMessage}
- isValid={validationResult.isValid}
- isDirty
- onSave={openModal}
- onCancel={handleCancel}
- />
- }
- breadcrumbs={
- <DataStudioBreadcrumbs>
- <Link to={Urls.dataStudioLibrary()}>{t`Library`}</Link>
- {t`New Metric`}
- </DataStudioBreadcrumbs>
- }
- />
- <Card withBorder p={0} flex={1}>
- <MetricQueryEditor
- query={query}
- uiState={uiState}
- onChangeQuery={handleChangeQuery}
- onChangeUiState={setUiState}
- />
- </Card>
- </PageContainer>
- {isModalOpened && (
- <CreateMetricModal
- query={query}
- defaultValues={defaultValues}
- onCreate={handleCreate}
- onClose={closeModal}
- />
+ <NewMetricPage
+ location={location}
+ route={route}
+ urls={dataStudioMetricUrls}
+ showAppSwitcher
+ triggeredFrom="data_studio"
+ renderBreadcrumbs={() => (
+ <DataStudioBreadcrumbs>
+ <Link to={Urls.dataStudioLibrary()}>{t`Library`}</Link>
+ {t`New Metric`}
+ </DataStudioBreadcrumbs>
)}
- <LeaveRouteConfirmModal route={route} isEnabled={!isModalOpened} />
- </>
+ />
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts
index dbef0459061..465c278c4cb 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/index.ts
@@ -1 +1 @@
-export * from "./NewMetricPage";
+export { DataStudioNewMetricPage } from "./NewMetricPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx
index 874382fb774..4ed2eadcc38 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/routes.tsx
@@ -2,27 +2,32 @@ import { IndexRoute, Route } from "react-router";
import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";
-import { MetricDependenciesPage } from "./pages/MetricDependenciesPage";
-import { MetricOverviewPage } from "./pages/MetricOverviewPage";
-import { MetricQueryPage } from "./pages/MetricQueryPage";
-import { NewMetricPage } from "./pages/NewMetricPage";
+import { DataStudioMetricAboutPage } from "./pages/DataStudioMetricAboutPage";
+import { DataStudioMetricCachingPage } from "./pages/DataStudioMetricCachingPage";
+import { DataStudioMetricDependenciesPage } from "./pages/DataStudioMetricDependenciesPage";
+import { DataStudioMetricHistoryPage } from "./pages/DataStudioMetricHistoryPage";
+import { DataStudioMetricOverviewPage } from "./pages/DataStudioMetricOverviewPage";
+import { DataStudioMetricQueryPage } from "./pages/DataStudioMetricQueryPage";
+import { DataStudioNewMetricPage } from "./pages/NewMetricPage";
export function getDataStudioMetricRoutes() {
return (
<Route path="metrics">
- <Route path="new" component={NewMetricPage} />
- <Route path=":cardId" component={MetricOverviewPage} />
- <Route path=":cardId/query" component={MetricQueryPage} />
+ <Route path="new" component={DataStudioNewMetricPage} />
+ <Route path=":cardId" component={DataStudioMetricAboutPage} />
+ <Route path=":cardId/overview" component={DataStudioMetricOverviewPage} />
+ <Route path=":cardId/query" component={DataStudioMetricQueryPage} />
{PLUGIN_DEPENDENCIES.isEnabled && (
- <Route path=":cardId/dependencies" component={MetricDependenciesPage}>
+ <Route
+ path=":cardId/dependencies"
+ component={DataStudioMetricDependenciesPage}
+ >
<IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
</Route>
)}
+ <Route path=":cardId/history" component={DataStudioMetricHistoryPage} />
{PLUGIN_CACHING.isGranularCachingEnabled() && (
- <Route
- path=":cardId/caching"
- component={PLUGIN_CACHING.MetricCachingPage}
- />
+ <Route path=":cardId/caching" component={DataStudioMetricCachingPage} />
)}
</Route>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
new file mode 100644
index 00000000000..cae5e75b942
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/urls.ts
@@ -0,0 +1,12 @@
+import * as Urls from "metabase/lib/urls";
+import type { MetricUrls } from "metabase/metrics/types";
+
+export const dataStudioMetricUrls: MetricUrls = {
+ about: Urls.dataStudioMetric,
+ overview: Urls.dataStudioMetricOverview,
+ query: Urls.dataStudioMetricQuery,
+ dependencies: Urls.dataStudioMetricDependencies,
+ caching: Urls.dataStudioMetricCaching,
+ history: Urls.dataStudioMetricHistory,
+ database: (databaseId) => Urls.dataStudioData({ databaseId }),
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
index b54231a3ba7..5ed1b15eeda 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.unit.spec.tsx
@@ -2,6 +2,7 @@ import { Route } from "react-router";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
+import { setupCollectionByIdEndpoint } from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
import type {
@@ -10,6 +11,7 @@ import type {
TokenFeatures,
} from "metabase-types/api";
import {
+ createMockCollection,
createMockNativeQuerySnippet,
createMockTokenFeatures,
} from "metabase-types/api/mocks";
@@ -25,6 +27,10 @@ type SetupOps = {
const setup = ({ snippet = {}, remoteSyncType }: SetupOps) => {
const mockSnippet = createMockNativeQuerySnippet(snippet);
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root" })],
+ });
+
const tokenFeatures: Partial<TokenFeatures> = {
remote_sync: !!remoteSyncType,
};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
index 4604e6097aa..44b5824618a 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/EditSnippetPage/tests/setup.tsx
@@ -2,7 +2,10 @@ import { Route } from "react-router";
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import type { ENTERPRISE_PLUGIN_NAME } from "__support__/enterprise-typed";
-import { setupNativeQuerySnippetEndpoints } from "__support__/server-mocks";
+import {
+ setupCollectionByIdEndpoint,
+ setupNativeQuerySnippetEndpoints,
+} from "__support__/server-mocks";
import { mockSettings } from "__support__/settings";
import { renderWithProviders, screen } from "__support__/ui";
import type {
@@ -11,6 +14,7 @@ import type {
TokenFeatures,
} from "metabase-types/api";
import {
+ createMockCollection,
createMockNativeQuerySnippet,
createMockTokenFeatures,
} from "metabase-types/api/mocks";
@@ -33,6 +37,9 @@ export const setup = async ({
}: SetupOps) => {
const mockSnippet = createMockNativeQuerySnippet(snippet);
setupNativeQuerySnippetEndpoints({ snippets: [mockSnippet] });
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root" })],
+ });
const settings = mockSettings({
"remote-sync-type": remoteSyncType,
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index 570bf667b1a..a6a01f3210f 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -53,9 +53,7 @@ export function BrowseMetrics() {
type: "library-metrics",
});
- const newMetricLink = Urls.newQuestion({
- mode: "query",
- cardType: "metric",
+ const newMetricLink = Urls.newMetric({
collectionId: libraryMetricCollection?.id,
});
diff --git a/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx b/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
index 7c11741e29b..b9f26d78f85 100644
--- a/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/browse/metrics/tests/common.unit.spec.tsx
@@ -75,23 +75,22 @@ describe("BrowseMetrics (OSS)", () => {
).toHaveLength(3);
});
- it("should render links that point directly to metrics viewer /explore route (metabase#55166)", async () => {
+ it("should render links that point to metric detail page", async () => {
const { history } = setup({ metricCount: 5 });
const table = await screen.findByRole("table", {
name: /Table of metrics/,
});
expect(
within(table).getByRole("link", { name: /Metric 1/ }),
- ).toHaveAttribute("href", "/explore?metricId=1");
+ ).toHaveAttribute("href", "/metric/1");
expect(
within(table).getByRole("link", { name: /Metric 2/ }),
- ).toHaveAttribute("href", "/explore?metricId=2");
+ ).toHaveAttribute("href", "/metric/2");
expect(screen.queryByTestId("metric-detail-page")).not.toBeInTheDocument();
await userEvent.click(within(table).getByText("Metric 1"));
expect(screen.getByTestId("metric-detail-page")).toBeInTheDocument();
const location = history?.getCurrentLocation();
- expect(location?.pathname).toBe("/explore");
- expect(location?.query).toEqual({ metricId: "1" });
+ expect(location?.pathname).toBe("/metric/1");
});
});
diff --git a/frontend/src/metabase/browse/metrics/tests/setup.tsx b/frontend/src/metabase/browse/metrics/tests/setup.tsx
index e38c094db86..667b9fe498a 100644
--- a/frontend/src/metabase/browse/metrics/tests/setup.tsx
+++ b/frontend/src/metabase/browse/metrics/tests/setup.tsx
@@ -266,7 +266,7 @@ export function setup({
<>
<Route path="/" component={() => <BrowseMetrics />} />
<Route
- path="/explore"
+ path="/metric/:cardId"
component={() => <div data-testid="metric-detail-page" />}
/>
</>,
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.module.css b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.module.css
new file mode 100644
index 00000000000..f43d3bf8c4d
--- /dev/null
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.module.css
@@ -0,0 +1,54 @@
+.root {
+ --icon-size: 24px;
+
+ position: relative;
+}
+
+.event:not(:last-child)::before {
+ content: "";
+ position: absolute;
+ top: calc(var(--mantine-spacing-md) + var(--icon-size) / 2);
+ bottom: calc(-1 * var(--mantine-spacing-md) - var(--icon-size) / 2);
+ left: calc(var(--mantine-spacing-lg) + var(--icon-size) / 2 - 1px);
+ border-inline-start: 2px dotted var(--mb-color-text-tertiary);
+}
+
+.event {
+ display: flex;
+ align-items: flex-start;
+ position: relative;
+ z-index: 0;
+ transition: background 150ms ease;
+ padding: var(--mantine-spacing-md) var(--mantine-spacing-lg)
+ var(--mantine-spacing-md)
+ calc(
+ var(--mantine-spacing-lg) + var(--icon-size) + var(--mantine-spacing-md)
+ );
+}
+
+.event:hover {
+ background: var(--mb-color-background-hover);
+ border-radius: var(--mantine-radius-lg);
+}
+
+.event:hover .title {
+ color: var(--mb-color-text-hover);
+}
+
+.revertButton {
+ opacity: 0;
+ transition: opacity 150ms ease;
+}
+
+.event:hover .revertButton {
+ opacity: 1;
+ color: var(--mb-color-text-hover);
+}
+
+.iconCircle {
+ position: absolute;
+ left: var(--mantine-spacing-lg);
+ z-index: 1;
+ border-radius: 50%;
+ flex-shrink: 0;
+}
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.stories.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.stories.tsx
new file mode 100644
index 00000000000..5b60fcf5622
--- /dev/null
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.stories.tsx
@@ -0,0 +1,393 @@
+import { action } from "@storybook/addon-actions";
+import type { Meta } from "@storybook/react";
+
+import type { RevisionOrModerationEvent } from "metabase/plugins";
+import { createMockRevision } from "metabase-types/api/mocks";
+
+import { RevisionHistoryTimeline } from "./RevisionHistoryTimeline";
+
+const revert = action("revert");
+
+export default {
+ title: "Common/RevisionHistoryTimeline",
+ component: RevisionHistoryTimeline,
+ tags: ["autodocs"],
+} satisfies Meta<typeof RevisionHistoryTimeline>;
+
+// --- Card (Question) Timeline ---
+
+const cardRevisionCreation = createMockRevision({
+ id: 1,
+ description: "created this.",
+ timestamp: "2026-03-10T09:00:00.000Z",
+ is_creation: true,
+ user: {
+ id: 2,
+ first_name: "Bob",
+ last_name: "Jones",
+ common_name: "Bob Jones",
+ },
+});
+
+const cardRevisionSingleEdit = createMockRevision({
+ id: 2,
+ description: "changed the display from table to bar.",
+ timestamp: "2026-03-12T14:30:00.000Z",
+ is_creation: false,
+});
+
+const cardRevisionMultipleChanges = createMockRevision({
+ id: 3,
+ description:
+ "changed the display from bar to line, added a description and turned this into a model.",
+ timestamp: "2026-03-14T10:15:00.000Z",
+ has_multiple_changes: true,
+ is_creation: false,
+});
+
+const cardRevisionReversion = createMockRevision({
+ id: 4,
+ description: "reverted to an earlier version.",
+ timestamp: "2026-03-16T16:45:00.000Z",
+ is_creation: false,
+ is_reversion: true,
+ user: {
+ id: 2,
+ first_name: "Bob",
+ last_name: "Jones",
+ common_name: "Bob Jones",
+ },
+});
+
+const cardRevisionLatest = createMockRevision({
+ id: 5,
+ description: "added a filter.",
+ timestamp: "2026-03-18T11:00:00.000Z",
+ is_creation: false,
+});
+
+const cardModerationVerified: RevisionOrModerationEvent = {
+ title: "Alice Smith verified this.",
+ timestamp: "2026-03-15T08:00:00.000Z",
+ icon: { name: "verified", color: "brand" },
+};
+
+const cardModerationRemoved: RevisionOrModerationEvent = {
+ title: "Bob Jones removed verification.",
+ timestamp: "2026-03-17T13:00:00.000Z",
+ icon: { name: "close", color: "text-tertiary" },
+};
+
+const cardEvents: RevisionOrModerationEvent[] = [
+ {
+ title: "Alice Smith added a filter.",
+ timestamp: cardRevisionLatest.timestamp,
+ icon: "pencil",
+ revision: cardRevisionLatest,
+ },
+ cardModerationRemoved,
+ {
+ title: "Bob Jones reverted to an earlier version.",
+ timestamp: cardRevisionReversion.timestamp,
+ icon: "pencil",
+ revision: cardRevisionReversion,
+ },
+ cardModerationVerified,
+ {
+ title: "Alice Smith edited this.",
+ description: cardRevisionMultipleChanges.description,
+ timestamp: cardRevisionMultipleChanges.timestamp,
+ icon: "pencil",
+ revision: cardRevisionMultipleChanges,
+ },
+ {
+ title: "Alice Smith changed the display from table to bar.",
+ timestamp: cardRevisionSingleEdit.timestamp,
+ icon: "pencil",
+ revision: cardRevisionSingleEdit,
+ },
+ {
+ title: "Bob Jones created this.",
+ timestamp: cardRevisionCreation.timestamp,
+ icon: "pencil",
+ revision: cardRevisionCreation,
+ },
+];
+
+export const CardTimeline = {
+ args: {
+ events: cardEvents,
+ "data-testid": "card-timeline",
+ canWrite: true,
+ revert,
+ entity: "card" as const,
+ },
+};
+
+// --- Dashboard Timeline ---
+
+const dashboardRevisionCreation = createMockRevision({
+ id: 10,
+ description: "created this.",
+ timestamp: "2026-03-08T10:00:00.000Z",
+ is_creation: true,
+ user: {
+ id: 3,
+ first_name: "Carol",
+ last_name: "Williams",
+ common_name: "Carol Williams",
+ },
+});
+
+const dashboardRevisionAddedFilter = createMockRevision({
+ id: 11,
+ description: "added a filter.",
+ timestamp: "2026-03-10T15:00:00.000Z",
+ is_creation: false,
+ user: {
+ id: 3,
+ first_name: "Carol",
+ last_name: "Williams",
+ common_name: "Carol Williams",
+ },
+});
+
+const dashboardRevisionMultipleChanges = createMockRevision({
+ id: 12,
+ description: "added a description, rearranged the cards and added a filter.",
+ timestamp: "2026-03-13T09:30:00.000Z",
+ is_creation: false,
+ has_multiple_changes: true,
+ user: {
+ id: 4,
+ first_name: "Dave",
+ last_name: "Brown",
+ common_name: "Dave Brown",
+ },
+});
+
+const dashboardRevisionLatest = createMockRevision({
+ id: 13,
+ description: "moved a card.",
+ timestamp: "2026-03-17T14:00:00.000Z",
+ is_creation: false,
+});
+
+const dashboardModerationVerified: RevisionOrModerationEvent = {
+ title: "Carol Williams verified this.",
+ timestamp: "2026-03-14T11:00:00.000Z",
+ icon: { name: "verified", color: "brand" },
+};
+
+const dashboardEvents: RevisionOrModerationEvent[] = [
+ {
+ title: "Alice Smith moved a card.",
+ timestamp: dashboardRevisionLatest.timestamp,
+ icon: "pencil",
+ revision: dashboardRevisionLatest,
+ },
+ dashboardModerationVerified,
+ {
+ title: "Dave Brown edited this.",
+ description: dashboardRevisionMultipleChanges.description,
+ timestamp: dashboardRevisionMultipleChanges.timestamp,
+ icon: "pencil",
+ revision: dashboardRevisionMultipleChanges,
+ },
+ {
+ title: "Carol Williams added a filter.",
+ timestamp: dashboardRevisionAddedFilter.timestamp,
+ icon: "pencil",
+ revision: dashboardRevisionAddedFilter,
+ },
+ {
+ title: "Carol Williams created this.",
+ timestamp: dashboardRevisionCreation.timestamp,
+ icon: "pencil",
+ revision: dashboardRevisionCreation,
+ },
+];
+
+export const DashboardTimeline = {
+ args: {
+ events: dashboardEvents,
+ "data-testid": "dashboard-timeline",
+ canWrite: true,
+ revert,
+ entity: "dashboard" as const,
+ },
+};
+
+// --- Document Timeline (no moderation) ---
+
+const documentRevisionCreation = createMockRevision({
+ id: 20,
+ description: "created this.",
+ timestamp: "2026-03-05T08:00:00.000Z",
+ is_creation: true,
+ user: {
+ id: 5,
+ first_name: "Eve",
+ last_name: "Garcia",
+ common_name: "Eve Garcia",
+ },
+});
+
+const documentRevisionEditedContent = createMockRevision({
+ id: 21,
+ description: "edited the content.",
+ timestamp: "2026-03-09T12:00:00.000Z",
+ is_creation: false,
+ user: {
+ id: 5,
+ first_name: "Eve",
+ last_name: "Garcia",
+ common_name: "Eve Garcia",
+ },
+});
+
+const documentRevisionMultipleChanges = createMockRevision({
+ id: 22,
+ description: "changed the title and edited the content.",
+ timestamp: "2026-03-14T16:00:00.000Z",
+ is_creation: false,
+ has_multiple_changes: true,
+});
+
+const documentRevisionLatest = createMockRevision({
+ id: 23,
+ description: "changed the title.",
+ timestamp: "2026-03-18T10:00:00.000Z",
+ is_creation: false,
+});
+
+const documentEvents: RevisionOrModerationEvent[] = [
+ {
+ title: "Alice Smith changed the title.",
+ timestamp: documentRevisionLatest.timestamp,
+ icon: "pencil",
+ revision: documentRevisionLatest,
+ },
+ {
+ title: "Alice Smith edited this.",
+ description: documentRevisionMultipleChanges.description,
+ timestamp: documentRevisionMultipleChanges.timestamp,
+ icon: "pencil",
+ revision: documentRevisionMultipleChanges,
+ },
+ {
+ title: "Eve Garcia edited the content.",
+ timestamp: documentRevisionEditedContent.timestamp,
+ icon: "pencil",
+ revision: documentRevisionEditedContent,
+ },
+ {
+ title: "Eve Garcia created this.",
+ timestamp: documentRevisionCreation.timestamp,
+ icon: "pencil",
+ revision: documentRevisionCreation,
+ },
+];
+
+export const DocumentTimeline = {
+ args: {
+ events: documentEvents,
+ "data-testid": "document-timeline",
+ canWrite: true,
+ revert,
+ entity: "document" as const,
+ },
+};
+
+// --- Transform Timeline (no moderation) ---
+
+const transformRevisionCreation = createMockRevision({
+ id: 30,
+ description: "created this.",
+ timestamp: "2026-03-06T09:00:00.000Z",
+ is_creation: true,
+ user: {
+ id: 6,
+ first_name: "Frank",
+ last_name: "Miller",
+ common_name: "Frank Miller",
+ },
+});
+
+const transformRevisionEditedDefinition = createMockRevision({
+ id: 31,
+ description: "edited the definition.",
+ timestamp: "2026-03-11T11:00:00.000Z",
+ is_creation: false,
+ user: {
+ id: 6,
+ first_name: "Frank",
+ last_name: "Miller",
+ common_name: "Frank Miller",
+ },
+});
+
+const transformRevisionMultipleChanges = createMockRevision({
+ id: 32,
+ description: "changed the name and edited the definition.",
+ timestamp: "2026-03-15T14:30:00.000Z",
+ is_creation: false,
+ has_multiple_changes: true,
+});
+
+const transformRevisionLatest = createMockRevision({
+ id: 33,
+ description: "changed the name.",
+ timestamp: "2026-03-19T08:00:00.000Z",
+ is_creation: false,
+});
+
+const transformEvents: RevisionOrModerationEvent[] = [
+ {
+ title: "Alice Smith changed the name.",
+ timestamp: transformRevisionLatest.timestamp,
+ icon: "pencil",
+ revision: transformRevisionLatest,
+ },
+ {
+ title: "Alice Smith edited this.",
+ description: transformRevisionMultipleChanges.description,
+ timestamp: transformRevisionMultipleChanges.timestamp,
+ icon: "pencil",
+ revision: transformRevisionMultipleChanges,
+ },
+ {
+ title: "Frank Miller edited the definition.",
+ timestamp: transformRevisionEditedDefinition.timestamp,
+ icon: "pencil",
+ revision: transformRevisionEditedDefinition,
+ },
+ {
+ title: "Frank Miller created this.",
+ timestamp: transformRevisionCreation.timestamp,
+ icon: "pencil",
+ revision: transformRevisionCreation,
+ },
+];
+
+export const TransformTimeline = {
+ args: {
+ events: transformEvents,
+ "data-testid": "transform-timeline",
+ canWrite: true,
+ revert,
+ entity: "transform" as const,
+ },
+};
+
+// --- Read-Only (no revert buttons) ---
+
+export const ReadOnly = {
+ args: {
+ events: cardEvents,
+ "data-testid": "readonly-timeline",
+ canWrite: false,
+ revert,
+ entity: "card" as const,
+ },
+};
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
new file mode 100644
index 00000000000..93b6174a944
--- /dev/null
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/RevisionHistoryTimeline.tsx
@@ -0,0 +1,125 @@
+import { t } from "ttag";
+
+import { getFormattedTime } from "metabase/common/components/DateTime/DateTime";
+import { getRelativeTime } from "metabase/lib/time-dayjs";
+import type { RevisionOrModerationEvent } from "metabase/plugins";
+import { Box, Button, Center, Flex, Icon, Text, Tooltip } from "metabase/ui";
+import type { Revision } from "metabase-types/api";
+
+import S from "./RevisionHistoryTimeline.module.css";
+import { trackVersionRevertClicked } from "./analytics";
+
+export type RevisionHistoryEntity =
+ | "card"
+ | "dashboard"
+ | "document"
+ | "transform";
+
+interface RevisionHistoryTimelineProps {
+ entity: RevisionHistoryEntity;
+ events: RevisionOrModerationEvent[];
+ revert: (revision: Revision) => void;
+ canWrite: boolean;
+ className?: string;
+ "data-testid": string;
+}
+
+export function RevisionHistoryTimeline({
+ events,
+ "data-testid": dataTestId,
+ canWrite,
+ revert,
+ className,
+ entity,
+}: RevisionHistoryTimelineProps) {
+ return (
+ <Box className={className} data-testid={dataTestId}>
+ <Box className={S.root}>
+ {events.map((event, index) => {
+ const { icon, title, description, timestamp, revision } = event;
+ const isNotFirstEvent = index !== 0;
+
+ return (
+ <Box
+ key={revision?.id ?? `${title}-${timestamp}`}
+ className={S.event}
+ data-testid="revision-history-event"
+ >
+ <EventIconCircle icon={icon} />
+ <Flex flex="1">
+ <Box>
+ <Text fw={700} className={S.title}>
+ {title}
+ </Text>
+ <Box>
+ <Tooltip
+ position="bottom"
+ label={getFormattedTime(timestamp)}
+ >
+ <Text component="time" c="text-secondary" fz="sm">
+ {getRelativeTime(timestamp)}
+ </Text>
+ </Tooltip>
+ </Box>
+ {revision?.has_multiple_changes && (
+ <Text c="text-secondary" mt="sm">
+ {description}
+ </Text>
+ )}
+ </Box>
+ </Flex>
+ <Flex>
+ {revision && canWrite && isNotFirstEvent && (
+ <Tooltip label={t`Revert to this version`}>
+ <Button
+ className={S.revertButton}
+ variant="subtle"
+ onClick={() => {
+ trackVersionRevertClicked(entity);
+ revert(revision);
+ }}
+ data-testid="question-revert-button"
+ aria-label={t`revert to ${title}`}
+ >
+ <Icon name="revert" />
+ </Button>
+ </Tooltip>
+ )}
+ </Flex>
+ </Box>
+ );
+ })}
+ </Box>
+ </Box>
+ );
+}
+
+interface EventIconCircleProps {
+ icon: RevisionOrModerationEvent["icon"];
+}
+
+function EventIconCircle({ icon }: EventIconCircleProps) {
+ if (typeof icon === "string") {
+ return (
+ <Center
+ w={24}
+ h={24}
+ className={S.iconCircle}
+ bd="1px solid var(--mb-color-border)"
+ bg="background-primary"
+ >
+ <Icon name={icon} c="text-tertiary" size={12} />
+ </Center>
+ );
+ }
+
+ if (!icon.name || !icon.color) {
+ return null;
+ }
+
+ return (
+ <Center w={24} h={24} className={S.iconCircle} bg="brand">
+ <Icon name={icon.name} c="white" size={12} />
+ </Center>
+ );
+}
diff --git a/frontend/src/metabase/common/components/Timeline/analytics.ts b/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts
similarity index 100%
rename from frontend/src/metabase/common/components/Timeline/analytics.ts
rename to frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts
diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/index.ts b/frontend/src/metabase/common/components/RevisionHistoryTimeline/index.ts
new file mode 100644
index 00000000000..1ab82210476
--- /dev/null
+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/index.ts
@@ -0,0 +1 @@
+export * from "./RevisionHistoryTimeline";
diff --git a/frontend/src/metabase/common/components/Timeline/utils.ts b/frontend/src/metabase/common/components/RevisionHistoryTimeline/utils.ts
similarity index 100%
rename from frontend/src/metabase/common/components/Timeline/utils.ts
rename to frontend/src/metabase/common/components/RevisionHistoryTimeline/utils.ts
diff --git a/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx b/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx
deleted file mode 100644
index d8adfae1d54..00000000000
--- a/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Button } from "metabase/common/components/Button";
-
-export const TimelineContainer = styled.ul`
- position: relative;
- margin-left: 0.5rem;
-`;
-
-export const TimelineEvent = styled.li`
- display: flex;
- align-items: start;
- justify-content: start;
- transform: translateX(-0.5rem);
- white-space: pre-line;
- width: 100%;
- margin-bottom: 1.5rem;
-
- &:last-child {
- margin-bottom: 0;
- }
-`;
-
-export const EventBody = styled.div`
- margin-left: 0.5rem;
- flex: 1;
-`;
-
-export const EventHeader = styled.div`
- font-weight: 700;
- display: flex;
- justify-content: space-between;
- align-items: start;
-
- ${Button} {
- padding: 0;
- }
-`;
-
-export const Timestamp = styled.time`
- color: var(--mb-color-text-secondary);
- font-size: 0.875em;
- padding-bottom: 0.5rem;
-`;
-
-// shift the border down slightly so that it doesn't appear above the top-most icon
-// also using a negative `bottom` to connect the border with the event icon beneath it
-export const Border = styled.div`
- position: absolute;
- top: 0.5rem;
- left: 0.5rem;
- bottom: -1.5rem;
-`;
diff --git a/frontend/src/metabase/common/components/Timeline/Timeline.tsx b/frontend/src/metabase/common/components/Timeline/Timeline.tsx
deleted file mode 100644
index 60b1800c4f9..00000000000
--- a/frontend/src/metabase/common/components/Timeline/Timeline.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { t } from "ttag";
-import _ from "underscore";
-
-import { Button } from "metabase/common/components/Button";
-import { getFormattedTime } from "metabase/common/components/DateTime/DateTime";
-import { getRelativeTime } from "metabase/lib/time-dayjs";
-import type { RevisionOrModerationEvent } from "metabase/plugins";
-import { Icon, Tooltip } from "metabase/ui";
-import type { Revision } from "metabase-types/api";
-
-import {
- Border,
- EventBody,
- EventHeader,
- TimelineContainer,
- TimelineEvent,
- Timestamp,
-} from "./Timeline.styled";
-import { trackVersionRevertClicked } from "./analytics";
-
-interface TimelineProps {
- events: RevisionOrModerationEvent[];
- "data-testid": string;
- canWrite: boolean;
- revert: (revision: Revision) => void;
- className?: string;
- entity: "card" | "dashboard" | "document" | "transform";
-}
-
-export function Timeline({
- events,
- "data-testid": dataTestId,
- canWrite,
- revert,
- className,
- entity,
-}: TimelineProps) {
- return (
- <TimelineContainer className={className} data-testid={dataTestId}>
- {events.map((event, index) => {
- const { icon, title, description, timestamp, revision } = event;
- const isNotLastEvent = index !== events.length - 1;
- const isNotFirstEvent = index !== 0;
-
- return (
- <TimelineEvent key={revision?.id ?? `${title}-${timestamp}`}>
- {isNotLastEvent && <Border />}
- <EventIcon icon={icon} />
- <EventBody>
- <EventHeader>
- <span>{title}</span>
- {revision && canWrite && isNotFirstEvent && (
- <Tooltip label={t`Revert to this version`}>
- <Button
- icon="revert"
- onlyIcon
- borderless
- onClick={() => {
- trackVersionRevertClicked(entity);
- revert(revision);
- }}
- data-testid="question-revert-button"
- aria-label={t`revert to ${title}`}
- />
- </Tooltip>
- )}
- </EventHeader>
- <Tooltip position="bottom" label={getFormattedTime(timestamp)}>
- <Timestamp dateTime={timestamp}>
- {getRelativeTime(timestamp)}
- </Timestamp>
- </Tooltip>
- {revision?.has_multiple_changes && <div>{description}</div>}
- </EventBody>
- </TimelineEvent>
- );
- })}
- </TimelineContainer>
- );
-}
-
-function EventIcon({ icon }: { icon: RevisionOrModerationEvent["icon"] }) {
- if (_.isObject(icon) && (!icon.name || !icon.color)) {
- return null;
- }
- if (_.isObject(icon)) {
- return <Icon name={icon.name} c={icon.color} size={16} />;
- }
- return <Icon name={icon} c="text-tertiary" size={16} />;
-}
diff --git a/frontend/src/metabase/common/components/Timeline/index.ts b/frontend/src/metabase/common/components/Timeline/index.ts
deleted file mode 100644
index 23bd871b648..00000000000
--- a/frontend/src/metabase/common/components/Timeline/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./Timeline";
diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
index 557363d4671..f734d377cad 100644
--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx
@@ -7,6 +7,8 @@ import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
import { skipToken, useListRevisionsQuery } from "metabase/api";
import { isInstanceAnalyticsCollection } from "metabase/collections/utils";
+import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
+import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import {
Sidesheet,
SidesheetCard,
@@ -15,8 +17,6 @@ import {
import { InsightsTabOrLink } from "metabase/common/components/Sidesheet/components/InsightsTabOrLink";
import { SidesheetEditableDescription } from "metabase/common/components/Sidesheet/components/SidesheetEditableDescription";
import SidesheetS from "metabase/common/components/Sidesheet/sidesheet.module.css";
-import { Timeline } from "metabase/common/components/Timeline";
-import { getTimelineEvents } from "metabase/common/components/Timeline/utils";
import { revertToRevision, updateDashboard } from "metabase/dashboard/actions";
import { DASHBOARD_DESCRIPTION_MAX_LENGTH } from "metabase/dashboard/constants";
import {
@@ -252,7 +252,7 @@ const HistoryTab = ({
return (
<SidesheetCard>
- <Timeline
+ <RevisionHistoryTimeline
events={events}
data-testid="dashboard-history-list"
revert={(revision) =>
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
index f63d0fe4bd3..fa8e86dd171 100644
--- a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
+++ b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/OverviewVisualization.tsx
@@ -1,38 +1,35 @@
import { useMemo } from "react";
-import {
- skipToken,
- useGetAdhocQueryQuery,
- useGetCardQueryQuery,
-} from "metabase/api";
import { DebouncedFrame } from "metabase/common/components/DebouncedFrame";
import { useSelector } from "metabase/lib/redux";
import { QueryVisualization } from "metabase/querying/components/QueryVisualization";
import { getMetadata } from "metabase/selectors/metadata";
import Question from "metabase-lib/v1/Question";
-import type { Card } from "metabase-types/api";
+import type { Card, Dataset } from "metabase-types/api";
+
+import { useCardQueryData } from "../../hooks/use-card-query-data";
import S from "./OverviewVisualization.module.css";
-type OverviewVisualizationProps = {
+type MetricCardVisualizationProps = {
card: Card;
+ data: Dataset | undefined;
+ isLoading: boolean;
+ className?: string;
};
-export function OverviewVisualization({ card }: OverviewVisualizationProps) {
+export function MetricCardVisualization({
+ card,
+ data,
+ isLoading,
+ className,
+}: MetricCardVisualizationProps) {
const metadata = useSelector(getMetadata);
const question = useMemo(
() => new Question(card, metadata),
[card, metadata],
);
- const { data: cardData, isLoading: isLoadingCardData } = useGetCardQueryQuery(
- card.id != null ? { cardId: card.id } : skipToken,
- );
- const { data: adhocData, isLoading: isLoadingAdhocData } =
- useGetAdhocQueryQuery(card.id == null ? card.dataset_query : skipToken);
- const data = cardData || adhocData;
- const isLoading = isLoadingCardData || isLoadingAdhocData;
-
const rawSeries = useMemo(
() => (data ? [{ card, data: data.data }] : null),
[card, data],
@@ -41,11 +38,11 @@ export function OverviewVisualization({ card }: OverviewVisualizationProps) {
return (
<DebouncedFrame className={S.root}>
<QueryVisualization
- className={S.visualization}
+ className={className ?? S.visualization}
question={question}
result={data}
rawSeries={rawSeries}
- queryBuilderMode="dataset" // disable the object details column
+ queryBuilderMode="dataset"
isRunnable={false}
isRunning={isLoading}
isDirty
@@ -54,3 +51,15 @@ export function OverviewVisualization({ card }: OverviewVisualizationProps) {
</DebouncedFrame>
);
}
+
+type OverviewVisualizationProps = {
+ card: Card;
+};
+
+export function OverviewVisualization({ card }: OverviewVisualizationProps) {
+ const { data, isLoading } = useCardQueryData(card);
+
+ return (
+ <MetricCardVisualization card={card} data={data} isLoading={isLoading} />
+ );
+}
diff --git a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
index c288e9366cc..2fbd8a766ab 100644
--- a/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
+++ b/frontend/src/metabase/data-studio/common/components/OverviewVisualization/index.ts
@@ -1 +1,4 @@
-export * from "./OverviewVisualization";
+export {
+ OverviewVisualization,
+ MetricCardVisualization,
+} from "./OverviewVisualization";
diff --git a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
index 3b84e86243e..a06af3c24bf 100644
--- a/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
+++ b/frontend/src/metabase/data-studio/common/components/PaneHeader/PaneHeader.tsx
@@ -30,6 +30,7 @@ export interface PaneHeaderProps extends Omit<StackProps, "title"> {
actions?: ReactNode;
breadcrumbs: ReactNode;
showMetabotButton?: boolean;
+ showAppSwitcher?: boolean;
}
export const PaneHeader = ({
@@ -41,6 +42,7 @@ export const PaneHeader = ({
actions,
breadcrumbs,
showMetabotButton,
+ showAppSwitcher = true,
...rest
}: PaneHeaderProps) => {
return (
@@ -50,13 +52,14 @@ export const PaneHeader = ({
<Group ml="auto" gap="md">
{showMetabotButton && <MetabotDataStudioButton />}
- <AppSwitcher className={S.ProfileLink} />
+ {showAppSwitcher && <AppSwitcher className={S.ProfileLink} />}
</Group>
</Flex>
<Group
className={className}
gap="sm"
justify="space-between"
+ align="flex-start"
wrap="nowrap"
>
<Stack gap="md">
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/index.ts b/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/index.ts
new file mode 100644
index 00000000000..bdfc9d95044
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/index.ts
@@ -0,0 +1 @@
+export { useCardQueryData } from "./use-card-query-data";
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/use-card-query-data.ts b/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/use-card-query-data.ts
new file mode 100644
index 00000000000..ba24925bcfb
--- /dev/null
+++ b/frontend/src/metabase/data-studio/common/hooks/use-card-query-data/use-card-query-data.ts
@@ -0,0 +1,24 @@
+import {
+ skipToken,
+ useGetAdhocQueryQuery,
+ useGetCardQueryQuery,
+} from "metabase/api";
+import type { Card, Dataset } from "metabase-types/api";
+
+export function useCardQueryData(
+ card: Card,
+ { skip = false }: { skip?: boolean } = {},
+): { data: Dataset | undefined; isLoading: boolean } {
+ const { data: cardData, isLoading: isLoadingCardData } = useGetCardQueryQuery(
+ skip ? skipToken : card.id != null ? { cardId: card.id } : skipToken,
+ );
+ const { data: adhocData, isLoading: isLoadingAdhocData } =
+ useGetAdhocQueryQuery(
+ skip ? skipToken : card.id == null ? card.dataset_query : skipToken,
+ );
+
+ return {
+ data: cardData || adhocData,
+ isLoading: isLoadingCardData || isLoadingAdhocData,
+ };
+}
diff --git a/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts b/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
index 1622db2224b..aa016fa6374 100644
--- a/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
+++ b/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts
@@ -1,4 +1,3 @@
-import { skipToken } from "metabase/api/api";
import { useGetCollectionQuery } from "metabase/api/collection";
import { isRootCollection } from "metabase/collections/utils";
import type {
@@ -16,9 +15,7 @@ export const useCollectionPath = ({
namespace,
}: UseCollectionPathOptions) => {
const { currentData: collection, isLoading: isLoadingPath } =
- useGetCollectionQuery(
- collectionId == null ? skipToken : { id: collectionId, namespace },
- );
+ useGetCollectionQuery({ id: collectionId ?? "root", namespace });
const ancestors =
collection?.effective_ancestors?.filter((c) => !isRootCollection(c)) ?? [];
diff --git a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
index 8e10a183f9c..3fb0a6a1764 100644
--- a/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
+++ b/frontend/src/metabase/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx
@@ -149,6 +149,10 @@ describe("PublishedTableMeasureBreadcrumbs", () => {
collection_id: null,
});
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root" })],
+ });
+
setup({ table: tableNoCollection, collection: null });
await waitFor(() => {
diff --git a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
index dc2b988773e..95419e0d376 100644
--- a/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
+++ b/frontend/src/metabase/documents/components/DocumentRevisionHistorySidebar.tsx
@@ -9,9 +9,9 @@ import {
useRevertRevisionMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
+import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
-import { Timeline } from "metabase/common/components/Timeline";
-import { getTimelineEvents } from "metabase/common/components/Timeline/utils";
import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import type { Document } from "metabase-types/api";
@@ -59,7 +59,7 @@ export function DocumentRevisionHistorySidebar({
{isLoading || error ? (
<LoadingAndErrorWrapper loading={isLoading} error={error} />
) : (
- <Timeline
+ <RevisionHistoryTimeline
events={events}
data-testid="document-history-list"
revert={(revision) =>
diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.ts
index 7964aece706..326ee11611d 100644
--- a/frontend/src/metabase/lib/urls/data-studio.ts
+++ b/frontend/src/metabase/lib/urls/data-studio.ts
@@ -273,6 +273,10 @@ export function dataStudioMetric(cardId: CardId) {
return `${dataStudioLibrary()}/metrics/${cardId}`;
}
+export function dataStudioMetricOverview(cardId: CardId) {
+ return `${dataStudioMetric(cardId)}/overview`;
+}
+
export function dataStudioMetricQuery(cardId: CardId) {
return `${dataStudioMetric(cardId)}/query`;
}
@@ -285,6 +289,10 @@ export function dataStudioMetricCaching(cardId: CardId) {
return `${dataStudioMetric(cardId)}/caching`;
}
+export function dataStudioMetricHistory(cardId: CardId) {
+ return `${dataStudioMetric(cardId)}/history`;
+}
+
export function dataStudioGlossary() {
return `${dataStudio()}/glossary`;
}
diff --git a/frontend/src/metabase/lib/urls/metrics.ts b/frontend/src/metabase/lib/urls/metrics.ts
index 34bde45b350..35059f1520a 100644
--- a/frontend/src/metabase/lib/urls/metrics.ts
+++ b/frontend/src/metabase/lib/urls/metrics.ts
@@ -1,3 +1,14 @@
+import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
+import type {
+ MetricSourceId,
+ MetricsViewerDisplayType,
+} from "metabase/metrics-viewer/types/viewer-state";
+import {
+ type SerializedMetricsViewerPageState,
+ encodeState,
+} from "metabase/metrics-viewer/utils/url-serialization";
+import type { CardId, CollectionId } from "metabase-types/api";
+
import type { CardOrSearchResult } from "./models";
import { question } from "./questions";
@@ -14,11 +25,80 @@ export function exploreMetric(metricId: number): string {
return `${METRICS_VIEWER_ROOT}?metricId=${metricId}`;
}
+export interface ExploreMetricDimensionOptions {
+ metricId: number;
+ dimensionId: string;
+ dimensionType: DimensionType;
+ displayType: MetricsViewerDisplayType;
+ label?: string;
+}
+
+export function exploreMetricDimension({
+ metricId,
+ dimensionId,
+ dimensionType,
+ displayType,
+ label,
+}: ExploreMetricDimensionOptions): string {
+ const sourceId: MetricSourceId = `metric:${metricId}`;
+ const state: SerializedMetricsViewerPageState = {
+ sources: [{ type: "metric", id: metricId }],
+ tabs: [
+ {
+ id: dimensionId,
+ type: dimensionType,
+ label: label ?? null,
+ display: displayType,
+ definitions: [{ definitionId: sourceId, dimensionId }],
+ },
+ ],
+ selectedTabId: dimensionId,
+ };
+
+ const hash = encodeState(state);
+ return hash ? metricsViewer(hash) : exploreMetric(metricId);
+}
+
+export function metricAbout(cardId: CardId): string {
+ return `/metric/${cardId}`;
+}
+
+export function metricOverview(cardId: CardId): string {
+ return `/metric/${cardId}/overview`;
+}
+
+export function metricQuery(cardId: CardId): string {
+ return `/metric/${cardId}/query`;
+}
+
+export function metricDependencies(cardId: CardId): string {
+ return `/metric/${cardId}/dependencies`;
+}
+
+export function metricCaching(cardId: CardId): string {
+ return `/metric/${cardId}/caching`;
+}
+
+export function metricHistory(cardId: CardId): string {
+ return `/metric/${cardId}/history`;
+}
+
+export function newMetric(
+ params: { collectionId?: CollectionId } = {},
+): string {
+ const searchParams = new URLSearchParams();
+ if (params.collectionId != null) {
+ searchParams.set("collectionId", String(params.collectionId));
+ }
+ const queryString = searchParams.toString();
+ return `/metric/new${queryString ? `?${queryString}` : ""}`;
+}
+
export function metric(card: CardOrSearchResult): string {
const id = card.card_id ?? card.id;
const numericId = typeof id === "number" ? id : parseInt(String(id), 10);
if (!isNaN(numericId)) {
- return exploreMetric(numericId);
+ return metricAbout(numericId);
}
return question(card);
}
diff --git a/frontend/src/metabase/lib/urls/questions.ts b/frontend/src/metabase/lib/urls/questions.ts
index 3496996aa23..674b81732cc 100644
--- a/frontend/src/metabase/lib/urls/questions.ts
+++ b/frontend/src/metabase/lib/urls/questions.ts
@@ -57,7 +57,8 @@ export function question(
let path: string = card?.type ?? fallbackPath;
if (!card || !card.id) {
- return `/${path}${query}${hash}`;
+ const unsavedPath = path === "metric" ? "question" : path;
+ return `/${unsavedPath}${query}${hash}`;
}
const { card_id, id, name } = card;
@@ -140,7 +141,8 @@ export function newQuestion({
const type = question.type();
if (mode) {
- return url.replace(/^\/(question|model|metric)/, `/${type}\/${mode}`);
+ const pathType = type === "metric" ? "question" : type;
+ return url.replace(/^\/(question|model|metric)/, `/${pathType}\/${mode}`);
}
return url;
diff --git a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
index d293c0e9d84..f01bff931f1 100644
--- a/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/BreakoutDimensionPicker/BreakoutDimensionPicker.tsx
@@ -43,6 +43,7 @@ export function BreakoutDimensionPicker({
const sections: Section<DimensionOption>[] = useMemo(() => {
const items: DimensionOption[] = [...dimensions.values()].map((dim) => ({
...dim,
+ dimension: dim.dimensionMetadata,
selected: currentBreakoutDimensionName === dim.name,
}));
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css
deleted file mode 100644
index a6d0d73a9ea..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.card {
- overflow: hidden;
- aspect-ratio: 8 / 5;
-}
-
-.visualization {
- padding: 0.5rem;
-
- & :global(.CardVisualization) {
- padding: 0;
- }
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx
deleted file mode 100644
index 7b715740b4e..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/MetricsViewerCard.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { useMemo } from "react";
-
-import { isNotNull } from "metabase/lib/types";
-import { Paper, Stack, Text } from "metabase/ui";
-import type { DimensionMetadata } from "metabase-lib/metric";
-
-import { useDefinitionQueries } from "../../hooks/use-definition-queries";
-import type {
- MetricSourceId,
- MetricsViewerDefinitionEntry,
- MetricsViewerTabState,
- SourceColorMap,
-} from "../../types/viewer-state";
-import {
- buildDimensionItemsFromDefinitions,
- buildRawSeriesFromDefinitions,
- computeSourceColors,
-} from "../../utils/series";
-import { getTabConfig } from "../../utils/tab-config";
-import { MetricsViewerVisualization } from "../MetricsViewerVisualization";
-
-import S from "./MetricsViewerCard.module.css";
-
-type MetricsViewerCardProps = {
- definitions: MetricsViewerDefinitionEntry[];
- tab: MetricsViewerTabState;
- onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
- onDimensionChange: (
- definitionId: MetricSourceId,
- dimension: DimensionMetadata,
- ) => void;
- onDimensionRemove: (definitionId: MetricSourceId) => void;
- sourceColors: SourceColorMap;
-};
-
-export function MetricsViewerCard({
- definitions,
- tab,
- onTabUpdate,
- onDimensionChange,
- onDimensionRemove,
- sourceColors,
-}: MetricsViewerCardProps) {
- const tabConfig = getTabConfig(tab.type);
-
- const { resultsByDefinitionId, modifiedDefinitions } = useDefinitionQueries(
- definitions,
- tab,
- );
-
- const { series: rawSeries, cardIdToDimensionId } = useMemo(
- () =>
- buildRawSeriesFromDefinitions(
- definitions,
- tab.dimensionMapping,
- tab.display,
- resultsByDefinitionId,
- modifiedDefinitions,
- sourceColors,
- ),
- [
- definitions,
- tab.dimensionMapping,
- tab.display,
- resultsByDefinitionId,
- modifiedDefinitions,
- sourceColors,
- ],
- );
-
- const cardColors = useMemo(
- () => computeSourceColors(definitions),
- [definitions],
- );
-
- const dimensionItems = useMemo(
- () =>
- buildDimensionItemsFromDefinitions(
- definitions,
- tab.dimensionMapping,
- modifiedDefinitions,
- cardColors,
- tabConfig.dimensionPredicate,
- ),
- [
- definitions,
- tab.dimensionMapping,
- modifiedDefinitions,
- cardColors,
- tabConfig.dimensionPredicate,
- ],
- );
-
- const mappedDimensionCount = Object.values(tab.dimensionMapping).filter(
- isNotNull,
- ).length;
- const dimensionRemoveHandler =
- mappedDimensionCount > 1 ? onDimensionRemove : undefined;
-
- if (rawSeries.length === 0) {
- return null;
- }
-
- return (
- <Paper
- withBorder
- shadow="none"
- className={S.card}
- data-testid="metrics-viewer-card"
- >
- <Stack h="100%">
- {tab.label && (
- <Text fw="bold" size="md" truncate="end" px="md" pt="sm">
- {tab.label}
- </Text>
- )}
- <MetricsViewerVisualization
- className={S.visualization}
- rawSeries={rawSeries}
- dimensionItems={dimensionItems}
- onDimensionChange={onDimensionChange}
- onDimensionRemove={dimensionRemoveHandler}
- definitions={definitions}
- tab={tab}
- onTabUpdate={onTabUpdate}
- cardIdToDimensionId={cardIdToDimensionId}
- />
- </Stack>
- </Paper>
- );
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts
deleted file mode 100644
index 23c224f51c4..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCard/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MetricsViewerCard } from "./MetricsViewerCard";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx
deleted file mode 100644
index 0e199e8a5bd..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/MetricsViewerCardsGrid.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { SimpleGrid } from "metabase/ui";
-import type { DimensionMetadata } from "metabase-lib/metric";
-
-import type {
- MetricSourceId,
- MetricsViewerDefinitionEntry,
- MetricsViewerTabState,
- SourceColorMap,
-} from "../../types/viewer-state";
-import { MetricsViewerCard } from "../MetricsViewerCard";
-
-type MetricsViewerCardsGridProps = {
- definitions: MetricsViewerDefinitionEntry[];
- tabs: MetricsViewerTabState[];
- updateTab: (tabId: string, updates: Partial<MetricsViewerTabState>) => void;
- onDimensionChange: (
- tabId: string,
- definitionId: MetricSourceId,
- dimension: DimensionMetadata,
- ) => void;
- onDimensionRemove: (tabId: string, definitionId: MetricSourceId) => void;
- sourceColors: SourceColorMap;
-};
-
-export function MetricsViewerCardsGrid({
- definitions,
- tabs,
- updateTab,
- onDimensionChange,
- onDimensionRemove,
- sourceColors,
-}: MetricsViewerCardsGridProps) {
- return (
- <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
- {tabs.map((tab) => (
- <MetricsViewerCard
- key={tab.id}
- definitions={definitions}
- tab={tab}
- onTabUpdate={(updates) => updateTab(tab.id, updates)}
- onDimensionChange={(defId, dimension) =>
- onDimensionChange(tab.id, defId, dimension)
- }
- onDimensionRemove={(defId) => onDimensionRemove(tab.id, defId)}
- sourceColors={sourceColors}
- />
- ))}
- </SimpleGrid>
- );
-}
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts b/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts
deleted file mode 100644
index 4aa543a726c..00000000000
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerCardsGrid/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MetricsViewerCardsGrid } from "./MetricsViewerCardsGrid";
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx
index 363136deead..d1d095316f7 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerTabs/MetricsViewerTabs.tsx
@@ -69,10 +69,10 @@ export function MetricsViewerTabs({
key={tab.id}
value={tab.id}
pl="lg"
- aria-label={tab.label}
+ aria-label={tab.label ?? undefined}
className={S.tab}
>
- {isLoading ? (
+ {isLoading || tab.label == null ? (
<Skeleton display="inline-block" w="4.5rem" h="1em" />
) : (
tab.label
@@ -82,7 +82,9 @@ export function MetricsViewerTabs({
size="xs"
variant="subtle"
ml="xs"
- aria-label={t`Remove ${tab.label} tab`}
+ aria-label={
+ tab.label != null ? t`Remove ${tab.label} tab` : undefined
+ }
onClick={(e) => handleRemoveTab(e, tab.id)}
>
<Icon name="close" size={10} />
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx
index c7808332445..0ba68512b11 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricsViewerVisualization/MetricsViewerVisualization.tsx
@@ -34,6 +34,7 @@ type MetricsViewerVisualizationProps = {
tab: MetricsViewerTabState;
onTabUpdate: (updates: Partial<MetricsViewerTabState>) => void;
cardIdToDimensionId: Record<CardId, MetricSourceId>;
+ interactive?: boolean;
};
export function MetricsViewerVisualization({
@@ -47,19 +48,22 @@ export function MetricsViewerVisualization({
tab,
onTabUpdate,
cardIdToDimensionId,
+ interactive = true,
}: MetricsViewerVisualizationProps) {
const { ref, width } = useElementSize();
const cols = getGridColumns(width, rawSeries.length);
const clickActionsMode = useMemo(
() =>
- new MetricsViewerClickActionsMode({
- definitions,
- tab,
- onTabUpdate,
- cardIdToDimensionId,
- }),
- [cardIdToDimensionId, definitions, onTabUpdate, tab],
+ interactive
+ ? new MetricsViewerClickActionsMode({
+ definitions,
+ tab,
+ onTabUpdate,
+ cardIdToDimensionId,
+ })
+ : undefined,
+ [cardIdToDimensionId, definitions, interactive, onTabUpdate, tab],
);
return (
@@ -86,7 +90,7 @@ export function MetricsViewerVisualization({
rawSeries={[series]}
isQueryBuilder={false}
hideLegend
- onBrush={onBrush}
+ onBrush={interactive ? onBrush : undefined}
mode={clickActionsMode}
onChangeCardAndRun={noop}
autoAdjustSettings
@@ -102,7 +106,7 @@ export function MetricsViewerVisualization({
rawSeries={rawSeries}
isQueryBuilder={false}
hideLegend
- onBrush={onBrush}
+ onBrush={interactive ? onBrush : undefined}
mode={clickActionsMode}
onChangeCardAndRun={noop}
/>
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
index 127bb9fc06d..b6741b63d03 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-metrics-viewer.ts
@@ -283,8 +283,8 @@ export function useMetricsViewer({
names.push(dimensionInfo.displayName);
}
}
- const label = resolveCommonTabLabel(names, tab.label);
- return label !== tab.label ? { ...tab, label } : tab;
+ const label = resolveCommonTabLabel(names);
+ return label != null && label !== tab.label ? { ...tab, label } : tab;
});
}, [state.tabs, state.definitions]);
diff --git a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
index 6934144e6ed..d36f03e2d26 100644
--- a/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
+++ b/frontend/src/metabase/metrics-viewer/hooks/use-viewer-state.ts
@@ -89,7 +89,7 @@ function addDefinitionToTabs(
);
return tabs.map((tab) => {
- if (newDefId in tab.dimensionMapping) {
+ if (newDefId in tab.dimensionMapping || tab.label == null) {
return tab;
}
diff --git a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
index 80a7bdaafdf..6627d65027f 100644
--- a/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
+++ b/frontend/src/metabase/metrics-viewer/types/viewer-state.ts
@@ -1,3 +1,4 @@
+import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
import type { MetricDefinition } from "metabase-lib/metric";
import type {
CardDisplayType,
@@ -17,12 +18,7 @@ export type MetricsViewerDisplayType = Extract<
export type MetricSourceId = `metric:${number}` | `measure:${number}`;
-export type MetricsViewerTabType =
- | "time"
- | "geo"
- | "category"
- | "boolean"
- | "numeric";
+export type MetricsViewerTabType = DimensionType;
export interface StoredMetricsViewerTab {
id: string;
@@ -59,7 +55,7 @@ export interface MetricsViewerTabProjectionConfig {
export interface MetricsViewerTabState {
id: string;
type: MetricsViewerTabType;
- label: string;
+ label: string | null;
display: MetricsViewerDisplayType;
dimensionMapping: Record<MetricSourceId, DimensionId | null>;
projectionConfig: MetricsViewerTabProjectionConfig;
diff --git a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
index a11847b9921..5b69c9edd12 100644
--- a/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/dimension-picker.ts
@@ -60,11 +60,11 @@ function collectAllDimensionEntries(
}
entries.push({
- dimension: info.dimension,
+ dimension: info.dimensionMetadata,
id,
label: info.displayName,
- icon: getDimensionIcon(info.dimension),
- tabType: info.type,
+ icon: getDimensionIcon(info.dimensionMetadata),
+ tabType: info.dimensionType,
group: info.group,
sourceId,
});
diff --git a/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts b/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts
index ac58959039b..297470ef839 100644
--- a/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/geo-dimensions.ts
@@ -1,22 +1,6 @@
import type { DimensionMetadata } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
-export function isGeoDimension(dimension: DimensionMetadata): boolean {
- if (
- LibMetric.isCoordinate(dimension) ||
- LibMetric.isLatitude(dimension) ||
- LibMetric.isLongitude(dimension)
- ) {
- return false;
- }
-
- return (
- LibMetric.isState(dimension) ||
- LibMetric.isCountry(dimension) ||
- LibMetric.isCity(dimension)
- );
-}
-
export function getMapRegionForDimension(
dimension: DimensionMetadata,
): string | null {
@@ -31,29 +15,3 @@ export function getMapRegionForDimension(
}
return null;
}
-
-export const GEO_SUBTYPE_PRIORITY: readonly GeoSubtype[] = [
- "country",
- "state",
- "city",
-];
-
-export type GeoSubtype = "country" | "state" | "city";
-
-const GEO_SUBTYPE_PREDICATES: Array<{
- subtype: GeoSubtype;
- predicate: (dimension: DimensionMetadata) => boolean;
-}> = [
- { subtype: "country", predicate: LibMetric.isCountry },
- { subtype: "state", predicate: LibMetric.isState },
- { subtype: "city", predicate: LibMetric.isCity },
-];
-
-export function getGeoSubtype(dimension: DimensionMetadata): GeoSubtype | null {
- for (const { subtype, predicate } of GEO_SUBTYPE_PREDICATES) {
- if (predicate(dimension)) {
- return subtype;
- }
- }
- return null;
-}
diff --git a/frontend/src/metabase/metrics-viewer/utils/series.ts b/frontend/src/metabase/metrics-viewer/utils/series.ts
index 1c52a231d88..99e44d440aa 100644
--- a/frontend/src/metabase/metrics-viewer/utils/series.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/series.ts
@@ -248,7 +248,7 @@ export function buildRawSeriesFromDefinitions(
return { series: [], cardIdToDimensionId: {} };
}
- const vizSettings = DISPLAY_TYPE_REGISTRY[display].getSettings(
+ const baseSettings = DISPLAY_TYPE_REGISTRY[display].getSettings(
firstSettingsEntry.def,
firstSettingsEntry.dimension,
);
@@ -289,7 +289,7 @@ export function buildRawSeriesFromDefinitions(
const singleSeries: SingleSeries = {
card: createSeriesCard(cardId, name, display, {
- ...vizSettings,
+ ...baseSettings,
...computeColorVizSettings({
displayType: display,
seriesKey,
diff --git a/frontend/src/metabase/metrics-viewer/utils/tab-config.ts b/frontend/src/metabase/metrics-viewer/utils/tab-config.ts
index 31f1655e225..425f6216194 100644
--- a/frontend/src/metabase/metrics-viewer/utils/tab-config.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/tab-config.ts
@@ -1,3 +1,7 @@
+import {
+ DIMENSION_PREDICATES,
+ getGeoSubtype,
+} from "metabase/metrics/common/utils/dimension-types";
import type { IconName } from "metabase/ui";
import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
@@ -8,13 +12,9 @@ import type {
MetricsViewerTabType,
} from "../types/viewer-state";
-import {
- getGeoSubtype,
- getMapRegionForDimension,
- isGeoDimension,
-} from "./geo-dimensions";
+import { getMapRegionForDimension } from "./geo-dimensions";
-// ── Shared types ──
+// ── Types ──
export interface ChartTypeOption {
type: MetricsViewerDisplayType;
@@ -31,8 +31,8 @@ interface DisplayTypeDefinition {
interface BaseTabTypeDefinition {
type: MetricsViewerTabType;
- autoCreate: boolean;
dimensionPredicate: (dimension: DimensionMetadata) => boolean;
+ autoCreate: boolean;
dimensionSubtype?: (dimension: DimensionMetadata) => string | null;
defaultDisplayType: MetricsViewerDisplayType;
availableDisplayTypes: ChartTypeOption[];
@@ -41,7 +41,6 @@ interface BaseTabTypeDefinition {
interface AggregateTabType extends BaseTabTypeDefinition {
matchMode: "aggregate";
fixedId: string;
- fixedLabel: string;
}
interface ExactColumnTabType extends BaseTabTypeDefinition {
@@ -50,7 +49,7 @@ interface ExactColumnTabType extends BaseTabTypeDefinition {
export type TabTypeDefinition = AggregateTabType | ExactColumnTabType;
-// ── Tab type registry ──
+// ── Chart type presets ──
const STANDARD_CHART_TYPES: ChartTypeOption[] = [
{ type: "line", icon: "line" },
@@ -68,55 +67,49 @@ const NUMERIC_CHART_TYPES: ChartTypeOption[] = [
{ type: "scatter", icon: "bubble" },
];
+// ── Tab type registry ──
+
export const TAB_TYPE_REGISTRY: TabTypeDefinition[] = [
{
type: "time",
+ dimensionPredicate: DIMENSION_PREDICATES.time,
autoCreate: true,
matchMode: "aggregate",
fixedId: "time",
- fixedLabel: "Time",
- dimensionPredicate: LibMetric.isDateOrDateTime,
defaultDisplayType: "line",
availableDisplayTypes: STANDARD_CHART_TYPES,
},
{
type: "geo",
+ dimensionPredicate: DIMENSION_PREDICATES.geo,
autoCreate: true,
matchMode: "aggregate",
fixedId: "geo",
- fixedLabel: "Location",
- dimensionPredicate: isGeoDimension,
dimensionSubtype: getGeoSubtype,
defaultDisplayType: "map",
availableDisplayTypes: GEO_CHART_TYPES,
},
{
type: "category",
+ dimensionPredicate: DIMENSION_PREDICATES.category,
autoCreate: true,
matchMode: "exact-column",
- dimensionPredicate: (dimension) =>
- LibMetric.isCategory(dimension) &&
- !isGeoDimension(dimension) &&
- !LibMetric.isBoolean(dimension),
defaultDisplayType: "bar",
availableDisplayTypes: STANDARD_CHART_TYPES,
},
{
type: "boolean",
+ dimensionPredicate: DIMENSION_PREDICATES.boolean,
autoCreate: true,
matchMode: "exact-column",
- dimensionPredicate: LibMetric.isBoolean,
defaultDisplayType: "bar",
availableDisplayTypes: STANDARD_CHART_TYPES,
},
{
type: "numeric",
+ dimensionPredicate: DIMENSION_PREDICATES.numeric,
autoCreate: false,
matchMode: "exact-column",
- dimensionPredicate: (dimension) =>
- LibMetric.isNumeric(dimension) &&
- !LibMetric.isID(dimension) &&
- !LibMetric.isCoordinate(dimension),
defaultDisplayType: "bar",
availableDisplayTypes: NUMERIC_CHART_TYPES,
},
diff --git a/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts
index ece2ebce0e0..045fb70e3d3 100644
--- a/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/tab-config.unit.spec.ts
@@ -38,7 +38,6 @@ describe("getTabConfig", () => {
autoCreate: true,
matchMode: "aggregate",
fixedId: "time",
- fixedLabel: "Time",
defaultDisplayType: "line",
availableDisplayTypes: [
{ type: "line", icon: "line" },
@@ -56,7 +55,6 @@ describe("getTabConfig", () => {
autoCreate: true,
matchMode: "aggregate",
fixedId: "geo",
- fixedLabel: "Location",
defaultDisplayType: "map",
availableDisplayTypes: [
{ type: "map", icon: "pinmap" },
diff --git a/frontend/src/metabase/metrics-viewer/utils/tabs.ts b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
index a753b63ef76..d9ad956b1e3 100644
--- a/frontend/src/metabase/metrics-viewer/utils/tabs.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/tabs.ts
@@ -1,10 +1,9 @@
import { getObjectEntries } from "metabase/lib/objects";
+import type { DimensionDescriptor } from "metabase/metrics/common/utils/dimension-descriptors";
+import { getDimensionDescriptors } from "metabase/metrics/common/utils/dimension-descriptors";
+import { GEO_SUBTYPE_PRIORITY } from "metabase/metrics/common/utils/dimension-types";
import type { IconName } from "metabase/ui";
-import type {
- DimensionGroup,
- DimensionMetadata,
- MetricDefinition,
-} from "metabase-lib/metric";
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
import * as LibMetric from "metabase-lib/metric";
import { MAX_AUTO_TABS } from "../constants";
@@ -15,9 +14,11 @@ import type {
StoredMetricsViewerTab,
} from "../types/viewer-state";
-import { GEO_SUBTYPE_PRIORITY } from "./geo-dimensions";
-import type { TabTypeDefinition } from "./tab-config";
-import { TAB_TYPE_REGISTRY, getTabConfig } from "./tab-config";
+import {
+ TAB_TYPE_REGISTRY,
+ type TabTypeDefinition,
+ getTabConfig,
+} from "./tab-config";
// ── Dimension classification ──
@@ -51,86 +52,40 @@ export function getDimensionIcon(dimension: DimensionMetadata): IconName {
return "unknown";
}
-function getDimensionType(
- dimension: DimensionMetadata,
-): MetricsViewerTabType | null {
- for (const config of TAB_TYPE_REGISTRY) {
- if (config.dimensionPredicate(dimension)) {
- return config.type;
- }
- }
-
- return null;
-}
-
-export type ClassifiedDimension = {
- dimension: DimensionMetadata;
- id: string;
- name: string;
- displayName: string;
+export type ViewerDimensionDescriptor = DimensionDescriptor & {
icon: IconName;
- type: MetricsViewerTabType;
- group?: DimensionGroup;
- isDefault?: boolean;
- canListValues?: boolean;
};
-const dimensionsByTypeCache = new WeakMap<
+const viewerDimensionsCache = new WeakMap<
MetricDefinition,
- Map<string, ClassifiedDimension>
+ Map<string, ViewerDimensionDescriptor>
>();
export function getDimensionsByType(
- def: MetricDefinition,
-): Map<string, ClassifiedDimension> {
- const cached = dimensionsByTypeCache.get(def);
+ definition: MetricDefinition,
+): Map<string, ViewerDimensionDescriptor> {
+ const cached = viewerDimensionsCache.get(definition);
if (cached) {
return cached;
}
- const result = new Map<string, ClassifiedDimension>();
+ const descriptors = getDimensionDescriptors(definition);
+ const result = new Map<string, ViewerDimensionDescriptor>();
- const defaultDimensionIds = new Set(
- LibMetric.defaultBreakoutDimensions(def)
- .map((dimension) => LibMetric.dimensionValuesInfo(def, dimension).id)
- .filter(Boolean),
- );
-
- for (const dimension of LibMetric.projectionableDimensions(def)) {
- const type = getDimensionType(dimension);
- if (!type) {
- continue;
- }
-
- const valuesInfo = LibMetric.dimensionValuesInfo(def, dimension);
- const displayInfo = LibMetric.displayInfo(def, dimension);
- if (!valuesInfo.id || result.has(valuesInfo.id)) {
- continue;
- }
-
- result.set(valuesInfo.id, {
- dimension,
- id: valuesInfo.id,
- name: displayInfo.name ?? displayInfo.displayName,
- displayName: displayInfo.displayName,
- icon: getDimensionIcon(dimension),
- type,
- group: displayInfo.group,
- isDefault: defaultDimensionIds.has(valuesInfo.id),
- canListValues: valuesInfo.canListValues,
+ for (const [id, dimension] of descriptors) {
+ result.set(id, {
+ ...dimension,
+ icon: getDimensionIcon(dimension.dimensionMetadata),
});
}
- dimensionsByTypeCache.set(def, result);
+ viewerDimensionsCache.set(definition, result);
return result;
}
-export function resolveCommonTabLabel(
- names: string[],
- fallback: string,
-): string {
+export function resolveCommonTabLabel(names: string[]): string | null {
if (names.length === 0) {
- return fallback;
+ return null;
}
if (names.length === 1 || names.every((name) => name === names[0])) {
return names[0];
@@ -155,16 +110,16 @@ export function resolveCommonTabLabel(
// ── Default tab computation ──
-function classifyDimensionsBySource(
+function getDimensionDescriptorsBySource(
definitionsBySourceId: Record<MetricSourceId, MetricDefinition | null>,
sourceOrder: MetricSourceId[],
-): Map<MetricSourceId, Map<string, ClassifiedDimension>> {
- const result = new Map<MetricSourceId, Map<string, ClassifiedDimension>>();
+): Map<MetricSourceId, Map<string, DimensionDescriptor>> {
+ const result = new Map<MetricSourceId, Map<string, DimensionDescriptor>>();
for (const sourceId of sourceOrder) {
const def = definitionsBySourceId[sourceId];
if (def) {
- result.set(sourceId, getDimensionsByType(def));
+ result.set(sourceId, getDimensionDescriptors(def));
}
}
@@ -173,7 +128,7 @@ function classifyDimensionsBySource(
function resolveTabDimensionNames(
dimensionMapping: Record<MetricSourceId, string>,
- dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, DimensionDescriptor>>,
): string[] {
const names: string[] = [];
@@ -188,12 +143,12 @@ function resolveTabDimensionNames(
}
function findDimensionOfType(
- dimensions: Map<string, ClassifiedDimension>,
+ dimensions: Map<string, DimensionDescriptor>,
type: MetricsViewerTabType,
requireDefault = false,
-): ClassifiedDimension | null {
+): DimensionDescriptor | null {
for (const [, info] of dimensions) {
- if (info.type === type && (!requireDefault || info.isDefault)) {
+ if (info.dimensionType === type && (!requireDefault || info.isDefault)) {
return info;
}
}
@@ -201,13 +156,16 @@ function findDimensionOfType(
}
function findDimensionBySubtype(
- dimensions: Map<string, ClassifiedDimension>,
+ dimensions: Map<string, DimensionDescriptor>,
type: MetricsViewerTabType,
getSubtype: (dimension: DimensionMetadata) => string | null,
targetSubtype: string,
-): ClassifiedDimension | null {
+): DimensionDescriptor | null {
for (const [, info] of dimensions) {
- if (info.type === type && getSubtype(info.dimension) === targetSubtype) {
+ if (
+ info.dimensionType === type &&
+ getSubtype(info.dimensionMetadata) === targetSubtype
+ ) {
return info;
}
}
@@ -224,7 +182,7 @@ function pickBestGeoSubtype(found: Set<string>): string | null {
}
function computeBestSubtypeAcrossSources(
- dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, DimensionDescriptor>>,
type: MetricsViewerTabType,
getSubtype: (dimension: DimensionMetadata) => string | null,
): string | null {
@@ -232,8 +190,8 @@ function computeBestSubtypeAcrossSources(
for (const [, dimensions] of dimensionsBySource) {
for (const [, info] of dimensions) {
- if (info.type === type) {
- const subtype = getSubtype(info.dimension);
+ if (info.dimensionType === type) {
+ const subtype = getSubtype(info.dimensionMetadata);
if (subtype) {
found.add(subtype);
}
@@ -245,10 +203,10 @@ function computeBestSubtypeAcrossSources(
}
function findReferenceAcrossSources(
- dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, DimensionDescriptor>>,
sourceOrder: MetricSourceId[],
type: MetricsViewerTabType,
-): { sourceId: MetricSourceId; dimension: ClassifiedDimension } | null {
+): { sourceId: MetricSourceId; dimension: DimensionDescriptor } | null {
for (const sourceId of sourceOrder) {
const dimensions = dimensionsBySource.get(sourceId);
if (!dimensions) {
@@ -263,18 +221,23 @@ function findReferenceAcrossSources(
}
function findSourceMatch(
- dimensions: Map<string, ClassifiedDimension>,
+ dimensions: Map<string, DimensionDescriptor>,
type: MetricsViewerTabType,
- reference: ClassifiedDimension,
-): ClassifiedDimension | null {
- let nameMatch: ClassifiedDimension | null = null;
+ reference: DimensionDescriptor,
+): DimensionDescriptor | null {
+ let nameMatch: DimensionDescriptor | null = null;
const referenceName = reference.name;
for (const [, info] of dimensions) {
- if (info.type !== type) {
+ if (info.dimensionType !== type) {
continue;
}
- if (LibMetric.isSameSource(info.dimension, reference.dimension)) {
+ if (
+ LibMetric.isSameSource(
+ info.dimensionMetadata,
+ reference.dimensionMetadata,
+ )
+ ) {
return info;
}
if (!nameMatch && referenceName && info.name === referenceName) {
@@ -286,7 +249,7 @@ function findSourceMatch(
}
function resolveAggregateDimensionMapping(
- dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, DimensionDescriptor>>,
sourceOrder: MetricSourceId[],
config: TabTypeDefinition,
): Record<MetricSourceId, string> {
@@ -357,7 +320,7 @@ function resolveAggregateDimensionMapping(
}
function collectUniqueExactDimensions(
- dimensionsBySource: Map<MetricSourceId, Map<string, ClassifiedDimension>>,
+ dimensionsBySource: Map<MetricSourceId, Map<string, DimensionDescriptor>>,
sourceOrder: MetricSourceId[],
type: MetricsViewerTabType,
): Map<
@@ -380,7 +343,7 @@ function collectUniqueExactDimensions(
}
for (const [, info] of dimensions) {
- if (info.type !== type) {
+ if (info.dimensionType !== type) {
continue;
}
@@ -411,7 +374,7 @@ export function computeDefaultTabs(
return [];
}
- const dimensionsBySource = classifyDimensionsBySource(
+ const dimensionsBySource = getDimensionDescriptorsBySource(
definitionsBySourceId,
sourceOrder,
);
@@ -440,7 +403,7 @@ export function computeDefaultTabs(
tabs.push({
id: config.fixedId,
type: config.type,
- label: resolveCommonTabLabel(names, config.fixedLabel),
+ label: resolveCommonTabLabel(names),
display: config.defaultDisplayType,
dimensionMapping: mapping,
projectionConfig: {},
@@ -510,7 +473,7 @@ export function createTabFromDimension(
}
mapping[sourceId] = dimensionId;
- tabType = dimensionInfo.type;
+ tabType = dimensionInfo.dimensionType;
displayName ??= dimensionInfo.displayName;
}
@@ -550,7 +513,7 @@ function findSubtypeFromExistingTab(
}
const dimensionInfo = getDimensionsByType(def).get(dimensionName);
if (dimensionInfo) {
- return getSubtype(dimensionInfo.dimension);
+ return getSubtype(dimensionInfo.dimensionMetadata);
}
}
@@ -558,15 +521,15 @@ function findSubtypeFromExistingTab(
}
function findBestSubtypeInDimensions(
- dimensionsByType: Map<string, ClassifiedDimension>,
+ dimensionsByType: Map<string, DimensionDescriptor>,
tabType: MetricsViewerTabType,
getSubtype: (dimension: DimensionMetadata) => string | null,
): string | null {
const found = new Set<string>();
for (const [, info] of dimensionsByType) {
- if (info.type === tabType) {
- const subtype = getSubtype(info.dimension);
+ if (info.dimensionType === tabType) {
+ const subtype = getSubtype(info.dimensionMetadata);
if (subtype) {
found.add(subtype);
}
@@ -580,7 +543,7 @@ function findReferenceFromTab(
tab: StoredMetricsViewerTab,
type: MetricsViewerTabType,
baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
-): ClassifiedDimension | null {
+): DimensionDescriptor | null {
if (!baseDefinitions) {
return null;
}
@@ -593,7 +556,7 @@ function findReferenceFromTab(
continue;
}
const dimensionInfo = getDimensionsByType(def).get(dimensionName);
- if (dimensionInfo && dimensionInfo.type === type) {
+ if (dimensionInfo && dimensionInfo.dimensionType === type) {
return dimensionInfo;
}
}
@@ -602,17 +565,22 @@ function findReferenceFromTab(
}
function findDimensionBySourceMatch(
- dimensionsByType: Map<string, ClassifiedDimension>,
- reference: ClassifiedDimension,
+ dimensionsByType: Map<string, DimensionDescriptor>,
+ reference: DimensionDescriptor,
getSubtype?: (dimension: DimensionMetadata) => string | null,
): string | null {
- let nameMatch: ClassifiedDimension | null = null;
+ let nameMatch: DimensionDescriptor | null = null;
for (const [, info] of dimensionsByType) {
- if (info.type !== reference.type) {
+ if (info.dimensionType !== reference.dimensionType) {
continue;
}
- if (LibMetric.isSameSource(info.dimension, reference.dimension)) {
+ if (
+ LibMetric.isSameSource(
+ info.dimensionMetadata,
+ reference.dimensionMetadata,
+ )
+ ) {
return info.id;
}
if (
@@ -621,7 +589,8 @@ function findDimensionBySourceMatch(
) {
if (
!getSubtype ||
- getSubtype(info.dimension) === getSubtype(reference.dimension)
+ getSubtype(info.dimensionMetadata) ===
+ getSubtype(reference.dimensionMetadata)
) {
nameMatch = info;
}
@@ -632,7 +601,7 @@ function findDimensionBySourceMatch(
}
function resolveSubtypeFallback(
- dimensionsByType: Map<string, ClassifiedDimension>,
+ dimensionsByType: Map<string, DimensionDescriptor>,
tabType: MetricsViewerTabType,
getSubtype: (dimension: DimensionMetadata) => string | null,
tab: StoredMetricsViewerTab,
@@ -653,12 +622,12 @@ function resolveSubtypeFallback(
}
function findExactColumnMatch(
- dimensions: Map<string, ClassifiedDimension>,
+ dimensions: Map<string, DimensionDescriptor>,
tab: StoredMetricsViewerTab,
baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
): string | null {
const exactMatch = dimensions.get(tab.id);
- if (exactMatch?.type === tab.type) {
+ if (exactMatch?.dimensionType === tab.type) {
return exactMatch.id;
}
@@ -671,7 +640,7 @@ function findExactColumnMatch(
}
function findAggregateMatch(
- dimensions: Map<string, ClassifiedDimension>,
+ dimensions: Map<string, DimensionDescriptor>,
tab: StoredMetricsViewerTab,
config: TabTypeDefinition,
baseDefinitions?: Record<MetricSourceId, MetricDefinition | null>,
diff --git a/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts b/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts
index ac2d1202e0b..272db38f8fb 100644
--- a/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/tabs.unit.spec.ts
@@ -6,34 +6,32 @@ import { buildDimensionPickerSections } from "./dimension-picker";
import { resolveCommonTabLabel } from "./tabs";
describe("resolveCommonTabLabel", () => {
- it("returns fallback for empty array", () => {
- expect(resolveCommonTabLabel([], "Time")).toBe("Time");
+ it("returns null for empty array", () => {
+ expect(resolveCommonTabLabel([])).toBeNull();
});
it("returns the name when only one is provided", () => {
- expect(resolveCommonTabLabel(["Created At"], "Time")).toBe("Created At");
+ expect(resolveCommonTabLabel(["Created At"])).toBe("Created At");
});
it("returns the name when all names are identical", () => {
- expect(resolveCommonTabLabel(["Created At", "Created At"], "Time")).toBe(
+ expect(resolveCommonTabLabel(["Created At", "Created At"])).toBe(
"Created At",
);
});
it("returns the most frequent name", () => {
expect(
- resolveCommonTabLabel(["Created At", "Order Date", "Created At"], "Time"),
+ resolveCommonTabLabel(["Created At", "Order Date", "Created At"]),
).toBe("Created At");
});
it("returns the first name when tied", () => {
- expect(resolveCommonTabLabel(["State", "Category"], "Location")).toBe(
- "State",
- );
+ expect(resolveCommonTabLabel(["State", "Category"])).toBe("State");
});
it("returns the first name when two different names are tied", () => {
- expect(resolveCommonTabLabel(["Created At", "Order Date"], "Time")).toBe(
+ expect(resolveCommonTabLabel(["Created At", "Order Date"])).toBe(
"Created At",
);
});
diff --git a/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
index 7bc84cd577b..f377ceb4aaf 100644
--- a/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
+++ b/frontend/src/metabase/metrics-viewer/utils/url-serialization.ts
@@ -66,7 +66,7 @@ interface SerializedProjectionConfig {
interface SerializedTab {
id: string;
type: MetricsViewerTabType;
- label: string;
+ label: string | null;
display: MetricsViewerDisplayType;
definitions: SerializedTabDef[];
projectionConfig?: SerializedProjectionConfig;
@@ -243,7 +243,7 @@ const projectionConfigSchema = defineCompactSchema<SerializedProjectionConfig>({
const tabSchema = defineCompactSchema<SerializedTab>({
id: "i",
type: "t",
- label: { key: "l", default: "" },
+ label: { key: "l", default: null },
display: { key: "d", default: "line" },
definitions: { key: "D", schema: tabDefSchema, default: [] },
projectionConfig: {
diff --git a/frontend/src/metabase/metrics/common/hooks/index.ts b/frontend/src/metabase/metrics/common/hooks/index.ts
new file mode 100644
index 00000000000..e1d2444626c
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/hooks/index.ts
@@ -0,0 +1,2 @@
+export { useMetricDefinition } from "./use-metric-definition";
+export { useMetricDimensionQuery } from "./use-metric-dimension-query";
diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts
new file mode 100644
index 00000000000..2032af074f7
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-definition.ts
@@ -0,0 +1,33 @@
+import { useMemo } from "react";
+
+import { useGetMetricQuery } from "metabase/api";
+import { useSelector } from "metabase/lib/redux";
+import { getMetadata } from "metabase/selectors/metadata";
+import type { MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+import type { MetricId } from "metabase-types/api/metric";
+
+export function useMetricDefinition(metricId: MetricId | null): {
+ definition: MetricDefinition | null;
+ isLoading: boolean;
+} {
+ const { data: metric, isLoading } = useGetMetricQuery(metricId!, {
+ skip: metricId == null,
+ });
+
+ const metadata = useSelector(getMetadata);
+
+ const definition = useMemo(() => {
+ if (!metric || !metadata || metricId == null) {
+ return null;
+ }
+ const provider = LibMetric.metadataProvider(metadata);
+ const meta = LibMetric.metricMetadata(provider, metricId);
+ if (!meta) {
+ return null;
+ }
+ return LibMetric.fromMetricMetadata(provider, meta);
+ }, [metric, metadata, metricId]);
+
+ return { definition, isLoading };
+}
diff --git a/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts b/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts
new file mode 100644
index 00000000000..428a756829f
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/hooks/use-metric-dimension-query.ts
@@ -0,0 +1,28 @@
+import { useMemo } from "react";
+
+import { skipToken, useGetMetricDatasetQuery } from "metabase/api";
+import type { MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import { getDimensionDescriptors } from "../utils/dimension-descriptors";
+import { projectDimension } from "../utils/project-dimension";
+
+export function useMetricDimensionQuery(
+ definition: MetricDefinition,
+ dimensionId: string,
+) {
+ const request = useMemo(() => {
+ const descriptor = getDimensionDescriptors(definition).get(dimensionId);
+ if (!descriptor) {
+ return null;
+ }
+
+ const projected = projectDimension(
+ definition,
+ descriptor.dimensionMetadata,
+ );
+ return { definition: LibMetric.toJsMetricDefinition(projected) };
+ }, [definition, dimensionId]);
+
+ return useGetMetricDatasetQuery(request ?? skipToken);
+}
diff --git a/frontend/src/metabase/metrics/common/utils/dimension-descriptors.ts b/frontend/src/metabase/metrics/common/utils/dimension-descriptors.ts
new file mode 100644
index 00000000000..aa67c058fa7
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/utils/dimension-descriptors.ts
@@ -0,0 +1,71 @@
+import type {
+ DimensionGroup,
+ DimensionMetadata,
+ MetricDefinition,
+} from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+import type { DimensionType } from "./dimension-types";
+import { getDimensionType } from "./dimension-types";
+
+export interface DimensionDescriptor {
+ dimensionMetadata: DimensionMetadata;
+ id: string;
+ name: string;
+ displayName: string;
+ dimensionType: DimensionType;
+ group?: DimensionGroup;
+ isDefault: boolean;
+ canListValues: boolean;
+}
+
+const dimensionDescriptorCache = new WeakMap<
+ MetricDefinition,
+ Map<string, DimensionDescriptor>
+>();
+
+export function getDimensionDescriptors(
+ definition: MetricDefinition,
+): Map<string, DimensionDescriptor> {
+ const cached = dimensionDescriptorCache.get(definition);
+ if (cached) {
+ return cached;
+ }
+
+ const result = new Map<string, DimensionDescriptor>();
+
+ const defaultDimensionIds = new Set(
+ LibMetric.defaultBreakoutDimensions(definition)
+ .map(
+ (dimension) => LibMetric.dimensionValuesInfo(definition, dimension).id,
+ )
+ .filter(Boolean),
+ );
+
+ for (const dimension of LibMetric.projectionableDimensions(definition)) {
+ const dimensionType = getDimensionType(dimension);
+ if (!dimensionType) {
+ continue;
+ }
+
+ const valuesInfo = LibMetric.dimensionValuesInfo(definition, dimension);
+ const displayInfo = LibMetric.displayInfo(definition, dimension);
+ if (!valuesInfo.id || result.has(valuesInfo.id)) {
+ continue;
+ }
+
+ result.set(valuesInfo.id, {
+ dimensionMetadata: dimension,
+ id: valuesInfo.id,
+ name: displayInfo.name ?? displayInfo.displayName,
+ displayName: displayInfo.displayName,
+ dimensionType,
+ group: displayInfo.group,
+ isDefault: defaultDimensionIds.has(valuesInfo.id),
+ canListValues: valuesInfo.canListValues,
+ });
+ }
+
+ dimensionDescriptorCache.set(definition, result);
+ return result;
+}
diff --git a/frontend/src/metabase/metrics/common/utils/dimension-types.ts b/frontend/src/metabase/metrics/common/utils/dimension-types.ts
new file mode 100644
index 00000000000..cca90bd474c
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/utils/dimension-types.ts
@@ -0,0 +1,92 @@
+import type { DimensionMetadata } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+export type DimensionType = "time" | "geo" | "category" | "boolean" | "numeric";
+
+export type GeoSubtype = "country" | "state" | "city";
+
+export function isGeoDimension(dimension: DimensionMetadata): boolean {
+ if (
+ LibMetric.isCoordinate(dimension) ||
+ LibMetric.isLatitude(dimension) ||
+ LibMetric.isLongitude(dimension)
+ ) {
+ return false;
+ }
+
+ return (
+ LibMetric.isState(dimension) ||
+ LibMetric.isCountry(dimension) ||
+ LibMetric.isCity(dimension)
+ );
+}
+
+export const GEO_SUBTYPE_PRIORITY: readonly GeoSubtype[] = [
+ "country",
+ "state",
+ "city",
+];
+
+const GEO_SUBTYPE_PREDICATES: Array<{
+ subtype: GeoSubtype;
+ predicate: (dimension: DimensionMetadata) => boolean;
+}> = [
+ { subtype: "country", predicate: LibMetric.isCountry },
+ { subtype: "state", predicate: LibMetric.isState },
+ { subtype: "city", predicate: LibMetric.isCity },
+];
+
+export function getGeoSubtype(dimension: DimensionMetadata): GeoSubtype | null {
+ for (const { subtype, predicate } of GEO_SUBTYPE_PREDICATES) {
+ if (predicate(dimension)) {
+ return subtype;
+ }
+ }
+ return null;
+}
+
+export type DimensionPredicate = (dimension: DimensionMetadata) => boolean;
+
+export const DIMENSION_PREDICATES: Record<DimensionType, DimensionPredicate> = {
+ time: LibMetric.isDateOrDateTime,
+ geo: isGeoDimension,
+ category: (dimension) =>
+ LibMetric.isCategory(dimension) &&
+ !isGeoDimension(dimension) &&
+ !LibMetric.isBoolean(dimension),
+ boolean: LibMetric.isBoolean,
+ numeric: (dimension) =>
+ LibMetric.isNumeric(dimension) &&
+ !LibMetric.isID(dimension) &&
+ !LibMetric.isCoordinate(dimension),
+};
+
+export interface DimensionTypeEntry {
+ type: DimensionType;
+ dimensionPredicate: DimensionPredicate;
+}
+
+const DIMENSION_TYPE_ORDER: readonly DimensionType[] = [
+ "time",
+ "geo",
+ "category",
+ "boolean",
+ "numeric",
+];
+
+export const DIMENSION_TYPE_REGISTRY: DimensionTypeEntry[] =
+ DIMENSION_TYPE_ORDER.map((type) => ({
+ type,
+ dimensionPredicate: DIMENSION_PREDICATES[type],
+ }));
+
+export function getDimensionType(
+ dimension: DimensionMetadata,
+): DimensionType | null {
+ for (const entry of DIMENSION_TYPE_REGISTRY) {
+ if (entry.dimensionPredicate(dimension)) {
+ return entry.type;
+ }
+ }
+ return null;
+}
diff --git a/frontend/src/metabase/metrics/common/utils/project-dimension.ts b/frontend/src/metabase/metrics/common/utils/project-dimension.ts
new file mode 100644
index 00000000000..71b2f53c58c
--- /dev/null
+++ b/frontend/src/metabase/metrics/common/utils/project-dimension.ts
@@ -0,0 +1,42 @@
+import type { DimensionMetadata, MetricDefinition } from "metabase-lib/metric";
+import * as LibMetric from "metabase-lib/metric";
+
+export function projectDimension(
+ definition: MetricDefinition,
+ dimension: DimensionMetadata,
+): MetricDefinition {
+ const dimensionRef = LibMetric.dimensionReference(dimension);
+ const projected = LibMetric.project(definition, dimensionRef);
+
+ const projections = LibMetric.projections(projected);
+ if (projections.length === 0) {
+ return projected;
+ }
+
+ const projection = projections[projections.length - 1];
+ const projectedDimension = LibMetric.projectionDimension(
+ projected,
+ projection,
+ );
+ if (!projectedDimension) {
+ return projected;
+ }
+
+ if (LibMetric.isTemporalBucketable(projected, projectedDimension)) {
+ return LibMetric.replaceClause(
+ projected,
+ projection,
+ LibMetric.withDefaultTemporalBucket(projected, projection),
+ );
+ }
+
+ if (LibMetric.isBinnable(projected, projectedDimension)) {
+ return LibMetric.replaceClause(
+ projected,
+ projection,
+ LibMetric.withDefaultBinning(projected, projection),
+ );
+ }
+
+ return projected;
+}
diff --git a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
new file mode 100644
index 00000000000..4b9f8cb9084
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx
@@ -0,0 +1,36 @@
+import cx from "classnames";
+
+import { Link } from "metabase/common/components/Link";
+import CS from "metabase/css/core/index.css";
+import { useCollectionPath } from "metabase/data-studio/common/hooks/use-collection-path/useCollectionPath";
+import * as Urls from "metabase/lib/urls";
+import { Breadcrumbs, Icon } from "metabase/ui";
+import type { Card } from "metabase-types/api";
+
+interface CollectionBreadcrumbsProps {
+ card: Card;
+}
+
+export function CollectionBreadcrumbs({ card }: CollectionBreadcrumbsProps) {
+ const { path, isLoadingPath } = useCollectionPath({
+ collectionId: card.collection_id,
+ });
+
+ return (
+ <Breadcrumbs
+ separator={<Icon size={12} name="chevronright" />}
+ fz="sm"
+ c="text-secondary"
+ className={cx({ [CS.hidden]: isLoadingPath })}
+ >
+ {path?.map((collection) => (
+ <Link
+ key={collection.id}
+ to={Urls.collection({ id: collection.id, name: "" })}
+ >
+ {collection.name}
+ </Link>
+ ))}
+ </Breadcrumbs>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/index.ts b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/index.ts
new file mode 100644
index 00000000000..e700e90f71e
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/CollectionBreadcrumbs/index.ts
@@ -0,0 +1 @@
+export { CollectionBreadcrumbs } from "./CollectionBreadcrumbs";
diff --git a/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx
new file mode 100644
index 00000000000..610bedc9fc6
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricActivityTimeline/MetricActivityTimeline.tsx
@@ -0,0 +1,59 @@
+import { useMemo } from "react";
+
+import { useListRevisionsQuery, useRevertRevisionMutation } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
+import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
+import { useSelector } from "metabase/lib/redux";
+import { PLUGIN_MODERATION } from "metabase/plugins";
+import { getUser } from "metabase/selectors/user";
+import type { Card } from "metabase-types/api";
+
+interface MetricActivityTimelineProps {
+ card: Card;
+}
+
+export function MetricActivityTimeline({ card }: MetricActivityTimelineProps) {
+ const {
+ data: revisions,
+ isLoading,
+ error,
+ } = useListRevisionsQuery({
+ id: card.id,
+ entity: "card",
+ });
+ const [revertRevision] = useRevertRevisionMutation();
+ const currentUser = useSelector(getUser);
+
+ const events = useMemo(() => {
+ const moderationEvents = PLUGIN_MODERATION.getModerationTimelineEvents(
+ card.moderation_reviews,
+ currentUser,
+ );
+ const revisionEvents = getTimelineEvents({ revisions, currentUser });
+ return [...revisionEvents, ...moderationEvents].sort(
+ (a, b) =>
+ new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime(),
+ );
+ }, [card.moderation_reviews, revisions, currentUser]);
+
+ if (isLoading || error) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return (
+ <RevisionHistoryTimeline
+ events={events}
+ data-testid="saved-question-history-list"
+ revert={(revision) =>
+ revertRevision({
+ entity: "card",
+ id: card.id,
+ revision_id: revision.id,
+ })
+ }
+ canWrite={card.can_write}
+ entity="card"
+ />
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/MetricActivityTimeline/index.ts b/frontend/src/metabase/metrics/components/MetricActivityTimeline/index.ts
new file mode 100644
index 00000000000..2b22c4c7e67
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricActivityTimeline/index.ts
@@ -0,0 +1 @@
+export { MetricActivityTimeline } from "./MetricActivityTimeline";
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.module.css b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.module.css
new file mode 100644
index 00000000000..e18e23d6b39
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.module.css
@@ -0,0 +1,29 @@
+.card {
+ overflow: hidden;
+ aspect-ratio: 8 / 5;
+ cursor: pointer;
+ transition: box-shadow 200ms ease;
+
+ &:hover {
+ box-shadow: var(--mantine-shadow-md);
+ }
+}
+
+.chartArea {
+ position: relative;
+ flex: 1;
+ min-height: 0;
+}
+
+.visualization {
+ padding: 0.5rem;
+
+ & :global(.CardVisualization) {
+ padding: 0;
+ }
+}
+
+.skeletonCard {
+ aspect-ratio: 8 / 5;
+ overflow: hidden;
+}
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
new file mode 100644
index 00000000000..cfa95e8e9aa
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/MetricDimensionGrid.tsx
@@ -0,0 +1,179 @@
+import { useCallback, useMemo } from "react";
+import { push } from "react-router-redux";
+import { t } from "ttag";
+import _ from "underscore";
+
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetricDimensionQuery } from "metabase/metrics/common/hooks";
+import type { DimensionType } from "metabase/metrics/common/utils/dimension-types";
+import {
+ Button,
+ Flex,
+ Icon,
+ Paper,
+ SimpleGrid,
+ Stack,
+ Text,
+} from "metabase/ui";
+import Visualization from "metabase/visualizations/components/Visualization";
+import ChartSkeleton from "metabase/visualizations/components/skeletons/ChartSkeleton";
+import type { MetricDefinition } from "metabase-lib/metric";
+import type {
+ Card,
+ CardDisplayType,
+ Dataset,
+ SingleSeries,
+} from "metabase-types/api";
+import type { MetricId } from "metabase-types/api/metric";
+
+import S from "./MetricDimensionGrid.module.css";
+import { useMetricDimensionCards } from "./use-metric-dimension-cards";
+import type { DefaultDimension } from "./utils";
+
+type MetricDimensionGridProps = {
+ metricId: MetricId;
+};
+
+const DEFAULT_SKELETON_COUNT = 3;
+
+const DISPLAY_TYPE_BY_DIMENSION = {
+ time: "line",
+ geo: "map",
+ category: "bar",
+ boolean: "bar",
+ numeric: "bar",
+} as const satisfies Record<DimensionType, CardDisplayType>;
+
+type DimensionDisplayType = (typeof DISPLAY_TYPE_BY_DIMENSION)[DimensionType];
+
+export function MetricDimensionGrid({ metricId }: MetricDimensionGridProps) {
+ const { cards, definition, isLoading, hasMore, showMore } =
+ useMetricDimensionCards(metricId);
+
+ if (isLoading || !definition) {
+ return <DimensionGridSkeleton count={DEFAULT_SKELETON_COUNT} />;
+ }
+
+ if (cards.length === 0) {
+ return null;
+ }
+
+ return (
+ <Flex direction="column" gap="lg" flex={1}>
+ <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+ {cards.map((card) => (
+ <MetricDimensionCard
+ key={card.dimensionId}
+ metricId={metricId}
+ definition={definition}
+ dimension={card}
+ displayType={DISPLAY_TYPE_BY_DIMENSION[card.dimensionType]}
+ />
+ ))}
+ </SimpleGrid>
+ {hasMore && (
+ <Button
+ fullWidth
+ leftSection={<Icon name="chevrondown" />}
+ onClick={showMore}
+ >
+ {t`Show more`}
+ </Button>
+ )}
+ </Flex>
+ );
+}
+
+interface MetricDimensionCardProps {
+ metricId: MetricId;
+ definition: MetricDefinition;
+ dimension: DefaultDimension;
+ displayType: DimensionDisplayType;
+}
+
+function MetricDimensionCard({
+ metricId,
+ definition,
+ dimension,
+ displayType,
+}: MetricDimensionCardProps) {
+ const dispatch = useDispatch();
+ const { data } = useMetricDimensionQuery(definition, dimension.dimensionId);
+
+ const rawSeries = useMemo(
+ () => (data ? buildSingleSeries(data, displayType) : null),
+ [data, displayType],
+ );
+
+ const handleClick = useCallback(() => {
+ dispatch(
+ push(
+ Urls.exploreMetricDimension({
+ metricId,
+ dimensionId: dimension.dimensionId,
+ dimensionType: dimension.dimensionType,
+ displayType,
+ label: dimension.label,
+ }),
+ ),
+ );
+ }, [dispatch, metricId, dimension, displayType]);
+
+ return (
+ <Paper withBorder shadow="none" className={S.card} onClick={handleClick}>
+ <Stack h="100%">
+ <Text fw="bold" size="md" truncate="end" px="md" pt="sm">
+ {t`By ${dimension.label}`}
+ </Text>
+ <div className={S.chartArea}>
+ {rawSeries ? (
+ <Visualization
+ className={S.visualization}
+ rawSeries={rawSeries}
+ isQueryBuilder={false}
+ hideLegend
+ onChangeCardAndRun={_.noop}
+ />
+ ) : (
+ <ChartSkeleton display={displayType} className={S.visualization} />
+ )}
+ </div>
+ </Stack>
+ </Paper>
+ );
+}
+
+function buildSingleSeries(
+ dataset: Dataset,
+ displayType: CardDisplayType,
+): SingleSeries[] {
+ const { cols } = dataset.data;
+ const dimensionName = cols[0]?.name;
+ const metricName = cols[1]?.name;
+
+ return [
+ {
+ card: {
+ display: displayType,
+ visualization_settings: {
+ ...(dimensionName ? { "graph.dimensions": [dimensionName] } : {}),
+ ...(metricName ? { "graph.metrics": [metricName] } : {}),
+ },
+ } as Card,
+ data: dataset.data,
+ },
+ ];
+}
+
+function DimensionGridSkeleton({ count }: { count: number }) {
+ return (
+ <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+ {Array.from({ length: count }, (_, index) => (
+ <Paper key={index} withBorder shadow="none" className={S.skeletonCard}>
+ <ChartSkeleton display="bar" />
+ </Paper>
+ ))}
+ </SimpleGrid>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/index.ts b/frontend/src/metabase/metrics/components/MetricDimensionGrid/index.ts
new file mode 100644
index 00000000000..d2b16c914b5
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/index.ts
@@ -0,0 +1 @@
+export { MetricDimensionGrid } from "./MetricDimensionGrid";
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/use-metric-dimension-cards.ts b/frontend/src/metabase/metrics/components/MetricDimensionGrid/use-metric-dimension-cards.ts
new file mode 100644
index 00000000000..d8565fe66ab
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/use-metric-dimension-cards.ts
@@ -0,0 +1,44 @@
+import { useCallback, useMemo, useState } from "react";
+
+import { useMetricDefinition } from "metabase/metrics/common/hooks";
+import type { MetricId } from "metabase-types/api/metric";
+
+import { getDefaultDimensions } from "./utils";
+
+const SHOW_MORE_BATCH_SIZE = 4;
+
+export function useMetricDimensionCards(metricId: MetricId) {
+ const { definition, isLoading } = useMetricDefinition(metricId);
+
+ const allDimensions = useMemo(
+ () => (definition ? getDefaultDimensions(definition) : []),
+ [definition],
+ );
+
+ const [visibleCount, setVisibleCount] = useState<number | null>(null);
+
+ if (definition && visibleCount === null && allDimensions.length > 0) {
+ setVisibleCount(Math.min(allDimensions.length, SHOW_MORE_BATCH_SIZE));
+ }
+
+ const visibleCards = useMemo(
+ () => allDimensions.slice(0, visibleCount ?? 0),
+ [allDimensions, visibleCount],
+ );
+
+ const hasMore = visibleCards.length < allDimensions.length;
+
+ const showMore = useCallback(() => {
+ setVisibleCount((previous) =>
+ Math.min((previous ?? 0) + SHOW_MORE_BATCH_SIZE, allDimensions.length),
+ );
+ }, [allDimensions.length]);
+
+ return {
+ cards: visibleCards,
+ definition,
+ isLoading,
+ hasMore,
+ showMore,
+ };
+}
diff --git a/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts
new file mode 100644
index 00000000000..81bc3f6ee47
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricDimensionGrid/utils.ts
@@ -0,0 +1,114 @@
+import type { DimensionDescriptor } from "metabase/metrics/common/utils/dimension-descriptors";
+import { getDimensionDescriptors } from "metabase/metrics/common/utils/dimension-descriptors";
+import type {
+ DimensionType,
+ GeoSubtype,
+} from "metabase/metrics/common/utils/dimension-types";
+import {
+ GEO_SUBTYPE_PRIORITY,
+ getGeoSubtype,
+} from "metabase/metrics/common/utils/dimension-types";
+import type { MetricDefinition } from "metabase-lib/metric";
+
+export interface DefaultDimension {
+ dimensionId: string;
+ dimensionType: DimensionType;
+ label: string;
+}
+
+export function getDefaultDimensions(
+ definition: MetricDefinition,
+): DefaultDimension[] {
+ const descriptors = getDimensionDescriptors(definition);
+ if (descriptors.size === 0) {
+ return [];
+ }
+
+ return [
+ ...pickAggregate(descriptors, "time"),
+ ...pickAggregate(descriptors, "geo"),
+ ...pickAllOfType(descriptors, "category", { requireListValues: true }),
+ ...pickAllOfType(descriptors, "boolean"),
+ ];
+}
+
+function toDefaultDimension(descriptor: DimensionDescriptor): DefaultDimension {
+ return {
+ dimensionId: descriptor.id,
+ dimensionType: descriptor.dimensionType,
+ label: descriptor.displayName,
+ };
+}
+
+function pickAggregate(
+ descriptors: Map<string, DimensionDescriptor>,
+ dimensionType: DimensionType,
+): DefaultDimension[] {
+ const best =
+ dimensionType === "geo"
+ ? findBestGeoDimension(descriptors)
+ : findBestDimension(descriptors, dimensionType);
+
+ return best ? [toDefaultDimension(best)] : [];
+}
+
+function pickAllOfType(
+ descriptors: Map<string, DimensionDescriptor>,
+ dimensionType: DimensionType,
+ options?: { requireListValues?: boolean },
+): DefaultDimension[] {
+ return [...descriptors.values()]
+ .filter(
+ (dimension) =>
+ dimension.dimensionType === dimensionType &&
+ (!options?.requireListValues || dimension.canListValues),
+ )
+ .sort((first, second) => {
+ if (first.canListValues !== second.canListValues) {
+ return first.canListValues ? -1 : 1;
+ }
+ return first.displayName.localeCompare(second.displayName);
+ })
+ .map(toDefaultDimension);
+}
+
+function findBestDimension(
+ descriptors: Map<string, DimensionDescriptor>,
+ dimensionType: DimensionType,
+): DimensionDescriptor | null {
+ const matching = [...descriptors.values()].filter(
+ (dimension) => dimension.dimensionType === dimensionType,
+ );
+
+ return (
+ matching.find((dimension) => dimension.isDefault) ?? matching[0] ?? null
+ );
+}
+
+function findBestGeoDimension(
+ descriptors: Map<string, DimensionDescriptor>,
+): DimensionDescriptor | null {
+ const geoDimensions = [...descriptors.values()].filter(
+ (dimension) => dimension.dimensionType === "geo",
+ );
+
+ const subtypeMap = new Map(
+ geoDimensions
+ .map(
+ (dimension) =>
+ [getGeoSubtype(dimension.dimensionMetadata), dimension] as const,
+ )
+ .filter(
+ (entry): entry is readonly [GeoSubtype, DimensionDescriptor] =>
+ entry[0] != null,
+ ),
+ );
+
+ const prioritized = GEO_SUBTYPE_PRIORITY.find((subtype) =>
+ subtypeMap.has(subtype),
+ );
+
+ return prioritized
+ ? (subtypeMap.get(prioritized) ?? null)
+ : (geoDimensions[0] ?? null);
+}
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
new file mode 100644
index 00000000000..1b7f659d977
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricHeader.tsx
@@ -0,0 +1,65 @@
+import type { ReactNode } from "react";
+
+import {
+ PaneHeader,
+ PanelHeaderTitle,
+} from "metabase/data-studio/common/components/PaneHeader";
+import { PLUGIN_MODERATION } from "metabase/plugins";
+import { Flex, Group } from "metabase/ui";
+import type { Card } from "metabase-types/api";
+
+import type { MetricUrls } from "../../types";
+
+import { MetricNameInput } from "./MetricNameInput";
+import { MetricTabs } from "./MetricTabs";
+import { MetricToolbar } from "./MetricToolbar";
+
+interface MetricHeaderProps {
+ card: Card;
+ urls: MetricUrls;
+ actions?: ReactNode;
+ breadcrumbs?: ReactNode;
+ showAppSwitcher?: boolean;
+ showDataStudioLink: boolean;
+}
+
+export function MetricHeader({
+ card,
+ urls,
+ actions,
+ breadcrumbs,
+ showAppSwitcher = false,
+ showDataStudioLink,
+}: MetricHeaderProps) {
+ return (
+ <PaneHeader
+ data-testid="metric-header"
+ showAppSwitcher={showAppSwitcher}
+ title={
+ <Flex align="center" gap="sm">
+ {card.can_write ? (
+ <MetricNameInput card={card} />
+ ) : (
+ <PanelHeaderTitle>{card.name}</PanelHeaderTitle>
+ )}
+ <PLUGIN_MODERATION.EntityModerationIcon
+ moderationReviews={card.moderation_reviews}
+ />
+ </Flex>
+ }
+ icon="metric"
+ tabs={<MetricTabs card={card} urls={urls} />}
+ actions={
+ <Group wrap="nowrap" gap="sm" align="center">
+ {actions}
+ <MetricToolbar
+ card={card}
+ urls={urls}
+ showDataStudioLink={showDataStudioLink}
+ />
+ </Group>
+ }
+ breadcrumbs={breadcrumbs}
+ />
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
rename to frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/MetricNameInput.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/index.ts b/frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricNameInput/index.ts
rename to frontend/src/metabase/metrics/components/MetricHeader/MetricNameInput/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
similarity index 64%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
rename to frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
index 0cf1735bf73..5be19cb5419 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/MetricTabs.tsx
@@ -1,3 +1,4 @@
+import { useMemo } from "react";
import { t } from "ttag";
import {
@@ -5,7 +6,6 @@ import {
PaneHeaderTabs,
} from "metabase/data-studio/common/components/PaneHeader";
import { useSelector } from "metabase/lib/redux";
-import * as Urls from "metabase/lib/urls";
import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { getMetadata } from "metabase/selectors/metadata";
import * as Lib from "metabase-lib";
@@ -13,37 +13,52 @@ import Question from "metabase-lib/v1/Question";
import type Metadata from "metabase-lib/v1/metadata/Metadata";
import type { Card } from "metabase-types/api";
-type MetricTabsProps = {
+import type { MetricUrls } from "../../../types";
+
+interface MetricTabsProps {
card: Card;
-};
+ urls: MetricUrls;
+}
-export function MetricTabs({ card }: MetricTabsProps) {
+export function MetricTabs({ card, urls }: MetricTabsProps) {
const metadata = useSelector(getMetadata);
- const tabs = getTabs(card, metadata);
+ const tabs = useMemo(
+ () => getTabs(card, metadata, urls),
+ [card, metadata, urls],
+ );
return <PaneHeaderTabs tabs={tabs} />;
}
-function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
+function getTabs(
+ card: Card,
+ metadata: Metadata,
+ urls: MetricUrls,
+): PaneHeaderTab[] {
const tabs: PaneHeaderTab[] = [
{
- label: t`Overview`,
- to: Urls.dataStudioMetric(card.id),
+ label: t`About`,
+ to: urls.about(card.id),
},
];
const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
const queryInfo = Lib.queryDisplayInfo(query);
+
if (queryInfo.isEditable) {
+ tabs.push({
+ label: t`Overview`,
+ to: urls.overview(card.id),
+ });
tabs.push({
label: t`Definition`,
- to: Urls.dataStudioMetricQuery(card.id),
+ to: urls.query(card.id),
});
}
if (PLUGIN_DEPENDENCIES.isEnabled) {
tabs.push({
label: t`Dependencies`,
- to: Urls.dataStudioMetricDependencies(card.id),
+ to: urls.dependencies(card.id),
});
}
@@ -54,9 +69,14 @@ function getTabs(card: Card, metadata: Metadata): PaneHeaderTab[] {
if (isCacheableQuestion) {
tabs.push({
label: t`Caching`,
- to: Urls.dataStudioMetricCaching(card.id),
+ to: urls.caching(card.id),
});
}
+ tabs.push({
+ label: t`History`,
+ to: urls.history(card.id),
+ });
+
return tabs;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/index.ts b/frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/MetricTabs/index.ts
rename to frontend/src/metabase/metrics/components/MetricHeader/MetricTabs/index.ts
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
new file mode 100644
index 00000000000..bd361987385
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx
@@ -0,0 +1,247 @@
+import { useState } from "react";
+import { push } from "react-router-redux";
+import { c, t } from "ttag";
+
+import {
+ useCreateBookmarkMutation,
+ useDeleteBookmarkMutation,
+ useListBookmarksQuery,
+ useListNotificationsQuery,
+} from "metabase/api";
+import { ForwardRefLink } from "metabase/common/components/Link";
+import { ToolbarButton } from "metabase/common/components/ToolbarButton";
+import { getLibraryCollectionType } from "metabase/data-studio/utils";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { QuestionAlertListModal } from "metabase/notifications/modals/QuestionAlertListModal";
+import { PLUGIN_AUDIT, PLUGIN_MODERATION } from "metabase/plugins";
+import { AddToDashSelectDashModal } from "metabase/query_builder/components/AddToDashSelectDashModal";
+import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";
+import { CardCopyModal } from "metabase/questions/components/CardCopyModal";
+import { MoveCardModal } from "metabase/questions/components/MoveCardModal";
+import { openUrl } from "metabase/redux/app";
+import { getMetadata } from "metabase/selectors/metadata";
+import { canManageSubscriptions as canManageSubscriptionsSelector } from "metabase/selectors/user";
+import { Button, Group, Icon, Menu } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import Question from "metabase-lib/v1/Question";
+import type { Card } from "metabase-types/api";
+
+import type { MetricUrls } from "../../../types";
+
+type MetricModalType =
+ | "move"
+ | "copy"
+ | "archive"
+ | "add-to-dashboard"
+ | "alert";
+
+interface MetricToolbarProps {
+ card: Card;
+ urls: MetricUrls;
+ showDataStudioLink: boolean;
+}
+
+export function MetricToolbar({
+ card,
+ urls,
+ showDataStudioLink,
+}: MetricToolbarProps) {
+ const [modalType, setModalType] = useState<MetricModalType>();
+
+ return (
+ <>
+ <MetricToolbarButtons
+ card={card}
+ showDataStudioLink={showDataStudioLink}
+ onOpenModal={setModalType}
+ />
+ {modalType != null && (
+ <MetricModal
+ card={card}
+ urls={urls}
+ modalType={modalType}
+ onClose={() => setModalType(undefined)}
+ />
+ )}
+ </>
+ );
+}
+
+interface MetricToolbarButtonsProps {
+ card: Card;
+ showDataStudioLink: boolean;
+ onOpenModal: (modalType: MetricModalType) => void;
+}
+
+function MetricToolbarButtons({
+ card,
+ showDataStudioLink,
+ onOpenModal,
+}: MetricToolbarButtonsProps) {
+ const metadata = useSelector(getMetadata);
+ const canManageSubscriptions = useSelector(canManageSubscriptionsSelector);
+ const { data: bookmarks = [] } = useListBookmarksQuery();
+ const { data: questionNotifications, isLoading: isNotificationsLoading } =
+ useListNotificationsQuery({
+ card_id: card.id,
+ include_inactive: false,
+ });
+ const [createBookmark] = useCreateBookmarkMutation();
+ const [deleteBookmark] = useDeleteBookmarkMutation();
+ const moderationMenuItems = PLUGIN_MODERATION.useCardMenuItems(card);
+ const query = Lib.fromJsQueryAndMetadata(metadata, card.dataset_query);
+ const queryInfo = Lib.queryDisplayInfo(query);
+
+ const isBookmarked = bookmarks.some(
+ (bookmark) => bookmark.type === "card" && bookmark.item_id === card.id,
+ );
+
+ const dispatch = useDispatch();
+
+ const isInLibrary =
+ showDataStudioLink &&
+ getLibraryCollectionType(card.collection?.type) != null;
+
+ return (
+ <Group wrap="nowrap" gap="sm">
+ <Button
+ size="sm"
+ component={ForwardRefLink}
+ to={Urls.exploreMetric(card.id)}
+ target="_blank"
+ leftSection={<Icon name="external" />}
+ data-testid="explore-link"
+ >
+ {t`Explore`}
+ </Button>
+ <Menu position="bottom-end">
+ <Menu.Target>
+ <ToolbarButton icon="ellipsis" aria-label={t`More options`} />
+ </Menu.Target>
+ <Menu.Dropdown>
+ <Menu.Item
+ leftSection={
+ <Icon name={isBookmarked ? "bookmark_filled" : "bookmark"} />
+ }
+ onClick={() =>
+ isBookmarked
+ ? deleteBookmark({ id: card.id, type: "card" })
+ : createBookmark({ id: card.id, type: "card" })
+ }
+ >
+ {isBookmarked ? t`Remove from bookmarks` : t`Bookmark`}
+ </Menu.Item>
+ {moderationMenuItems}
+ {card.can_write && (
+ <Menu.Item
+ leftSection={<Icon name="move" />}
+ onClick={() => onOpenModal("move")}
+ >
+ {c("A verb, not a noun").t`Move`}
+ </Menu.Item>
+ )}
+ {queryInfo.isEditable && (
+ <Menu.Item
+ leftSection={<Icon name="clone" />}
+ onClick={() => onOpenModal("copy")}
+ >
+ {c("A verb, not a noun").t`Duplicate`}
+ </Menu.Item>
+ )}
+
+ <Menu.Divider />
+
+ <Menu.Item
+ leftSection={<Icon name="add_to_dash" />}
+ onClick={() => onOpenModal("add-to-dashboard")}
+ >
+ {t`Add to a dashboard`}
+ </Menu.Item>
+ {canManageSubscriptions && (
+ <Menu.Item
+ leftSection={<Icon name="alert" />}
+ disabled={isNotificationsLoading}
+ onClick={() => onOpenModal("alert")}
+ >
+ {questionNotifications?.length
+ ? t`Edit alerts`
+ : t`Create an alert`}
+ </Menu.Item>
+ )}
+
+ {(canManageSubscriptions || isInLibrary) && <Menu.Divider />}
+
+ {isInLibrary && (
+ <Menu.Item
+ leftSection={<Icon name="grid_bordered" />}
+ onClick={() => dispatch(openUrl(Urls.dataStudioMetric(card.id)))}
+ >
+ {t`Open in Data Studio`}
+ </Menu.Item>
+ )}
+ <PLUGIN_AUDIT.InsightsMenuItem
+ card={card}
+ label={t`Metric usage analytics`}
+ iconName="pie_slice"
+ />
+
+ {card.can_write && (
+ <>
+ <Menu.Divider />
+ <Menu.Item
+ leftSection={<Icon name="trash" />}
+ onClick={() => onOpenModal("archive")}
+ >
+ {t`Move to trash`}
+ </Menu.Item>
+ </>
+ )}
+ </Menu.Dropdown>
+ </Menu>
+ </Group>
+ );
+}
+
+interface MetricModalProps {
+ card: Card;
+ urls: MetricUrls;
+ modalType: MetricModalType;
+ onClose: () => void;
+}
+
+function MetricModal({ card, urls, modalType, onClose }: MetricModalProps) {
+ const dispatch = useDispatch();
+
+ const handleCopy = (newCard: Card) => {
+ dispatch(push(urls.about(newCard.id)));
+ };
+
+ switch (modalType) {
+ case "move":
+ return <MoveCardModal card={card} onClose={onClose} />;
+ case "copy":
+ return (
+ <CardCopyModal card={card} onCopy={handleCopy} onClose={onClose} />
+ );
+ case "archive":
+ return <ArchiveCardModal card={card} onClose={onClose} />;
+ case "add-to-dashboard":
+ return (
+ <AddToDashSelectDashModal
+ card={card}
+ onClose={onClose}
+ onChangeLocation={(location) => dispatch(push(location))}
+ />
+ );
+ case "alert":
+ return (
+ <QuestionAlertListModal
+ question={new Question(card)}
+ onClose={onClose}
+ />
+ );
+ default:
+ return null;
+ }
+}
diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/index.ts b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/index.ts
new file mode 100644
index 00000000000..c2b224e7311
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/index.ts
@@ -0,0 +1 @@
+export { MetricToolbar } from "./MetricToolbar";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/index.ts b/frontend/src/metabase/metrics/components/MetricHeader/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricHeader/index.ts
rename to frontend/src/metabase/metrics/components/MetricHeader/index.ts
diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
new file mode 100644
index 00000000000..1ef31f94ae0
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPageShell/MetricPageShell.tsx
@@ -0,0 +1,68 @@
+import type { ReactNode } from "react";
+
+import { useDeleteCardMutation, useUpdateCardMutation } from "metabase/api";
+import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner";
+import type { CollectionPickerValueItem } from "metabase/common/components/Pickers/CollectionPicker";
+import type { Card } from "metabase-types/api";
+
+import type { MetricUrls } from "../../types";
+import { CollectionBreadcrumbs } from "../CollectionBreadcrumbs";
+import { MetricHeader } from "../MetricHeader";
+
+interface MetricPageShellProps {
+ card: Card;
+ urls: MetricUrls;
+ actions?: ReactNode;
+ renderBreadcrumbs?: (card: Card) => ReactNode;
+ showAppSwitcher?: boolean;
+ showDataStudioLink?: boolean;
+}
+
+export function MetricPageShell({
+ card,
+ urls,
+ actions,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricPageShellProps) {
+ const [updateCard] = useUpdateCardMutation();
+ const [deleteCard] = useDeleteCardMutation();
+
+ return (
+ <>
+ {card.archived && (
+ <ArchivedEntityBanner
+ name={card.name}
+ entityType="metric"
+ canMove={card.can_write}
+ canRestore={card.can_restore}
+ canDelete={card.can_delete}
+ onUnarchive={() => updateCard({ id: card.id, archived: false })}
+ onMove={(collection: CollectionPickerValueItem) =>
+ updateCard({
+ id: card.id,
+ collection_id: collection.id as number,
+ archived: false,
+ })
+ }
+ onDeletePermanently={() => deleteCard(card.id)}
+ />
+ )}
+ <MetricHeader
+ card={card}
+ urls={urls}
+ actions={actions}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ breadcrumbs={
+ renderBreadcrumbs ? (
+ renderBreadcrumbs(card)
+ ) : (
+ <CollectionBreadcrumbs card={card} />
+ )
+ }
+ />
+ </>
+ );
+}
diff --git a/frontend/src/metabase/metrics/components/MetricPageShell/index.ts b/frontend/src/metabase/metrics/components/MetricPageShell/index.ts
new file mode 100644
index 00000000000..78bb0ce2d15
--- /dev/null
+++ b/frontend/src/metabase/metrics/components/MetricPageShell/index.ts
@@ -0,0 +1 @@
+export { MetricPageShell } from "./MetricPageShell";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx b/frontend/src/metabase/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
rename to frontend/src/metabase/metrics/components/MetricQueryEditor/MetricQueryEditor.tsx
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/index.ts b/frontend/src/metabase/metrics/components/MetricQueryEditor/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/index.ts
rename to frontend/src/metabase/metrics/components/MetricQueryEditor/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/utils.ts b/frontend/src/metabase/metrics/components/MetricQueryEditor/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/components/MetricQueryEditor/utils.ts
rename to frontend/src/metabase/metrics/components/MetricQueryEditor/utils.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/constants.ts b/frontend/src/metabase/metrics/constants.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/constants.ts
rename to frontend/src/metabase/metrics/constants.ts
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx
new file mode 100644
index 00000000000..28b0788ddef
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/AboutVisualization.tsx
@@ -0,0 +1,45 @@
+import { useMemo } from "react";
+
+import { MetricCardVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
+import { useCardQueryData } from "metabase/data-studio/common/hooks/use-card-query-data";
+import { Box, Stack } from "metabase/ui";
+import {
+ TrendInfo,
+ useTrendData,
+} from "metabase/visualizations/components/TrendInfo";
+import type { Card } from "metabase-types/api";
+
+import S from "./MetricAbout.module.css";
+
+interface AboutVisualizationProps {
+ card: Card;
+}
+
+const DATE_COLUMN_INDEX = 0;
+const METRIC_COLUMN_INDEX = 1;
+
+export function AboutVisualization({ card }: AboutVisualizationProps) {
+ const { data, isLoading } = useCardQueryData(card);
+ const trendData = useTrendData(data, DATE_COLUMN_INDEX, METRIC_COLUMN_INDEX);
+
+ const lineCard = useMemo(
+ () => ({ ...card, display: "line" as const }),
+ [card],
+ );
+
+ return (
+ <Stack gap={0} h="100%" className={S.visualizationPanel}>
+ {trendData && (
+ <Box p="xl" pb="sm">
+ <TrendInfo {...trendData} />
+ </Box>
+ )}
+ <MetricCardVisualization
+ card={lineCard}
+ data={data}
+ isLoading={isLoading}
+ className={S.innerVisualization}
+ />
+ </Stack>
+ );
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.module.css b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.module.css
new file mode 100644
index 00000000000..0f5f995e26f
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.module.css
@@ -0,0 +1,7 @@
+.metricLink {
+ transition: 200ms all;
+}
+
+.metricLink:hover {
+ color: var(--mb-color-brand);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
similarity index 77%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
rename to frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
index bba99d61ec8..274cc57e6de 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/DescriptionSection.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/DescriptionSection.tsx
@@ -9,20 +9,22 @@ import { DateTime } from "metabase/common/components/DateTime";
import { EditableText } from "metabase/common/components/EditableText";
import { Link } from "metabase/common/components/Link/Link";
import { Markdown } from "metabase/common/components/Markdown";
-import * as Urls from "metabase/lib/urls";
import { getUserName } from "metabase/lib/user";
import { useMetadataToasts } from "metabase/metadata/hooks";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Box, Card, Flex, Group, Icon, Stack, Text, rem } from "metabase/ui";
import type { Card as CardApiType, CardType } from "metabase-types/api";
+import type { MetricUrls } from "../../../../types";
+
import S from "./DescriptionSection.module.css";
-type DescriptionSectionProps = {
+interface DescriptionSectionProps {
card: CardApiType;
-};
+ urls: MetricUrls;
+}
-export function DescriptionSection({ card }: DescriptionSectionProps) {
+export function DescriptionSection({ card, urls }: DescriptionSectionProps) {
const [updateCard] = useUpdateCardMutation();
const { sendSuccessToast, sendErrorToast } = useMetadataToasts();
@@ -57,9 +59,10 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {
}
};
+ const databaseUrl = database && urls.database?.(database.id);
+
return (
<Stack gap={0} align="stretch" data-testid="metric-description-sidebar">
- {/* Description */}
<Box data-testid="metric-description-section" p={rem(20)}>
{card.can_write ? (
<EditableText
@@ -76,7 +79,6 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {
)}
</Box>
- {/* Metadata Sections */}
<Card mx="lg" bg="background-secondary" shadow="none" radius="1rem">
<Card.Section withBorder p="md">
<Group gap="sm" mb={4}>
@@ -91,40 +93,42 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {
: t`Last edited at`}
</Text>
</Card.Section>
- <Card.Section withBorder p="md">
- <Group gap="sm" mb={4}>
- <Icon name="database" c="brand" />
-
- {database ? (
- <Link to={Urls.dataStudioData({ databaseId: database.id })}>
+ {database && (
+ <Card.Section withBorder p="md">
+ <Group gap="sm" mb={4}>
+ <Icon name="database" c="brand" />
+ {databaseUrl ? (
+ <Link to={databaseUrl} className={S.metricLink}>
+ <Text size="md" fw={600} lh="1rem">
+ {database.name}
+ </Text>
+ </Link>
+ ) : (
<Text size="md" fw={600} lh="1rem">
{database.name}
</Text>
- </Link>
- ) : (
+ )}
+ </Group>
+ <Text size="sm" c="text-secondary" lh="1rem" ml="1.5rem">
+ {t`Database`}
+ </Text>
+ </Card.Section>
+ )}
+ {table && (
+ <Card.Section withBorder p="md">
+ <Group gap="sm" mb={4}>
+ <Icon name="table" c="brand" />
<Text size="md" fw={600} lh="1rem">
- —
+ {table.display_name || table.name}
</Text>
- )}
- </Group>
- <Text size="sm" c="text-secondary" lh="1rem" ml="1.5rem">
- {t`Database`}
- </Text>
- </Card.Section>
- <Card.Section withBorder p="md">
- <Group gap="sm" mb={4}>
- <Icon name="table" c={table ? "brand" : "icon-secondary"} />
- <Text size="md" fw={600} lh="1rem">
- {table?.display_name || table?.name || "—"}
+ </Group>
+ <Text size="sm" c="text-secondary" lh="1rem" ml="1.5rem">
+ {t`Source table`}
</Text>
- </Group>
- <Text size="sm" c="text-secondary" lh="1rem" ml="1.5rem">
- {t`Source table`}
- </Text>
- </Card.Section>
+ </Card.Section>
+ )}
</Card>
- {/* Statistics */}
{isDependenciesEnabled && (
<Card mx="lg" my="lg" shadow="none">
<Card.Section withBorder py={rem(12)} px="md">
@@ -133,10 +137,7 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {
{t`Dependencies`}
</Text>
{dependenciesCount > 0 ? (
- <Link
- to={Urls.dataStudioMetricDependencies(card.id)}
- className={S.metricLink}
- >
+ <Link to={urls.dependencies(card.id)} className={S.metricLink}>
<Text size="xl" fw={600}>
{dependenciesCount}
</Text>
@@ -155,10 +156,7 @@ export function DescriptionSection({ card }: DescriptionSectionProps) {
</Text>
{dependentsCount > 0 ? (
- <Link
- to={Urls.dataStudioMetricDependencies(card.id)}
- className={S.metricLink}
- >
+ <Link to={urls.dependencies(card.id)} className={S.metricLink}>
<Text size="xl" fw={600}>
{dependentsCount}
</Text>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverview/DescriptionSection/index.ts
rename to frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/DescriptionSection/index.ts
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.module.css b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.module.css
new file mode 100644
index 00000000000..618a8d95ee4
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.module.css
@@ -0,0 +1,38 @@
+.root {
+ overflow: auto;
+}
+
+.chartContainer {
+ display: flex;
+ flex-direction: column;
+ cursor: pointer;
+ transition: box-shadow 200ms ease;
+ border-radius: var(--default-border-radius) 0 0 var(--default-border-radius);
+
+ &:hover {
+ box-shadow: var(--mantine-shadow-md);
+ }
+}
+
+.descriptionSection {
+ background-color: var(--mb-color-background-primary);
+ border: 1px solid var(--mb-color-border);
+ border-left: none;
+ border-top-right-radius: var(--default-border-radius);
+ border-bottom-right-radius: var(--default-border-radius);
+ overflow: auto;
+}
+
+.visualizationPanel {
+ background-color: var(--mb-color-background-primary);
+ border: 1px solid var(--mb-color-border);
+ border-top-left-radius: var(--default-border-radius);
+ border-bottom-left-radius: var(--default-border-radius);
+ overflow: hidden;
+ pointer-events: none;
+}
+
+.innerVisualization {
+ overflow: hidden;
+ flex: 1;
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
new file mode 100644
index 00000000000..589ee3ce262
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/MetricAbout.tsx
@@ -0,0 +1,62 @@
+import { useCallback, useMemo } from "react";
+import { push } from "react-router-redux";
+
+import { OverviewVisualization } from "metabase/data-studio/common/components/OverviewVisualization";
+import { useDispatch } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { useMetricDefinition } from "metabase/metrics/common/hooks";
+import { Box, Flex, Stack } from "metabase/ui";
+import * as LibMetric from "metabase-lib/metric";
+import type { Card } from "metabase-types/api";
+
+import type { MetricUrls } from "../../../types";
+
+import { AboutVisualization } from "./AboutVisualization";
+import { DescriptionSection } from "./DescriptionSection";
+import S from "./MetricAbout.module.css";
+
+interface MetricAboutProps {
+ card: Card;
+ urls: MetricUrls;
+}
+
+export function MetricAbout({ card, urls }: MetricAboutProps) {
+ const { definition } = useMetricDefinition(card.id ?? null);
+ const dispatch = useDispatch();
+
+ const hasTimeDimension = useMemo(
+ () =>
+ definition
+ ? LibMetric.defaultBreakoutDimensions(definition).some(
+ LibMetric.isDateOrDateTime,
+ )
+ : false,
+ [definition],
+ );
+
+ const handleChartClick = useCallback(() => {
+ if (card.id != null) {
+ dispatch(push(Urls.exploreMetric(card.id)));
+ }
+ }, [dispatch, card.id]);
+
+ return (
+ <Flex className={S.root} flex={1}>
+ <Box
+ className={S.chartContainer}
+ flex={1}
+ mah={700}
+ onClick={handleChartClick}
+ >
+ {hasTimeDimension ? (
+ <AboutVisualization card={card} />
+ ) : (
+ <OverviewVisualization card={card} />
+ )}
+ </Box>
+ <Stack flex="0 0 360px" className={S.descriptionSection} mah={700}>
+ <DescriptionSection card={card} urls={urls} />
+ </Stack>
+ </Flex>
+ );
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/index.ts b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/index.ts
new file mode 100644
index 00000000000..bdce296a18a
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAbout/index.ts
@@ -0,0 +1 @@
+export { MetricAbout } from "./MetricAbout";
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
new file mode 100644
index 00000000000..dbc2f7f7ee0
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/MetricAboutPage.tsx
@@ -0,0 +1,43 @@
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
+import * as Urls from "metabase/lib/urls";
+import { Center } from "metabase/ui";
+
+import { MetricPageShell } from "../../components/MetricPageShell";
+import type { MetricPageProps } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
+
+import { MetricAbout } from "./MetricAbout";
+
+export function MetricAboutPage({
+ params,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <PageContainer data-testid="metric-about-page" gap="xl">
+ <MetricPageShell
+ card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
+ <MetricAbout card={card} urls={urls} />
+ </PageContainer>
+ );
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricAboutPage/index.ts b/frontend/src/metabase/metrics/pages/MetricAboutPage/index.ts
new file mode 100644
index 00000000000..e55d3a54c5b
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricAboutPage/index.ts
@@ -0,0 +1 @@
+export { MetricAboutPage } from "./MetricAboutPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
similarity index 68%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
rename to frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
index 26e5553e318..2ae865db6b3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/MetricDependenciesPage.tsx
@@ -7,20 +7,21 @@ import * as Urls from "metabase/lib/urls";
import { PLUGIN_DEPENDENCIES } from "metabase/plugins";
import { Card, Center } from "metabase/ui";
-import { MetricHeader } from "../../components/MetricHeader";
+import { MetricPageShell } from "../../components/MetricPageShell";
+import type { MetricPageProps } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
-type MetricDependenciesPageParams = {
- cardId: string;
-};
-
-type MetricDependenciesPageProps = {
- params: MetricDependenciesPageParams;
+interface MetricDependenciesPageProps extends MetricPageProps {
children?: ReactNode;
-};
+}
export function MetricDependenciesPage({
params,
children,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
}: MetricDependenciesPageProps) {
const cardId = Urls.extractEntityId(params.cardId);
const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
@@ -35,10 +36,16 @@ export function MetricDependenciesPage({
return (
<PageContainer>
- <MetricHeader card={card} />
+ <MetricPageShell
+ card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
<PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider
value={{
- baseUrl: Urls.dataStudioMetricDependencies(card.id),
+ baseUrl: urls.dependencies(card.id),
defaultEntry: { id: card.id, type: "card" },
}}
>
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/index.ts b/frontend/src/metabase/metrics/pages/MetricDependenciesPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricDependenciesPage/index.ts
rename to frontend/src/metabase/metrics/pages/MetricDependenciesPage/index.ts
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.module.css b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.module.css
new file mode 100644
index 00000000000..05bb89f0336
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.module.css
@@ -0,0 +1,4 @@
+.card {
+ overflow: auto;
+ min-height: 0;
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
new file mode 100644
index 00000000000..120746b4619
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/MetricHistoryPage.tsx
@@ -0,0 +1,48 @@
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-load-card-with-metadata";
+import * as Urls from "metabase/lib/urls";
+import { Box, Card, Center } from "metabase/ui";
+
+import { MetricActivityTimeline } from "../../components/MetricActivityTimeline";
+import { MetricPageShell } from "../../components/MetricPageShell";
+import type { MetricPageProps } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
+
+import S from "./MetricHistoryPage.module.css";
+
+export function MetricHistoryPage({
+ params,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricPageProps) {
+ const cardId = Urls.extractEntityId(params.cardId);
+ const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
+
+ if (isLoading || error != null || card == null) {
+ return (
+ <Center h="100%">
+ <LoadingAndErrorWrapper loading={isLoading} error={error} />
+ </Center>
+ );
+ }
+
+ return (
+ <PageContainer>
+ <MetricPageShell
+ card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
+ <Card withBorder p="md" flex={1} className={S.card}>
+ <Box maw={800} pt="md" px="md">
+ <MetricActivityTimeline card={card} />
+ </Box>
+ </Card>
+ </PageContainer>
+ );
+}
diff --git a/frontend/src/metabase/metrics/pages/MetricHistoryPage/index.ts b/frontend/src/metabase/metrics/pages/MetricHistoryPage/index.ts
new file mode 100644
index 00000000000..9a4c818db5d
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/MetricHistoryPage/index.ts
@@ -0,0 +1 @@
+export { MetricHistoryPage } from "./MetricHistoryPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
similarity index 53%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
rename to frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
index f81ebffe6f4..407ef44d5c2 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricOverviewPage/MetricOverviewPage.tsx
@@ -4,19 +4,18 @@ import { useLoadCardWithMetadata } from "metabase/data-studio/common/hooks/use-l
import * as Urls from "metabase/lib/urls";
import { Center } from "metabase/ui";
-import { MetricHeader } from "../../components/MetricHeader";
+import { MetricDimensionGrid } from "../../components/MetricDimensionGrid";
+import { MetricPageShell } from "../../components/MetricPageShell";
+import type { MetricPageProps } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
-import { MetricOverview } from "./MetricOverview";
-
-type MetricOverviewPageParams = {
- cardId: string;
-};
-
-type MetricOverviewPageProps = {
- params: MetricOverviewPageParams;
-};
-
-export function MetricOverviewPage({ params }: MetricOverviewPageProps) {
+export function MetricOverviewPage({
+ params,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricPageProps) {
const cardId = Urls.extractEntityId(params.cardId);
const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
@@ -30,8 +29,14 @@ export function MetricOverviewPage({ params }: MetricOverviewPageProps) {
return (
<PageContainer data-testid="metric-overview-page" gap="xl">
- <MetricHeader card={card} />
- <MetricOverview card={card} />
+ <MetricPageShell
+ card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
+ {card.id != null && <MetricDimensionGrid metricId={card.id} />}
</PageContainer>
);
}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/index.ts b/frontend/src/metabase/metrics/pages/MetricOverviewPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricOverviewPage/index.ts
rename to frontend/src/metabase/metrics/pages/MetricOverviewPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
similarity index 80%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
rename to frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
index a4aeb12fab5..256e6ba11a3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
+++ b/frontend/src/metabase/metrics/pages/MetricQueryPage/MetricQueryPage.tsx
@@ -19,22 +19,26 @@ import { getMetadata } from "metabase/selectors/metadata";
import { Card, Center } from "metabase/ui";
import * as Lib from "metabase-lib";
import Question from "metabase-lib/v1/Question";
-import type { Card as CardType } from "metabase-types/api";
+import type { Card as CardApiType } from "metabase-types/api";
-import { MetricHeader } from "../../components/MetricHeader";
+import { MetricPageShell } from "../../components/MetricPageShell";
import { MetricQueryEditor } from "../../components/MetricQueryEditor";
-import { getValidationResult } from "../../utils";
+import type { MetricPageProps, MetricUrls } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
+import { getValidationResult } from "../../utils/validation";
-type MetricQueryPageParams = {
- cardId: string;
-};
-
-type MetricQueryPageProps = {
- params: MetricQueryPageParams;
+interface MetricQueryPageProps extends MetricPageProps {
route: Route;
-};
+}
-export function MetricQueryPage({ params, route }: MetricQueryPageProps) {
+export function MetricQueryPage({
+ params,
+ route,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink = true,
+}: MetricQueryPageProps) {
const cardId = Urls.extractEntityId(params.cardId);
const { card, isLoading, error } = useLoadCardWithMetadata(cardId);
@@ -46,15 +50,32 @@ export function MetricQueryPage({ params, route }: MetricQueryPageProps) {
);
}
- return <MetricQueryPageBody card={card} route={route} />;
+ return (
+ <MetricQueryPageBody
+ card={card}
+ route={route}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
+ />
+ );
}
-type MetricQueryPageBodyProps = {
- card: CardType;
- route: Route;
-};
+interface MetricQueryPageBodyProps
+ extends Omit<MetricQueryPageProps, "params"> {
+ card: CardApiType;
+ urls: MetricUrls;
+}
-function MetricQueryPageBody({ card, route }: MetricQueryPageBodyProps) {
+function MetricQueryPageBody({
+ card,
+ route,
+ urls,
+ renderBreadcrumbs,
+ showAppSwitcher,
+ showDataStudioLink,
+}: MetricQueryPageBodyProps) {
const metadata = useSelector(getMetadata);
const [datasetQuery, setDatasetQuery] = useState(card.dataset_query);
const [uiState, setUiState] = useState(getInitialUiState);
@@ -131,8 +152,12 @@ function MetricQueryPageBody({ card, route }: MetricQueryPageBodyProps) {
return (
<>
<PageContainer pos="relative" data-testid="metric-query-editor" gap="xl">
- <MetricHeader
+ <MetricPageShell
card={card}
+ urls={urls}
+ renderBreadcrumbs={renderBreadcrumbs}
+ showAppSwitcher={showAppSwitcher}
+ showDataStudioLink={showDataStudioLink}
actions={
<PaneHeaderActions
errorMessage={validationResult.errorMessage}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/index.ts b/frontend/src/metabase/metrics/pages/MetricQueryPage/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/MetricQueryPage/index.ts
rename to frontend/src/metabase/metrics/pages/MetricQueryPage/index.ts
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
similarity index 89%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
rename to frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
index 4bb4eb1127d..ba6f40d6d03 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx
@@ -26,16 +26,18 @@ const NEW_METRIC_SCHEMA = Yup.object({
collection_id: Yup.number().nullable().default(null),
});
-type CreateMetricModalProps = {
+interface CreateMetricModalProps {
query: Lib.Query;
defaultValues: Partial<NewMetricValues>;
+ triggeredFrom: "data_studio" | "main_app";
onCreate: (card: Card) => void;
onClose: () => void;
-};
+}
export function CreateMetricModal({
query,
defaultValues,
+ triggeredFrom,
onCreate,
onClose,
}: CreateMetricModalProps) {
@@ -44,6 +46,7 @@ export function CreateMetricModal({
<CreateMetricForm
query={query}
defaultValues={defaultValues}
+ triggeredFrom={triggeredFrom}
onCreate={onCreate}
onClose={onClose}
/>
@@ -51,19 +54,13 @@ export function CreateMetricModal({
);
}
-type CreateMetricFormProps = {
- query: Lib.Query;
- defaultValues: Partial<NewMetricValues>;
- onCreate: (card: Card) => void;
- onClose: () => void;
-};
-
function CreateMetricForm({
query,
defaultValues,
+ triggeredFrom,
onCreate,
onClose,
-}: CreateMetricFormProps) {
+}: CreateMetricModalProps) {
const [createCard] = useCreateCardMutation();
const initialValues: NewMetricValues = useMemo(
@@ -75,10 +72,10 @@ function CreateMetricForm({
try {
const request = getCreateRequest(query, values);
const card = await createCard(request).unwrap();
- trackMetricCreated("success", "data_studio", card.id);
+ trackMetricCreated("success", triggeredFrom, card.id);
onCreate(card);
} catch (error) {
- trackMetricCreated("failure", "data_studio", null);
+ trackMetricCreated("failure", triggeredFrom, null);
throw error;
}
};
@@ -94,7 +91,7 @@ function CreateMetricForm({
<FormTextInput
name="name"
label={t`Name`}
- placeholder={t`My Great Metric`}
+ placeholder={t`What is the name of your metric?`}
data-autofocus
/>
<FormTextarea
@@ -144,6 +141,7 @@ function getCreateRequest(
name,
description,
collection_id,
+ collection_position: 1,
result_metadata,
type: "metric",
dataset_query: Lib.toJsQuery(query),
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/index.ts b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
rename to frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/index.ts
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
new file mode 100644
index 00000000000..5f21637d4a9
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx
@@ -0,0 +1,165 @@
+import { useDisclosure } from "@mantine/hooks";
+import type { Location } from "history";
+import type { ReactNode } from "react";
+import { useMemo, useState } from "react";
+import type { Route } from "react-router";
+import { goBack, push } from "react-router-redux";
+import { t } from "ttag";
+
+import { useGetDefaultCollectionId } from "metabase/collections/hooks";
+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
+import { PageContainer } from "metabase/data-studio/common/components/PageContainer";
+import {
+ PaneHeader,
+ PaneHeaderActions,
+ PaneHeaderInput,
+} from "metabase/data-studio/common/components/PaneHeader";
+import { getResultMetadata } from "metabase/data-studio/common/utils";
+import { useDispatch, useSelector } from "metabase/lib/redux";
+import * as Urls from "metabase/lib/urls";
+import { MetricQueryEditor } from "metabase/metrics/components/MetricQueryEditor";
+import { NAME_MAX_LENGTH } from "metabase/metrics/constants";
+import { getInitialUiState } from "metabase/querying/editor/components/QueryEditor";
+import { getMetadata } from "metabase/selectors/metadata";
+import { Breadcrumbs, Card, Icon } from "metabase/ui";
+import * as Lib from "metabase-lib";
+import type { Card as CardApiType } from "metabase-types/api";
+
+import type { MetricUrls } from "../../types";
+import { metricUrls as defaultUrls } from "../../urls";
+import { getValidationResult } from "../../utils/validation";
+
+import { CreateMetricModal } from "./CreateMetricModal";
+import { getInitialQuery, getQuery } from "./utils";
+
+interface NewMetricPageQuery {
+ collectionId?: string;
+}
+
+interface NewMetricPageProps {
+ location: Location<NewMetricPageQuery>;
+ route: Route;
+ urls?: MetricUrls;
+ renderBreadcrumbs?: () => ReactNode;
+ showAppSwitcher?: boolean;
+ triggeredFrom?: "data_studio" | "main_app";
+}
+
+export function NewMetricPage({
+ location,
+ route,
+ urls = defaultUrls,
+ renderBreadcrumbs,
+ showAppSwitcher = false,
+ triggeredFrom = "main_app",
+}: NewMetricPageProps) {
+ const metadata = useSelector(getMetadata);
+ const [name, setName] = useState("");
+ const [datasetQuery, setDatasetQuery] = useState(() =>
+ Lib.toJsQuery(getInitialQuery(metadata)),
+ );
+ const [uiState, setUiState] = useState(getInitialUiState);
+ const [isModalOpened, { open: openModal, close: closeModal }] =
+ useDisclosure();
+ const initialCollectionId = Urls.extractCollectionId(
+ location.query.collectionId,
+ );
+ const defaultCollectionId = useGetDefaultCollectionId();
+ const dispatch = useDispatch();
+
+ const query = useMemo(
+ () => getQuery(datasetQuery, metadata),
+ [datasetQuery, metadata],
+ );
+
+ const resultMetadata = useMemo(() => {
+ return getResultMetadata(
+ datasetQuery,
+ uiState.lastRunQuery,
+ uiState.lastRunResult,
+ );
+ }, [datasetQuery, uiState.lastRunResult, uiState.lastRunQuery]);
+
+ const validationResult = useMemo(() => getValidationResult(query), [query]);
+
+ const defaultValues = useMemo(
+ () => ({
+ name: name === "" ? Lib.suggestedName(query) : name,
+ result_metadata: resultMetadata,
+ collection_id: initialCollectionId ?? defaultCollectionId,
+ }),
+ [name, query, resultMetadata, initialCollectionId, defaultCollectionId],
+ );
+
+ const handleCreate = (card: CardApiType) => {
+ dispatch(push(urls.about(card.id)));
+ };
+
+ const handleChangeQuery = (query: Lib.Query) => {
+ setDatasetQuery(Lib.toJsQuery(query));
+ };
+
+ const handleCancel = () => {
+ dispatch(goBack());
+ };
+
+ return (
+ <>
+ <PageContainer pos="relative" data-testid="metric-query-editor">
+ <PaneHeader
+ showAppSwitcher={showAppSwitcher}
+ title={
+ <PaneHeaderInput
+ initialValue={name}
+ placeholder={t`New metric`}
+ maxLength={NAME_MAX_LENGTH}
+ isOptional
+ onChange={setName}
+ />
+ }
+ icon="metric"
+ actions={
+ <PaneHeaderActions
+ errorMessage={validationResult.errorMessage}
+ isValid={validationResult.isValid}
+ isDirty
+ onSave={openModal}
+ onCancel={handleCancel}
+ />
+ }
+ breadcrumbs={
+ renderBreadcrumbs ? (
+ renderBreadcrumbs()
+ ) : (
+ <Breadcrumbs
+ separator={<Icon size={12} name="chevronright" />}
+ fz="sm"
+ c="text-secondary"
+ >
+ <span>{t`New Metric`}</span>
+ </Breadcrumbs>
+ )
+ }
+ />
+ <Card withBorder p={0} flex={1}>
+ <MetricQueryEditor
+ query={query}
+ uiState={uiState}
+ onChangeQuery={handleChangeQuery}
+ onChangeUiState={setUiState}
+ />
+ </Card>
+ </PageContainer>
+ {isModalOpened && (
+ <CreateMetricModal
+ query={query}
+ defaultValues={defaultValues}
+ triggeredFrom={triggeredFrom}
+ onCreate={handleCreate}
+ onClose={closeModal}
+ />
+ )}
+ <LeaveRouteConfirmModal route={route} isEnabled={!isModalOpened} />
+ </>
+ );
+}
diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/index.ts b/frontend/src/metabase/metrics/pages/NewMetricPage/index.ts
new file mode 100644
index 00000000000..34b16f3f95c
--- /dev/null
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/index.ts
@@ -0,0 +1 @@
+export { NewMetricPage } from "./NewMetricPage";
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/types.ts b/frontend/src/metabase/metrics/pages/NewMetricPage/types.ts
similarity index 85%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/types.ts
rename to frontend/src/metabase/metrics/pages/NewMetricPage/types.ts
index 30c922d5367..d16271e49a3 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/types.ts
+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/types.ts
@@ -1,9 +1,9 @@
import type { CollectionId, Field } from "metabase-types/api";
-export type NewMetricValues = {
+export interface NewMetricValues {
name: string;
description: string | null;
resultMetadata: Field[] | null;
collection_id: CollectionId | null;
result_metadata: Field[] | null;
-};
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/utils.ts b/frontend/src/metabase/metrics/pages/NewMetricPage/utils.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/pages/NewMetricPage/utils.ts
rename to frontend/src/metabase/metrics/pages/NewMetricPage/utils.ts
diff --git a/frontend/src/metabase/metrics/routes.tsx b/frontend/src/metabase/metrics/routes.tsx
new file mode 100644
index 00000000000..a14ecb17828
--- /dev/null
+++ b/frontend/src/metabase/metrics/routes.tsx
@@ -0,0 +1,33 @@
+import { IndexRoute, Route } from "react-router";
+
+import { PLUGIN_CACHING, PLUGIN_DEPENDENCIES } from "metabase/plugins";
+
+import { MetricAboutPage } from "./pages/MetricAboutPage";
+import { MetricDependenciesPage } from "./pages/MetricDependenciesPage";
+import { MetricHistoryPage } from "./pages/MetricHistoryPage";
+import { MetricOverviewPage } from "./pages/MetricOverviewPage";
+import { MetricQueryPage } from "./pages/MetricQueryPage";
+import { NewMetricPage } from "./pages/NewMetricPage";
+
+export function getMetricRoutes() {
+ return (
+ <Route path="metric">
+ <Route path="new" component={NewMetricPage} />
+ <Route path=":cardId" component={MetricAboutPage} />
+ <Route path=":cardId/overview" component={MetricOverviewPage} />
+ <Route path=":cardId/query" component={MetricQueryPage} />
+ {PLUGIN_DEPENDENCIES.isEnabled && (
+ <Route path=":cardId/dependencies" component={MetricDependenciesPage}>
+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />
+ </Route>
+ )}
+ <Route path=":cardId/history" component={MetricHistoryPage} />
+ {PLUGIN_CACHING.isGranularCachingEnabled() && (
+ <Route
+ path=":cardId/caching"
+ component={PLUGIN_CACHING.MetricCachingPage}
+ />
+ )}
+ </Route>
+ );
+}
diff --git a/frontend/src/metabase/metrics/types.ts b/frontend/src/metabase/metrics/types.ts
index 3de12aa96b4..4c27b6f785f 100644
--- a/frontend/src/metabase/metrics/types.ts
+++ b/frontend/src/metabase/metrics/types.ts
@@ -1,6 +1,31 @@
+import type { ReactNode } from "react";
+
import type * as LibMetric from "metabase-lib/metric";
+import type { Card, CardId, DatabaseId } from "metabase-types/api";
-export type DimensionWithDefinition = {
+export interface DimensionWithDefinition {
dimension: LibMetric.DimensionMetadata;
definition: LibMetric.MetricDefinition;
-};
+}
+
+export interface MetricUrls {
+ about: (cardId: CardId) => string;
+ overview: (cardId: CardId) => string;
+ query: (cardId: CardId) => string;
+ dependencies: (cardId: CardId) => string;
+ caching: (cardId: CardId) => string;
+ history: (cardId: CardId) => string;
+ database?: (databaseId: DatabaseId) => string;
+}
+
+export interface MetricPageParams {
+ cardId: string;
+}
+
+export interface MetricPageProps {
+ params: MetricPageParams;
+ urls?: MetricUrls;
+ renderBreadcrumbs?: (card: Card) => ReactNode;
+ showAppSwitcher?: boolean;
+ showDataStudioLink?: boolean;
+}
diff --git a/frontend/src/metabase/metrics/urls.ts b/frontend/src/metabase/metrics/urls.ts
new file mode 100644
index 00000000000..0133f8d717e
--- /dev/null
+++ b/frontend/src/metabase/metrics/urls.ts
@@ -0,0 +1,12 @@
+import * as Urls from "metabase/lib/urls";
+
+import type { MetricUrls } from "./types";
+
+export const metricUrls: MetricUrls = {
+ about: Urls.metricAbout,
+ overview: Urls.metricOverview,
+ query: Urls.metricQuery,
+ dependencies: Urls.metricDependencies,
+ caching: Urls.metricCaching,
+ history: Urls.metricHistory,
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/utils.ts b/frontend/src/metabase/metrics/utils/validation.ts
similarity index 100%
rename from enterprise/frontend/src/metabase-enterprise/data-studio/library/metrics/utils.ts
rename to frontend/src/metabase/metrics/utils/validation.ts
diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
index 3a8a099eacb..2898f81f5da 100644
--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx
@@ -193,16 +193,7 @@ export const useCommandPaletteBasicActions = ({
perform: () => {
trackMetricCreateStarted("command_palette");
dispatch(closeModal());
- dispatch(push("metric/query"));
- dispatch(
- push(
- Urls.newQuestion({
- mode: "query",
- cardType: "metric",
- collectionId,
- }),
- ),
- );
+ dispatch(push(Urls.newMetric({ collectionId })));
},
});
}
diff --git a/frontend/src/metabase/plugins/index.ts b/frontend/src/metabase/plugins/index.ts
index 27b446a75fb..e72f1b6120b 100644
--- a/frontend/src/metabase/plugins/index.ts
+++ b/frontend/src/metabase/plugins/index.ts
@@ -1,6 +1,10 @@
// Re-export all plugins from OSS modules (excluding reinitialize functions to avoid conflicts)
export { PLUGIN_API } from "./oss/api";
-export { PLUGIN_AUDIT, type InsightsLinkProps } from "./oss/audit";
+export {
+ PLUGIN_AUDIT,
+ type InsightsLinkProps,
+ type InsightsMenuItemProps,
+} from "./oss/audit";
export {
PLUGIN_AUTH_PROVIDERS,
PLUGIN_LDAP_FORM_FIELDS,
diff --git a/frontend/src/metabase/plugins/oss/audit.ts b/frontend/src/metabase/plugins/oss/audit.ts
index 2424c5a5e69..d025a885257 100644
--- a/frontend/src/metabase/plugins/oss/audit.ts
+++ b/frontend/src/metabase/plugins/oss/audit.ts
@@ -2,8 +2,13 @@ import type { ComponentType } from "react";
import type { LinkProps } from "metabase/common/components/Link";
import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
+import type { IconName } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
-import type { Dashboard, Database as DatabaseType } from "metabase-types/api";
+import type {
+ Card,
+ Dashboard,
+ Database as DatabaseType,
+} from "metabase-types/api";
export type InsightsLinkProps = (
| {
@@ -17,9 +22,16 @@ export type InsightsLinkProps = (
) &
Omit<LinkProps, "to">;
+export interface InsightsMenuItemProps {
+ card: Pick<Card, "id" | "collection">;
+ label?: string;
+ iconName?: IconName;
+}
+
const getDefaultPluginAudit = () => ({
isAuditDb: (_db: DatabaseType) => false,
InsightsLink: PluginPlaceholder as ComponentType<InsightsLinkProps>,
+ InsightsMenuItem: PluginPlaceholder as ComponentType<InsightsMenuItemProps>,
});
export const PLUGIN_AUDIT = getDefaultPluginAudit();
diff --git a/frontend/src/metabase/plugins/oss/caching.ts b/frontend/src/metabase/plugins/oss/caching.ts
index 52dc4163810..03ebaf50cbc 100644
--- a/frontend/src/metabase/plugins/oss/caching.ts
+++ b/frontend/src/metabase/plugins/oss/caching.ts
@@ -1,14 +1,19 @@
-import type { ComponentType, Dispatch, SetStateAction } from "react";
+import type { ComponentType, Dispatch, ReactNode, SetStateAction } from "react";
import {
getPerformanceTabMetadata,
strategies,
} from "metabase/admin/performance/constants/complex";
import type { ModelWithClearableCache } from "metabase/admin/performance/types";
+import type { MetricPageParams, MetricUrls } from "metabase/metrics/types";
import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";
import type { ModalOverlayProps, StackProps } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
-import type { CacheableDashboard, CacheableModel } from "metabase-types/api";
+import type {
+ CacheableDashboard,
+ CacheableModel,
+ Card,
+} from "metabase-types/api";
// Types
export type InvalidateNowButtonProps = {
@@ -37,9 +42,13 @@ export type PreemptiveCachingSwitchProps = {
handleSwitchToggle: () => void;
};
-export type MetricSettingsPageProps = {
- params: { cardId: string };
-};
+export interface MetricSettingsPageProps {
+ params: MetricPageParams;
+ urls?: MetricUrls;
+ renderBreadcrumbs?: (card: Card) => ReactNode;
+ showAppSwitcher?: boolean;
+ showDataStudioLink?: boolean;
+}
const getDefaultPluginCaching = () => ({
isGranularCachingEnabled: () => false,
diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
index ebe679629ab..103955c4e97 100644
--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx
@@ -1,7 +1,6 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
import { t } from "ttag";
-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import {
type OmniPickerItem,
isInDbTree,
@@ -46,12 +45,8 @@ export const AddToDashSelectDashModal = ({
onChangeLocation,
}: AddToDashSelectDashModalProps) => {
const personalCollectionId = useSelector(getUserPersonalCollectionId);
-
- const {
- data: mostRecentlyViewedDashboard,
- isLoading,
- error,
- } = useMostRecentlyViewedDashboard();
+ const { data: mostRecentlyViewedDashboard } =
+ useMostRecentlyViewedDashboard();
const onDashboardSelected = (
selectedDashboard?: Pick<Dashboard, "id" | "name">,
@@ -71,12 +66,27 @@ export const AddToDashSelectDashModal = ({
const isRecentDashboardInPersonalCollection =
mostRecentlyViewedDashboard?.collection?.is_personal;
- // we can only show the most recently viewed dashboard if it's not in a personal collection
- // OR the question and dashboard are both in personal collections
const showRecentDashboard =
mostRecentlyViewedDashboard?.id &&
(!isQuestionInPersonalCollection || isRecentDashboardInPersonalCollection);
+ const value = useMemo(() => {
+ if (showRecentDashboard) {
+ return {
+ id: mostRecentlyViewedDashboard.id,
+ model: "dashboard" as const,
+ };
+ }
+ return {
+ id: card.collection_id ?? "root",
+ model: "collection" as const,
+ };
+ }, [
+ showRecentDashboard,
+ mostRecentlyViewedDashboard?.id,
+ card.collection_id,
+ ]);
+
const shouldDisable = useCallback(
(item: OmniPickerItem) => {
if (isInDbTree(item)) {
@@ -92,7 +102,6 @@ export const AddToDashSelectDashModal = ({
personalCollectionId &&
item.model === "dashboard"
) {
- // if the question is in a personal collection, hide dashboards that aren't in the personal collection
const isPersonalDash = isInPersonalCollection(
item,
personalCollectionId,
@@ -101,7 +110,6 @@ export const AddToDashSelectDashModal = ({
return !isPersonalDash;
}
- // if there can't be dashboards in the collection, you can't add a question to one there
if (
!canPlaceEntityInCollectionOrDescendants(
"dashboard",
@@ -116,26 +124,12 @@ export const AddToDashSelectDashModal = ({
[isQuestionInPersonalCollection, personalCollectionId],
);
- if (isLoading || error) {
- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
- }
-
return (
<DashboardPickerModal
title={getTitle(card)}
onChange={onDashboardSelected}
onClose={onClose}
- value={
- showRecentDashboard
- ? {
- id: mostRecentlyViewedDashboard.id,
- model: "dashboard",
- }
- : {
- id: card.collection_id ?? "root",
- model: "collection",
- }
- }
+ value={value}
options={{
hasPersonalCollections: true,
hasRootCollection: !isQuestionInPersonalCollection,
diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
index eff38acc6e5..cfb09fc176e 100644
--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx
@@ -313,13 +313,13 @@ describe("AddToDashSelectDashModal", () => {
jest.restoreAllMocks();
});
- it("should show loading", async () => {
+ it("should show the modal while loading", async () => {
await setup({
waitForContent: false,
mostRecentlyViewedDashboard: DASHBOARD,
});
- expect(await screen.findByText("Loading...")).toBeInTheDocument();
+ expect(await screen.findByRole("dialog")).toBeInTheDocument();
});
it("should render dashboards when opening the root collection (public collection)", async () => {
diff --git a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
index 33098773b4d..df2c988a4cf 100644
--- a/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
+++ b/frontend/src/metabase/query_builder/components/QuestionActivityTimeline.tsx
@@ -2,8 +2,8 @@ import { useMemo } from "react";
import { useListRevisionsQuery } from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { Timeline } from "metabase/common/components/Timeline";
-import { getTimelineEvents } from "metabase/common/components/Timeline/utils";
+import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
+import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { revertToRevision } from "metabase/query_builder/actions";
@@ -51,7 +51,7 @@ export function QuestionActivityTimeline({
}
return (
- <Timeline
+ <RevisionHistoryTimeline
events={events}
data-testid="saved-question-history-list"
revert={(revision) => dispatch(revertToRevision(question.id(), revision))}
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
index 86452298383..219a5eadc3e 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx
@@ -5,8 +5,6 @@ import { t } from "ttag";
import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";
import { ToolbarButton } from "metabase/common/components/ToolbarButton";
import { UploadInput } from "metabase/common/components/upload";
-import { DataStudioToolbarButton } from "metabase/data-studio/query-builder/components/DataStudioToolbarButton";
-import { getLibraryCollectionType } from "metabase/data-studio/utils";
import { useDispatch } from "metabase/lib/redux";
import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";
import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu";
@@ -98,9 +96,6 @@ export const QuestionActions = ({
}
};
- const shouldShowDataStudioLink =
- getLibraryCollectionType(question.collection()?.type) != null;
-
return (
<>
<Divider orientation="vertical" my="xs" />
@@ -162,16 +157,13 @@ export const QuestionActions = ({
</Box>
</>
)}
- {!question.isArchived() && !shouldShowDataStudioLink && (
+ {!question.isArchived() && (
<QuestionMoreActionsMenu
question={question}
onOpenModal={onOpenModal}
onSetQueryBuilderMode={onSetQueryBuilderMode}
/>
)}
- {shouldShowDataStudioLink && (
- <DataStudioToolbarButton question={question} />
- )}
</>
);
};
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 04d73892d70..e6a0b0d5685 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -39,6 +39,7 @@ import { Onboarding } from "metabase/home/components/Onboarding";
import { trackPageView } from "metabase/lib/analytics";
import { MetabotQueryBuilder } from "metabase/metabot/components/MetabotQueryBuilder";
import { getMetabotRoutes } from "metabase/metabot/routes";
+import { getMetricRoutes } from "metabase/metrics/routes";
import { MetricsViewerPage } from "metabase/metrics-viewer";
import NewModelOptions from "metabase/models/containers/NewModelOptions";
import { getRoutes as getModelRoutes } from "metabase/models/routes";
@@ -296,15 +297,7 @@ export const getRoutes = (store) => {
<Route path="metabot" component={QueryBuilder} />
</Route>
- {/* METRICS V2 */}
- <Route path="/metric">
- <IndexRoute component={QueryBuilder} />
- <Route path="notebook" component={QueryBuilder} />
- <Route path="query" component={QueryBuilder} />
- <Route path=":slug" component={QueryBuilder} />
- <Route path=":slug/notebook" component={QueryBuilder} />
- <Route path=":slug/query" component={QueryBuilder} />
- </Route>
+ {getMetricRoutes()}
<Route path="browse">
<IndexRedirect to="/browse/models" />
diff --git a/frontend/src/metabase/selectors/app.ts b/frontend/src/metabase/selectors/app.ts
index 266ef0c5cee..52315d2bac0 100644
--- a/frontend/src/metabase/selectors/app.ts
+++ b/frontend/src/metabase/selectors/app.ts
@@ -35,10 +35,6 @@ const PATHS_WITHOUT_NAVBAR = [
/\/model\/query/,
/\/model\/columns/,
/\/model\/metadata/,
- /\/metric\/.*\/query/,
- /\/metric\/.*\/metadata/,
- /\/metric\/query/,
- /\/metric\/metadata/,
/\/transform\/new\/.*\/query/,
];
diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
index e541b8e57b2..b4675f7979e 100644
--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformHeader.unit.spec.tsx
@@ -1,7 +1,11 @@
import { Route } from "react-router";
+import { setupCollectionByIdEndpoint } from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
-import { createMockTransform } from "metabase-types/api/mocks";
+import {
+ createMockCollection,
+ createMockTransform,
+} from "metabase-types/api/mocks";
import { TransformHeader } from "./TransformHeader";
@@ -13,6 +17,10 @@ type SetupOpts = {
function setup({ hasMenu = true, isEditMode = false }: SetupOpts = {}) {
const transform = createMockTransform({ id: 1, name: "Test Transform" });
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root" })],
+ });
+
renderWithProviders(
<Route
component={() => (
diff --git a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
index 474942e59b2..4cd81b74a5c 100644
--- a/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
+++ b/frontend/src/metabase/transforms/components/TransformRevisionHistorySidebar/TransformRevisionHistorySidebar.tsx
@@ -9,9 +9,9 @@ import {
useRevertRevisionMutation,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
+import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";
+import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";
import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";
-import { Timeline } from "metabase/common/components/Timeline";
-import { getTimelineEvents } from "metabase/common/components/Timeline/utils";
import { useSelector } from "metabase/lib/redux";
import { getUser } from "metabase/selectors/user";
import type { Transform } from "metabase-types/api";
@@ -63,7 +63,7 @@ export function TransformRevisionHistorySidebar({
{isLoading || error ? (
<LoadingAndErrorWrapper loading={isLoading} error={error} />
) : (
- <Timeline
+ <RevisionHistoryTimeline
events={events}
data-testid="transform-history-list"
revert={(revision) =>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/grid_bordered.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/grid_bordered.svg
new file mode 100644
index 00000000000..e6d4c719ee3
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/grid_bordered.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 5H5V6.5H6.5V5Z" fill="currentColor"/>
+<path d="M9.5 5H11V6.5H9.5V5Z" fill="currentColor"/>
+<path d="M8.75 5H7.25V6.5H8.75V5Z" fill="currentColor"/>
+<path d="M5 7.25H6.5V8.75H5V7.25Z" fill="currentColor"/>
+<path d="M11 7.25H9.5V8.75H11V7.25Z" fill="currentColor"/>
+<path d="M7.25 7.25H8.75V8.75H7.25V7.25Z" fill="currentColor"/>
+<path d="M6.5 9.5H5V11H6.5V9.5Z" fill="currentColor"/>
+<path d="M9.5 9.5H11V11H9.5V9.5Z" fill="currentColor"/>
+<path d="M8.75 9.5H7.25V11H8.75V9.5Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 3C2 2.44772 2.44772 2 3 2H13C13.5523 2 14 2.44772 14 3V13C14 13.5523 13.5523 14 13 14H3C2.44772 14 2 13.5523 2 13V3ZM3.5 12.5V3.5H12.5V12.5H3.5Z" fill="currentColor"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index 9400569fbf4..577eb381ebc 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -242,6 +242,8 @@ import grid_component from "./grid.svg?component";
import grid_source from "./grid.svg?source";
import grid_2x2_component from "./grid_2x2.svg?component";
import grid_2x2_source from "./grid_2x2.svg?source";
+import grid_bordered_component from "./grid_bordered.svg?component";
+import grid_bordered_source from "./grid_bordered.svg?source";
import group_component from "./group.svg?component";
import group_source from "./group.svg?source";
import history_component from "./history.svg?component";
@@ -364,6 +366,8 @@ import person_component from "./person.svg?component";
import person_source from "./person.svg?source";
import pie_component from "./pie.svg?component";
import pie_source from "./pie.svg?source";
+import pie_slice_component from "./pie_slice.svg?component";
+import pie_slice_source from "./pie_slice.svg?source";
import pin_component from "./pin.svg?component";
import pin_source from "./pin.svg?source";
import pinmap_component from "./pinmap.svg?component";
@@ -1017,6 +1021,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: grid_2x2_component,
source: grid_2x2_source,
},
+ grid_bordered: {
+ component: grid_bordered_component,
+ source: grid_bordered_source,
+ },
group: {
component: group_component,
source: group_source,
@@ -1257,6 +1265,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: pie_component,
source: pie_source,
},
+ pie_slice: {
+ component: pie_slice_component,
+ source: pie_slice_source,
+ },
pin: {
component: pin_component,
source: pin_source,
@@ -1824,6 +1836,7 @@ export type IconName =
| "grabber"
| "grid"
| "grid_2x2"
+ | "grid_bordered"
| "group"
| "google"
| "google_drive"
@@ -1885,6 +1898,7 @@ export type IconName =
| "permissions_limited"
| "person"
| "pie"
+ | "pie_slice"
| "pin"
| "pinmap"
| "pivot_table"
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/pie_slice.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/pie_slice.svg
new file mode 100644
index 00000000000..68971c7508e
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/pie_slice.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25 8C7.25 8.41421 7.58579 8.75 8 8.75H14C14.1989 8.75 14.3897 8.67098 14.5303 8.53033C14.671 8.38968 14.75 8.19891 14.75 8C14.75 7.11358 14.5754 6.23583 14.2362 5.41689C13.897 4.59794 13.3998 3.85382 12.773 3.22703C12.1462 2.60023 11.4021 2.10303 10.5831 1.76381C9.76417 1.42459 8.88642 1.25 8 1.25C7.58579 1.25 7.25 1.58579 7.25 2V8ZM13.1962 7.25H8.75V2.80385C9.18149 2.86613 9.60451 2.98205 10.0091 3.14963C10.646 3.41347 11.2248 3.80018 11.7123 4.28769C12.1998 4.7752 12.5865 5.35395 12.8504 5.99091C13.0179 6.39549 13.1339 6.81851 13.1962 7.25Z" fill="currentColor"/>
+<path d="M5.34172 3.65082C5.70108 3.44482 5.82541 2.98652 5.61942 2.62715C5.41343 2.26779 4.95512 2.14346 4.59576 2.34945C3.94021 2.72522 3.35043 3.21066 2.85402 3.78772C2.05254 4.7194 1.52572 5.85355 1.33247 7.06494C1.13921 8.27634 1.28718 9.51712 1.75979 10.6499C2.23238 11.7826 3.01096 12.7628 4.00875 13.4825C5.0065 14.2023 6.18476 14.6337 7.4132 14.7297C8.64164 14.8256 9.87311 14.5825 10.9716 14.0268C12.0701 13.4711 12.9932 12.6243 13.6382 11.5792C13.8558 11.2267 13.7464 10.7646 13.3939 10.5471C13.0414 10.3295 12.5793 10.4389 12.3618 10.7914C11.8625 11.6002 11.1473 12.257 10.2945 12.6884C9.44165 13.1198 8.48487 13.3088 7.53005 13.2342C6.57524 13.1596 5.66028 12.8243 4.88628 12.266C4.11232 11.7077 3.50963 10.9484 3.14414 10.0723C2.77867 9.19635 2.6644 8.23737 2.81374 7.30124C2.96308 6.3651 3.37034 5.48761 3.99115 4.76595C4.3757 4.31893 4.83294 3.94246 5.34172 3.65082Z" fill="currentColor"/>
+</svg>
diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.module.css b/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.module.css
new file mode 100644
index 00000000000..d83b518494d
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.module.css
@@ -0,0 +1,12 @@
+.value {
+ font-size: 2rem;
+ line-height: 1;
+}
+
+.increase {
+ color: var(--mb-color-success);
+}
+
+.decrease {
+ color: var(--mb-color-error);
+}
diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.tsx b/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.tsx
new file mode 100644
index 00000000000..8c0f30e9884
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/TrendInfo/TrendInfo.tsx
@@ -0,0 +1,51 @@
+import { t } from "ttag";
+
+import { Flex, Icon, Text, Title } from "metabase/ui";
+import type { PreviousPeriodChange } from "metabase/visualizations/lib/trend-helpers";
+import { formatChange } from "metabase/visualizations/visualizations/SmartScalar/utils";
+
+import S from "./TrendInfo.module.css";
+
+type TrendInfoProps = {
+ value: string;
+ dateLabel: string;
+ change?: PreviousPeriodChange;
+};
+
+export function TrendInfo({ value, dateLabel, change }: TrendInfoProps) {
+ const isDecrease = change != null && change.percent < 0;
+
+ return (
+ <div>
+ <Title order={2} className={S.value}>
+ {value}
+ </Title>
+ <Flex align="center" gap="xs" mt="xs" wrap="wrap">
+ <Text fw={700} c="text-secondary">
+ {dateLabel}
+ </Text>
+ {change != null && change.percent !== 0 && (
+ <Flex align="center" gap={4}>
+ <Icon
+ name={isDecrease ? "arrow_down" : "arrow_up"}
+ size={13}
+ className={isDecrease ? S.decrease : S.increase}
+ />
+ <Text fw={900} className={isDecrease ? S.decrease : S.increase}>
+ {formatChange(change.percent)}
+ </Text>
+ <Text c="text-secondary">{change.description}</Text>
+ </Flex>
+ )}
+ {change != null && change.percent === 0 && (
+ <Flex align="center" gap={4}>
+ <Text c="text-tertiary" fw={700}>
+ {t`No change`}
+ </Text>
+ <Text c="text-secondary">{change.description}</Text>
+ </Flex>
+ )}
+ </Flex>
+ </div>
+ );
+}
diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/index.ts b/frontend/src/metabase/visualizations/components/TrendInfo/index.ts
new file mode 100644
index 00000000000..9ddcaadc60a
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/TrendInfo/index.ts
@@ -0,0 +1,2 @@
+export * from "./TrendInfo";
+export * from "./use-trend-data";
diff --git a/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts
new file mode 100644
index 00000000000..692229e7960
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/TrendInfo/use-trend-data.ts
@@ -0,0 +1,105 @@
+import { useMemo } from "react";
+
+import { formatValue } from "metabase/lib/formatting";
+import { formatDateTimeRangeWithUnit } from "metabase/lib/formatting/date";
+import type { PreviousPeriodChange } from "metabase/visualizations/lib/trend-helpers";
+import {
+ computePreviousPeriodChange,
+ findPreviousNonEmptyRowIndex,
+} from "metabase/visualizations/lib/trend-helpers";
+import type { Dataset, DatasetColumn } from "metabase-types/api";
+import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
+
+type TrendData = {
+ value: string;
+ dateLabel: string;
+ change?: PreviousPeriodChange;
+};
+
+export function useTrendData(
+ data: Dataset | undefined,
+ dateColumnIndex: number,
+ metricColumnIndex: number,
+): TrendData | null {
+ return useMemo(() => {
+ if (!data) {
+ return null;
+ }
+ return computeTrendData(data, dateColumnIndex, metricColumnIndex);
+ }, [data, dateColumnIndex, metricColumnIndex]);
+}
+
+function computeTrendData(
+ dataset: Dataset,
+ dateColumnIndex: number,
+ metricColumnIndex: number,
+): TrendData | null {
+ const { rows, cols, insights } = dataset.data;
+
+ if (rows.length === 0) {
+ return null;
+ }
+
+ const metricColumn = cols[metricColumnIndex];
+ const dateColumn = cols[dateColumnIndex];
+ if (!metricColumn || !dateColumn) {
+ return null;
+ }
+
+ const latestRowIndex = findPreviousNonEmptyRowIndex(
+ rows,
+ dateColumnIndex,
+ metricColumnIndex,
+ rows.length,
+ );
+ if (latestRowIndex === -1) {
+ return null;
+ }
+
+ const latestValue = rows[latestRowIndex][metricColumnIndex];
+ const latestDate = rows[latestRowIndex][dateColumnIndex] as string;
+
+ const formattedValue = formatValue(latestValue, { column: metricColumn });
+ const dateUnit = resolveDateUnit(metricColumn, dateColumn, insights);
+
+ const formattedDate = formatDate(latestDate, dateColumn, dateUnit);
+
+ const change = computePreviousPeriodChange(
+ rows,
+ dateColumnIndex,
+ metricColumnIndex,
+ latestRowIndex,
+ latestValue,
+ dateUnit,
+ );
+
+ return {
+ value: String(formattedValue),
+ dateLabel: String(formattedDate),
+ change,
+ };
+}
+
+function resolveDateUnit(
+ metricColumn: DatasetColumn,
+ dateColumn: DatasetColumn,
+ insights: Dataset["data"]["insights"],
+): string | undefined {
+ return (
+ insights?.find((insight) => insight.col === metricColumn.name)?.unit ??
+ dateColumn.unit
+ );
+}
+
+function formatDate(
+ date: string,
+ dateColumn: DatasetColumn,
+ dateUnit: string | undefined,
+): string {
+ if (dateUnit && isAbsoluteDateTimeUnit(dateUnit)) {
+ return String(
+ formatDateTimeRangeWithUnit([date], dateUnit, { compact: true }),
+ );
+ }
+ return String(formatValue(date, { column: dateColumn }));
+}
diff --git a/frontend/src/metabase/visualizations/lib/trend-helpers.ts b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
new file mode 100644
index 00000000000..73ddefb5e67
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/trend-helpers.ts
@@ -0,0 +1,69 @@
+import { t } from "ttag";
+
+import { isEmpty } from "metabase/lib/validate";
+import { computeChange } from "metabase/visualizations/lib/numeric";
+import { formatPreviousPeriodOptionName } from "metabase/visualizations/visualizations/SmartScalar/utils";
+import type { RowValues } from "metabase-types/api";
+import { isAbsoluteDateTimeUnit } from "metabase-types/guards/date-time";
+
+export function findPreviousNonEmptyRowIndex(
+ rows: RowValues[],
+ dateColumnIndex: number,
+ metricColumnIndex: number,
+ beforeIndex: number,
+): number {
+ for (let index = beforeIndex - 1; index >= 0; index--) {
+ const date = rows[index][dateColumnIndex];
+ const value = rows[index][metricColumnIndex];
+ if (!isEmpty(value) && !isEmpty(date)) {
+ return index;
+ }
+ }
+ return -1;
+}
+
+export type PreviousPeriodChange = {
+ percent: number;
+ description: string;
+};
+
+export function computePreviousPeriodChange(
+ rows: RowValues[],
+ dateColumnIndex: number,
+ metricColumnIndex: number,
+ latestRowIndex: number,
+ currentValue: unknown,
+ dateUnit: string | undefined,
+): PreviousPeriodChange | undefined {
+ const previousRowIndex = findPreviousNonEmptyRowIndex(
+ rows,
+ dateColumnIndex,
+ metricColumnIndex,
+ latestRowIndex,
+ );
+
+ if (previousRowIndex === -1) {
+ return undefined;
+ }
+
+ const previousValue = rows[previousRowIndex][metricColumnIndex];
+ if (isEmpty(previousValue) || typeof previousValue !== "number") {
+ return undefined;
+ }
+
+ if (typeof currentValue !== "number") {
+ return undefined;
+ }
+
+ const percent = computeChange(previousValue, currentValue);
+ if (!isFinite(percent)) {
+ return undefined;
+ }
+
+ const description =
+ dateUnit && isAbsoluteDateTimeUnit(dateUnit)
+ ? t`compared to ${formatPreviousPeriodOptionName(dateUnit).toLocaleLowerCase()}`
+ : t`compared to previous value`;
+
+ return { percent, description };
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
index d2b41b08a25..0b8e721ec47 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/compute.ts
@@ -1,6 +1,5 @@
import dayjs from "dayjs";
import { t } from "ttag";
-import _ from "underscore";
import { formatValue } from "metabase/lib/formatting";
import { formatDateTimeRangeWithUnit } from "metabase/lib/formatting/date";
@@ -9,6 +8,7 @@ import { isNumber } from "metabase/lib/types";
import { isEmpty } from "metabase/lib/validate";
import type { ColorGetter } from "metabase/ui/colors/types";
import { computeChange } from "metabase/visualizations/lib/numeric";
+import { findPreviousNonEmptyRowIndex } from "metabase/visualizations/lib/trend-helpers";
import type { ColumnSettings } from "metabase/visualizations/types";
import { COMPARISON_TYPES } from "metabase/visualizations/visualizations/SmartScalar/constants";
import {
@@ -272,12 +272,12 @@ function getCurrentMetricData({
}
// get latest value and date
- const latestRowIndex = _.findLastIndex(rows, (row) => {
- const date = row[dimensionColIndex];
- const value = row[metricColIndex];
-
- return !isEmpty(value) && !isEmpty(date);
- });
+ const latestRowIndex = findPreviousNonEmptyRowIndex(
+ rows,
+ dimensionColIndex,
+ metricColIndex,
+ rows.length,
+ );
if (latestRowIndex === -1) {
throw Error("No rows contain a valid value.");
}
@@ -430,16 +430,12 @@ function computeComparisonPreviousValue({
nextDate: string | undefined;
dateUnitSettings: DateUnitSettings;
}) {
- const previousRowIndex = _.findLastIndex(rows, (row, i) => {
- if (i >= nextValueRowIndex) {
- return false;
- }
-
- const date = row[dimensionColIndex];
- const value = row[metricColIndex];
-
- return !isEmpty(value) && !isEmpty(date);
- });
+ const previousRowIndex = findPreviousNonEmptyRowIndex(
+ rows,
+ dimensionColIndex,
+ metricColIndex,
+ nextValueRowIndex,
+ );
// if no row exists with non-null date and non-null value
if (previousRowIndex === -1) {