The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
table measures (#66576)
Aleksandr Lesnenko8cbc058a0c70
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 292ee757207..e2de3c73d23 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -737,6 +737,7 @@metabase.lib.schema.joinmetabase.lib.schema.literalmetabase.lib.schema.mbql-clause+ metabase.lib.schema.measuremetabase.lib.schema.metadatametabase.lib.schema.metadata.fingerprintmetabase.lib.schema.middleware-options@@ -790,6 +791,19 @@settingsutil}}+ measures+ {:team "Querying"+ :api #{metabase.measures.api}+ :uses #{api+ events+ legacy-mbql+ lib+ lib-be+ models+ permissions+ search+ util}}+model-persistence{:team "Querying":api #{metabase.model-persistence.api@@ -1254,7 +1268,6 @@metabase.segments.schema}:uses #{apievents- legacy-mbqlliblib-bemodelsdiff --git a/e2e/support/helpers/e2e-data-studio-helpers.ts b/e2e/support/helpers/e2e-data-studio-helpers.tsindex 9c9d1e0a1b3..a477b00ca65 100644--- a/e2e/support/helpers/e2e-data-studio-helpers.ts+++ b/e2e/support/helpers/e2e-data-studio-helpers.ts@@ -1,4 +1,4 @@-import type { SegmentId, TableId } from "metabase-types/api";+import type { MeasureId, SegmentId, TableId } from "metabase-types/api";import { codeMirrorHelpers } from "./e2e-codemirror-helpers";import { popover } from "./e2e-ui-elements-helpers";@@ -68,12 +68,14 @@ export const DataStudio = {fieldsPage: () => cy.findByTestId("table-fields-page"),dependenciesPage: () => cy.findByTestId("table-dependencies-page"),segmentsPage: () => cy.findByTestId("table-segments-page"),+ measuresPage: () => cy.findByTestId("table-measures-page"),header: () => cy.findByTestId("table-pane-header"),nameInput: () => cy.findByTestId("table-name-input"),moreMenu: () => DataStudio.Tables.header().icon("ellipsis"),overviewTab: () => DataStudio.Tables.header().findByText("Overview"),fieldsTab: () => DataStudio.Tables.header().findByText("Fields"),segmentsTab: () => DataStudio.Tables.header().findByText("Segments"),+ measuresTab: () => DataStudio.Tables.header().findByText("Measures"),dependenciesTab: () =>DataStudio.Tables.header().findByText("Dependencies"),visitOverviewPage: (tableId: TableId) =>@@ -86,6 +88,12 @@ export const DataStudio = {cy.visit(`/data-studio/library/tables/${tableId}/segments/${segmentId}`),visitNewSegmentPage: (tableId: TableId) =>cy.visit(`/data-studio/library/tables/${tableId}/segments/new`),+ visitMeasuresPage: (tableId: TableId) =>+ cy.visit(`/data-studio/library/tables/${tableId}/measures`),+ visitMeasurePage: (tableId: TableId, measureId: MeasureId) =>+ cy.visit(`/data-studio/library/tables/${tableId}/measures/${measureId}`),+ visitNewMeasurePage: (tableId: TableId) =>+ cy.visit(`/data-studio/library/tables/${tableId}/measures/new`),moreMenuViewTable: () =>popover().findByRole("menuitem", { name: /View/ })diff --git a/e2e/support/helpers/e2e-datamodel-helpers.ts b/e2e/support/helpers/e2e-datamodel-helpers.tsindex 1d678f87be6..bf4c26cc47a 100644--- a/e2e/support/helpers/e2e-datamodel-helpers.ts+++ b/e2e/support/helpers/e2e-datamodel-helpers.ts@@ -9,6 +9,7 @@ export const DataModel = {visit,visitDataStudio,visitDataStudioSegments,+ visitDataStudioMeasures,get: getDataModel,TablePicker: {get: getTablePicker,@@ -94,6 +95,30 @@ export const DataModel = {SegmentRevisionHistory: {get: getSegmentRevisionHistory,},+ MeasureList: {+ get: getMeasureList,+ getEmptyState: getMeasureListEmptyState,+ getNewMeasureLink: getMeasureListNewLink,+ getMeasure: getMeasureListItem,+ getMeasures: getMeasureListItems,+ },+ MeasureEditor: {+ get: getMeasureEditor,+ getNameInput: getMeasureEditorNameInput,+ getDescriptionInput: getMeasureEditorDescriptionInput,+ getAggregationPlaceholder: getMeasureEditorAggregationPlaceholder,+ getPreviewLink: getMeasureEditorPreviewLink,+ getSaveButton: getMeasureEditorSaveButton,+ getCancelButton: getMeasureEditorCancelButton,+ getActionsButton: getMeasureEditorActionsButton,+ getBreadcrumb: getMeasureEditorBreadcrumb,+ getDefinitionTab: getMeasureEditorDefinitionTab,+ getRevisionHistoryTab: getMeasureEditorRevisionHistoryTab,+ getDependenciesTab: getMeasureEditorDependenciesTab,+ },+ MeasureRevisionHistory: {+ get: getMeasureRevisionHistory,+ },};const DEFAULT_BASE_PATH = "/admin/datamodel";@@ -547,3 +572,95 @@ function getSegmentEditorDependenciesTab() {function getSegmentRevisionHistory() {return cy.findByTestId("segment-revision-history-page");}++/** measure list helpers */++function visitDataStudioMeasures(options: {+ databaseId: DatabaseId;+ schemaId: SchemaId;+ tableId: TableId;+}) {+ cy.intercept("GET", "/api/table/*/query_metadata*").as(+ "datamodel/visit/metadata",+ );+ cy.visit(+ `/data-studio/data/database/${options.databaseId}/schema/${options.schemaId}/table/${options.tableId}/measures`,+ );+ cy.wait("@datamodel/visit/metadata");+}++function getMeasureList() {+ return cy.findByTestId("table-measures-page");+}++function getMeasureListEmptyState() {+ return getMeasureList().findByText("No measures yet");+}++function getMeasureListNewLink() {+ return getMeasureList().findByRole("link", { name: /New measure/i });+}++function getMeasureListItem(name: string) {+ return getMeasureList().findByRole("listitem", { name });+}++function getMeasureListItems() {+ return getMeasureList().findAllByRole("listitem");+}++/** measure editor helpers */++function getMeasureEditor() {+ return cy.get(+ "[data-testid='new-measure-page'], [data-testid='measure-detail-page']",+ );+}++function getMeasureEditorNameInput() {+ return getMeasureEditor().findByPlaceholderText("New measure");+}++function getMeasureEditorDescriptionInput() {+ return getMeasureEditor().findByLabelText("Give it a description");+}++function getMeasureEditorAggregationPlaceholder() {+ return getMeasureEditor().findByText("Pick an aggregation function");+}++function getMeasureEditorPreviewLink() {+ return getMeasureEditor().findByRole("link", { name: /Preview/i });+}++function getMeasureEditorSaveButton() {+ return getMeasureEditor().button("Save");+}++function getMeasureEditorCancelButton() {+ return getMeasureEditor().button("Cancel");+}++function getMeasureEditorActionsButton() {+ return cy.findByLabelText("Measure actions");+}++function getMeasureEditorBreadcrumb(tableName: string) {+ return cy.findByText(tableName);+}++function getMeasureEditorDefinitionTab() {+ return cy.findByTestId("measure-pane-header").findByText("Definition");+}++function getMeasureEditorRevisionHistoryTab() {+ return cy.findByTestId("measure-pane-header").findByText("Revision history");+}++function getMeasureEditorDependenciesTab() {+ return cy.findByTestId("measure-pane-header").findByText("Dependencies");+}++function getMeasureRevisionHistory() {+ return cy.findByTestId("measure-revision-history-page");+}diff --git a/e2e/support/helpers/e2e-table-metadata-helpers.js b/e2e/support/helpers/e2e-table-metadata-helpers.jsindex 35fe112117e..d10a5921bea 100644--- a/e2e/support/helpers/e2e-table-metadata-helpers.js+++ b/e2e/support/helpers/e2e-table-metadata-helpers.js@@ -19,3 +19,49 @@ export const createSegment = ({definition,});};++/**+ * @param {object} measure+ * @param {string} measure.name+ * @param {TableId} measure.table_id+ * @param {string|null} [measure.description]+ * @param {object} measure.definition+ */+export const createMeasure = ({+ name,+ table_id,+ definition,+ description = null,+}) => {+ cy.log(`Create a measure: ${name}`);+ return cy.request("POST", "/api/measure", {+ name,+ description,+ table_id,+ definition,+ });+};++/**+ * @param {object} measure+ * @param {MeasureId} measure.id+ * @param {string} [measure.name]+ * @param {TableId} [measure.table_id]+ * @param {string|null} [measure.description]+ * @param {object} [measure.definition]+ * @param {object} [options]+ * @param {string|null} [options.revision_message]+ */+export const updateMeasure = (+ { id, name, table_id, definition, description = null },+ { revision_message = "Update measure" } = {},+) => {+ cy.log(`Update a measure: ${id}`);+ return cy.request("PUT", `/api/measure/${id}`, {+ name,+ description,+ table_id,+ definition,+ revision_message,+ });+};diff --git a/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js b/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.jsindex 9f50e73a248..87d5c3609fc 100644--- a/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js+++ b/e2e/test/scenarios/custom-column/custom-column-reproductions.cy.spec.js@@ -2451,7 +2451,7 @@ describe("issue 61010", () => {H.CustomExpressionEditor.clear().type("[New count]");H.popover()- .findByText("Unknown Aggregation or Metric: New count")+ .findByText("Unknown Aggregation, Measure or Metric: New count").should("be.visible");});});diff --git a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.tsindex 9c2bddf9719..83d220a5ce2 100644--- a/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/segments-data-studio.cy.spec.ts@@ -14,7 +14,6 @@ describe("scenarios > data studio > data model > segments", () => {cy.intercept("POST", "/api/segment").as("createSegment");cy.intercept("PUT", "/api/segment/*").as("updateSegment");- cy.intercept("DELETE", "/api/segment/*").as("deleteSegment");cy.intercept("GET", "/api/table/*/query_metadata*").as("metadata");});@@ -219,7 +218,7 @@ describe("scenarios > data studio > data model > segments", () => {SegmentEditor.getActionsButton().click();H.popover().findByText("Remove segment").click();H.modal().button("Remove").click();- cy.wait("@deleteSegment");+ cy.wait("@updateSegment");cy.log("verify redirect to list and removal");H.undoToast().should("contain.text", "Segment removed");@@ -573,12 +572,15 @@ describe("scenarios > data studio > data model > segments", () => {cy.findByText(/created this segment/i).scrollIntoView().should("be.visible");- cy.findByText(/made multiple changes/i)+ cy.findByText(/changed the filter definition/i).scrollIntoView().should("be.visible");cy.findByText(/updated the description/i).scrollIntoView().should("be.visible");+ cy.findByText(/renamed the segment/i)+ .scrollIntoView()+ .should("be.visible");});});});diff --git a/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.tsnew file mode 100644index 00000000000..6e71bd28461--- /dev/null+++ b/e2e/test/scenarios/data-studio/measures/measures-data-studio.cy.spec.ts@@ -0,0 +1,473 @@+import { SAMPLE_DB_ID, SAMPLE_DB_SCHEMA_ID } from "e2e/support/cypress_data";+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";++const { H } = cy;+const { MeasureList, MeasureEditor, MeasureRevisionHistory } = H.DataModel;+const { ORDERS, ORDERS_ID, PRODUCTS_ID } = SAMPLE_DATABASE;++describe("scenarios > data studio > data model > measures", () => {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();+ H.activateToken("bleeding-edge");++ cy.intercept("POST", "/api/measure").as("createMeasure");+ cy.intercept("PUT", "/api/measure/*").as("updateMeasure");+ cy.intercept("GET", "/api/table/*/query_metadata*").as("metadata");+ });++ describe("Measure list", () => {+ it("should show empty state and navigation when no measures exist", () => {+ visitDataStudioMeasures(ORDERS_ID);++ cy.log("verify empty state");+ MeasureList.getEmptyState().scrollIntoView().should("be.visible");+ MeasureList.get()+ .findByText(+ "Create a measure to define a reusable aggregation for this table.",+ )+ .should("be.visible");++ cy.log("verify new measure link and navigation");+ MeasureList.getNewMeasureLink().scrollIntoView().click();++ cy.url().should("include", `${getMeasuresBaseUrl(ORDERS_ID)}/new`);+ });++ it("should display measures and allow navigation to edit page", () => {+ createTestMeasure({+ name: "Total Revenue",+ aggregation: ["sum", ["field", ORDERS.TOTAL, null]],+ });+ visitDataStudioMeasures(ORDERS_ID);++ cy.log("verify measure in list with aggregation description");+ MeasureList.getMeasure("Total Revenue")+ .scrollIntoView()+ .should("be.visible");+ MeasureList.get()+ .findByTestId("list-item-description")+ .should("contain", "Sum of Total");++ cy.log("navigate to edit page");+ MeasureList.getMeasure("Total Revenue").click();+ cy.get<number>("@measureId").then((measureId) => {+ cy.url().should(+ "include",+ `${getMeasuresBaseUrl(ORDERS_ID)}/${measureId}`,+ );+ });+ });++ it("should navigate between Fields and Measures tabs", () => {+ visitDataStudioTable(ORDERS_ID);++ cy.log("verify both tabs visible");+ cy.findByRole("tab", { name: /Fields/i }).scrollIntoView();+ cy.findByRole("tab", { name: /Measures/i }).should("be.visible");++ cy.log("navigate to measures tab");+ cy.findByRole("tab", { name: /Measures/i }).click();+ cy.url().should(+ "include",+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/measures`,+ );+ MeasureList.getEmptyState().scrollIntoView().should("be.visible");++ cy.log("verify tab selection preserved on refresh");+ cy.reload();+ cy.wait("@metadata");+ cy.findByRole("tab", { name: /Measures/i })+ .scrollIntoView()+ .should("have.attr", "aria-selected", "true");++ cy.log("navigate back to fields tab");+ cy.findByRole("tab", { name: /Fields/i }).click();+ cy.url().should("include", "/field");+ });+ });++ describe("Measure creation", () => {+ it("should create a measure with aggregation and verify across features", () => {+ visitDataStudioMeasures(ORDERS_ID);++ cy.log("navigate to new measure page");+ MeasureList.getNewMeasureLink().scrollIntoView().click();++ cy.log("fill in measure name");+ MeasureEditor.getNameInput().type("Total Revenue");++ cy.log("add aggregation");+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Sum of ...").click();+ H.popover().findByText("Total").click();++ cy.log("verify aggregation was added");+ MeasureEditor.get()+ .findByText(/Sum of Total/i)+ .should("exist");++ cy.log("save measure");+ MeasureEditor.getSaveButton().click();+ cy.wait("@createMeasure");++ cy.log("verify redirect to edit page and toast");+ H.undoToast().should("contain.text", "Measure created");+ cy.url().should(+ "match",+ new RegExp(+ `${getMeasuresBaseUrl(ORDERS_ID).replace(/\//g, "\\/")}\/\\d+$`,+ ),+ );++ cy.log("verify measure in query builder");+ verifyMeasureInQueryBuilder("Total Revenue");+ });++ it("should add aggregation and show preview in menu", () => {+ visitDataStudioMeasures(PRODUCTS_ID);++ MeasureList.getNewMeasureLink().scrollIntoView().click();++ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Average of ...").click();+ H.popover().findByText("Price").click();++ cy.log("verify aggregation was added");+ MeasureEditor.get()+ .findByText(/Average of Price/i)+ .should("exist");++ cy.log("verify preview is available in menu");+ MeasureEditor.getActionsButton().click();+ H.popover().findByText("Preview").should("be.visible");+ });+ });++ describe("Measure editing", () => {+ it("should display and update existing measure", () => {+ createTestMeasure({+ name: "Test Measure",+ description: "Test description",+ });+ cy.get<number>("@measureId").then((measureId) => {+ visitDataModelMeasure(ORDERS_ID, measureId);+ });++ cy.log("verify existing data displayed");+ MeasureEditor.get()+ .findByDisplayValue("Test Measure")+ .should("be.visible");+ MeasureEditor.getDescriptionInput().should(+ "have.value",+ "Test description",+ );++ cy.log("update measure name (saves immediately on blur/enter)");+ MeasureEditor.get()+ .findByDisplayValue("Test Measure")+ .click()+ .type(" Updated{enter}");+ cy.wait("@updateMeasure");++ cy.log("verify toast for name update");+ H.undoToast().should("contain.text", "Measure name updated");++ cy.log("update description");+ MeasureEditor.getDescriptionInput().clear().type("Updated description");+ MeasureEditor.getSaveButton().click();+ cy.wait("@updateMeasure");++ cy.log("verify updated measure in query builder");+ verifyMeasureInQueryBuilder("Test Measure Updated");+ });++ it("should navigate back to measures tab via breadcrumb", () => {+ createTestMeasure({ name: "Breadcrumb Test Measure" });+ cy.get<number>("@measureId").then((measureId) => {+ visitDataModelMeasure(ORDERS_ID, measureId);+ });++ MeasureEditor.getBreadcrumb("Orders").click();++ cy.url().should(+ "include",+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/measures`,+ );+ cy.findByRole("tab", { name: /Measures/i })+ .scrollIntoView()+ .should("have.attr", "aria-selected", "true");+ });+ });++ describe("Measure deletion", () => {+ it("should remove measure via more menu", () => {+ createTestMeasure({ name: "Measure to Delete" });+ cy.get<number>("@measureId").then((measureId) => {+ visitDataModelMeasure(ORDERS_ID, measureId);+ });++ cy.log("delete via more menu");+ MeasureEditor.getActionsButton().click();+ H.popover().findByText("Remove measure").click();+ H.modal().button("Remove").click();+ cy.wait("@updateMeasure");++ cy.log("verify redirect to list and removal");+ H.undoToast().should("contain.text", "Measure removed");+ cy.url().should(+ "include",+ `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${ORDERS_ID}/measures`,+ );+ MeasureList.get()+ .findByText("Measure to Delete", { timeout: 1000 })+ .should("not.exist");++ cy.log("verify measure removed from query builder");+ verifyMeasureNotInQueryBuilder("Total Revenue");+ });+ });++ describe("Unsaved changes", () => {+ it("should show leave confirmation with unsaved changes", () => {+ visitDataStudioMeasures(ORDERS_ID);++ MeasureList.getNewMeasureLink().scrollIntoView().click();+ MeasureEditor.getNameInput().type("Unsaved Measure");++ cy.log("attempt to navigate away");+ MeasureEditor.getBreadcrumb("Orders").click();++ cy.log("verify confirmation modal");+ H.modal().within(() => {+ cy.findByText("Discard your changes?").should("be.visible");+ cy.button("Cancel").click();+ });++ cy.log("verify still on editor");+ MeasureEditor.get().findByText("Unsaved Measure").should("be.visible");+ });+ });++ describe("Measure with implicit joins", () => {+ it("should create a measure with implicit join aggregation", () => {+ visitDataStudioMeasures(ORDERS_ID);++ cy.log("navigate to new measure page");+ MeasureList.getNewMeasureLink().scrollIntoView().click();++ cy.log("fill in measure name");+ MeasureEditor.getNameInput().type("Average Product Price");++ cy.log("add aggregation via implicit join");+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Average of ...").click();+ H.popover().within(() => {+ cy.findByText("Product").click();+ cy.findByText("Price").click();+ });++ cy.log("verify aggregation was added and save");+ MeasureEditor.get()+ .findByText(/Average of Product → Price/i)+ .should("exist");+ MeasureEditor.getSaveButton().click();+ cy.wait("@createMeasure");++ cy.log("verify redirected to edit page with measure name");+ MeasureEditor.get().should("be.visible");+ MeasureEditor.get()+ .findByDisplayValue("Average Product Price")+ .should("be.visible");++ cy.log("verify measure works in query builder");+ verifyMeasureInQueryBuilder("Average Product Price");+ });+ });++ describe("Revision history", () => {+ it("should display revision history with changes to name, description, and aggregation", () => {+ createTestMeasure({+ name: "Original Name",+ description: "Original description",+ aggregation: ["count"],+ });+ cy.get<number>("@measureId").then((measureId) => {+ // Fetch the measure to get the current pMBQL definition+ cy.request("GET", `/api/measure/${measureId}`).then(({ body }) => {+ const currentDefinition = body.definition;++ cy.log("update measure name");+ cy.request("PUT", `/api/measure/${measureId}`, {+ name: "Updated Name",+ description: "Original description",+ revision_message: "Updated from Data Studio",+ definition: currentDefinition,+ });++ cy.log("update measure description");+ cy.request("PUT", `/api/measure/${measureId}`, {+ name: "Updated Name",+ description: "Updated description",+ revision_message: "Updated from Data Studio",+ definition: currentDefinition,+ });++ cy.log("update measure aggregation");+ // Update aggregation in the pMBQL definition+ const updatedDefinition = {+ ...currentDefinition,+ stages: [+ {+ ...currentDefinition.stages[0],+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ ],+ };+ cy.request("PUT", `/api/measure/${measureId}`, {+ name: "Updated Name",+ description: "Updated description",+ revision_message: "Updated from Data Studio",+ definition: updatedDefinition,+ });++ cy.wait(1000);++ visitDataModelMeasure(ORDERS_ID, measureId);+ });+ });++ cy.log("navigate to revision history tab");+ MeasureEditor.getRevisionHistoryTab().click();++ cy.log("verify URL");+ cy.get<number>("@measureId").then((measureId) => {+ cy.url().should(+ "include",+ `${getMeasuresBaseUrl(ORDERS_ID)}/${measureId}/revisions`,+ );+ });++ cy.log("verify revision history entries");+ MeasureRevisionHistory.get().within(() => {+ cy.findByText(/created this measure/i)+ .scrollIntoView()+ .should("be.visible");+ cy.findByText(/renamed the measure/i)+ .scrollIntoView()+ .should("be.visible");+ cy.findByText(/changed the aggregation/i)+ .scrollIntoView()+ .should("be.visible");+ cy.findByText(/updated the description/i)+ .scrollIntoView()+ .should("be.visible");+ });+ });+ });++ describe("Dependencies", () => {+ it("should display dependency graph for a measure", () => {+ createTestMeasure({ name: "Dependencies Test Measure" });+ cy.get<number>("@measureId").then((measureId) => {+ visitDataModelMeasure(ORDERS_ID, measureId);+ });++ cy.log("navigate to dependencies tab");+ MeasureEditor.getDependenciesTab().click();++ cy.log("verify URL and dependency graph display");+ cy.get<number>("@measureId").then((measureId) => {+ cy.url().should(+ "include",+ `${getMeasuresBaseUrl(ORDERS_ID)}/${measureId}/dependencies`,+ );+ });+ H.DependencyGraph.graph().should("be.visible");+ H.DependencyGraph.graph()+ .findByText("Dependencies Test Measure")+ .should("be.visible");+ });+ });+});++function visitDataStudioTable(tableId: number) {+ H.DataModel.visitDataStudio({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId,+ });+}++function visitDataStudioMeasures(tableId: number) {+ H.DataModel.visitDataStudioMeasures({+ databaseId: SAMPLE_DB_ID,+ schemaId: SAMPLE_DB_SCHEMA_ID,+ tableId,+ });+}++function getMeasuresBaseUrl(tableId: number) {+ return `/data-studio/data/database/${SAMPLE_DB_ID}/schema/${SAMPLE_DB_SCHEMA_ID}/table/${tableId}/measures`;+}++function visitDataModelMeasure(tableId: number, measureId: number) {+ cy.visit(`${getMeasuresBaseUrl(tableId)}/${measureId}`);+}++function createTestMeasure(+ opts: {+ name?: string;+ description?: string;+ tableId?: number;+ aggregation?: unknown[];+ } = {},+) {+ const {+ name = "Test Measure",+ description,+ tableId = ORDERS_ID,+ aggregation = ["sum", ["field", ORDERS.TOTAL, null]],+ } = opts;++ H.createMeasure({+ name,+ description,+ table_id: tableId,+ definition: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": tableId,+ aggregation: [aggregation],+ },+ },+ }).then(({ body }) => {+ cy.wrap(body.id).as("measureId");+ });+}++function verifyMeasureInQueryBuilder(+ measureName: string,+ tableId: number = ORDERS_ID,+) {+ H.openTable({ table: tableId, mode: "notebook" });++ H.getNotebookStep("data").button("Summarize").click();+ H.popover().within(() => {+ cy.findByText("Measures").click();+ cy.findByText(measureName).click();+ });+ H.visualize();+ cy.findByTestId("scalar-value").should("be.visible");+}++function verifyMeasureNotInQueryBuilder(+ measureName: string,+ tableId: number = ORDERS_ID,+) {+ H.openTable({ table: tableId, mode: "notebook" });++ H.getNotebookStep("data").button("Summarize").click();+ H.popover().findByText(measureName).should("not.exist");+}diff --git a/e2e/test/scenarios/data-studio/measures/measures-published-tables.cy.spec.ts b/e2e/test/scenarios/data-studio/measures/measures-published-tables.cy.spec.tsnew file mode 100644index 00000000000..35f42b9aca7--- /dev/null+++ b/e2e/test/scenarios/data-studio/measures/measures-published-tables.cy.spec.ts@@ -0,0 +1,155 @@+import { SAMPLE_DB_ID } from "e2e/support/cypress_data";+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";++const { H } = cy;+const { MeasureList, MeasureEditor } = H.DataModel;+const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;++// Majority of the measures pages functionality is covered in the data-model/measures-data-studio.cy.spec.ts spec+// This spec is focused on the published tables measures pages functionality while doing some smoke tests+describe("scenarios > data studio > library > published tables > measures", () => {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();+ H.activateToken("bleeding-edge");+ H.createLibrary();+ H.publishTables({ table_ids: [ORDERS_ID] });++ cy.intercept("POST", "/api/measure").as("createMeasure");+ cy.intercept("PUT", "/api/measure/*").as("updateMeasure");+ });++ describe("Measure list", () => {+ it("should show empty state and navigate to new measure page", () => {+ H.DataStudio.Tables.visitMeasuresPage(ORDERS_ID);++ MeasureList.getEmptyState().scrollIntoView().should("be.visible");+ MeasureList.getNewMeasureLink().scrollIntoView().click();++ cy.url().should(+ "include",+ `/data-studio/library/tables/${ORDERS_ID}/measures/new`,+ );+ });++ it("should display measures and navigate to edit page", () => {+ createTestMeasure({ name: "Total Revenue" });+ H.DataStudio.Tables.visitMeasuresPage(ORDERS_ID);++ MeasureList.getMeasure("Total Revenue").click();++ cy.get<number>("@measureId").then((measureId) => {+ cy.url().should(+ "include",+ `/data-studio/library/tables/${ORDERS_ID}/measures/${measureId}`,+ );+ });+ });++ it("should navigate between Overview, Fields, and Measures tabs", () => {+ H.DataStudio.Tables.visitOverviewPage(ORDERS_ID);++ H.DataStudio.Tables.overviewTab().should("be.visible");+ H.DataStudio.Tables.fieldsTab().should("be.visible");+ H.DataStudio.Tables.measuresTab().should("be.visible");++ H.DataStudio.Tables.measuresTab().click();+ cy.url().should(+ "include",+ `/data-studio/library/tables/${ORDERS_ID}/measures`,+ );++ H.DataStudio.Tables.overviewTab().click();+ cy.url().should("include", `/data-studio/library/tables/${ORDERS_ID}`);+ cy.url().should("not.include", "/measures");+ });+ });++ describe("Measure creation", () => {+ it("should create a measure and redirect to edit page", () => {+ H.DataStudio.Tables.visitMeasuresPage(ORDERS_ID);+ MeasureList.getNewMeasureLink().click();++ MeasureEditor.getNameInput().type("Total Revenue");+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Sum of ...").click();+ H.popover().findByText("Total").click();++ MeasureEditor.getSaveButton().click();+ cy.wait("@createMeasure");++ H.undoToast().should("contain.text", "Measure created");+ cy.url().should(+ "match",+ new RegExp(`/data-studio/library/tables/${ORDERS_ID}/measures/\\d+$`),+ );+ });+ });++ describe("Breadcrumbs", () => {+ it("should display collection-based breadcrumbs", () => {+ createTestMeasure({ name: "Breadcrumb Test Measure" });+ cy.get<number>("@measureId").then((measureId) => {+ H.DataStudio.Tables.visitMeasurePage(ORDERS_ID, measureId);+ });++ MeasureEditor.get().findByText("Data").should("be.visible");+ });++ it("should navigate back to published table measures via breadcrumb", () => {+ createTestMeasure({ name: "Breadcrumb Nav Test" });+ cy.get<number>("@measureId").then((measureId) => {+ H.DataStudio.Tables.visitMeasurePage(ORDERS_ID, measureId);+ });++ MeasureEditor.getBreadcrumb("Orders").click();++ cy.url().should(+ "include",+ `/data-studio/library/tables/${ORDERS_ID}/measures`,+ );+ cy.url().should("not.match", /measures\/\d+/);+ });+ });++ describe("Measure deletion", () => {+ it("should redirect to published table measures list after deletion", () => {+ createTestMeasure({ name: "Measure to Delete" });+ cy.get<number>("@measureId").then((measureId) => {+ H.DataStudio.Tables.visitMeasurePage(ORDERS_ID, measureId);+ });++ MeasureEditor.getActionsButton().click();+ H.popover().findByText("Remove measure").click();+ H.modal().button("Remove").click();+ cy.wait("@updateMeasure");++ H.undoToast().should("contain.text", "Measure removed");+ cy.url().should(+ "include",+ `/data-studio/library/tables/${ORDERS_ID}/measures`,+ );+ cy.url().should("not.match", /measures\/\d+/);+ });+ });+});++function createTestMeasure(opts: { name?: string; description?: string } = {}) {+ const { name = "Test Measure", description } = opts;++ H.createMeasure({+ name,+ description,+ table_id: ORDERS_ID,+ definition: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ },+ }).then(({ body }) => {+ cy.wrap(body.id).as("measureId");+ });+}diff --git a/e2e/test/scenarios/data-studio/measures/measures-queries.cy.spec.ts b/e2e/test/scenarios/data-studio/measures/measures-queries.cy.spec.tsnew file mode 100644index 00000000000..25ae5e1f297--- /dev/null+++ b/e2e/test/scenarios/data-studio/measures/measures-queries.cy.spec.ts@@ -0,0 +1,907 @@+import { SAMPLE_DB_ID } from "e2e/support/cypress_data";+import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";+import { openNotebook } from "e2e/support/helpers";+import type { Measure, TableId } from "metabase-types/api";++const { H } = cy;+const { MeasureEditor } = H.DataModel;+const { ORDERS_ID, ORDERS, PRODUCTS } = SAMPLE_DATABASE;++const MEASURE_NAME = "Table Measure";++describe("scenarios > data studio > measures > queries", () => {+ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();+ H.activateToken("bleeding-edge");+ });++ describe("measures queries", () => {+ it("should create a measure with an aggregation without columns", () => {+ startNewMeasure();++ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Count of rows").click();++ saveMeasure();+ useMeasureInAdhocQuestion();+ verifyScalarValue("18,760");+ });++ it("should create a measure with with a column from the main data source", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().within(() => {+ cy.findByText("Sum of ...").click();+ cy.findByText("Total").click();+ });+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("1,510,621.68");+ });++ it("should create a measure with with a column from the main data source using offset", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("Offset(Sum([Total]), -1)");+ H.CustomExpressionEditor.nameInput().type("Offset Measure");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");+ },+ });+ verifyRowValues([["April 2022"], ["May 2022", "52.76"]]);+ });++ it("should create a measure with a column from an implicit join", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().within(() => {+ cy.findByText("Average of ...").click();+ cy.findByText("Product").click();+ cy.findByText("Price").click();+ });+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("55.69");+ });++ it("should create a measure with a column from an implicit join using offset", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("Offset(Average([Product -> Price]), -1)");+ H.CustomExpressionEditor.nameInput().type("Offset Measure");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");+ },+ });+ verifyRowValues([["April 2022"], ["May 2022", "49.54"]]);+ });++ it("should create a measure with a custom aggregation expression", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type(+ "DistinctIf([Product → ID], [ID] > 1) + DistinctIf([ID], [Product → ID] > 1)",+ );+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("18,867");+ });++ it("should create a measure based on a segment", () => {+ H.createSegment({+ name: "TotalSegment",+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ filter: ["<", ["field", ORDERS.TOTAL, null], 100],+ },+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("CountIf([TotalSegment])");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("13,005");+ });++ it("should create a measure based on another measure with an identity expression", () => {+ H.createMeasure({+ name: "TotalMeasure",+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("[TotalMeasure]");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("1,510,621.68");+ });++ it("should create a measure based on another measure", () => {+ H.createMeasure({+ name: "TotalMeasure",+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("floor([TotalMeasure])");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("1,510,621");+ });++ it("should create a measure based on another measure with an identity expression", () => {+ H.createMeasure({+ name: "TotalMeasure",+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("[TotalMeasure]");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("1,510,621.68");+ });++ it("should not be possible to create a measure that references itself", () => {+ cy.log("create a new measure");+ H.DataStudio.Tables.visitNewMeasurePage(ORDERS_ID);++ MeasureEditor.getNameInput().type(MEASURE_NAME);+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Count of rows").click();++ MeasureEditor.getSaveButton().click();+ H.undoToast().should("contain.text", "Measure created");++ MeasureEditor.get().findByText("Count").click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.clear().type("[Table Measure]").blur();++ H.popover().button("Update").click();+ MeasureEditor.getSaveButton().click();++ H.undoToast().should("contain.text", "Failed to update measure");+ });++ it("should not be possible to create a measure that references a metric", () => {+ H.createQuestion({+ name: "OrdersCount",+ type: "metric",+ description: "A metric",+ query: {+ "source-table": ORDERS_ID,+ aggregation: [["count"]],+ },+ });++ H.DataStudio.Tables.visitNewMeasurePage(ORDERS_ID);+ MeasureEditor.getNameInput().type(MEASURE_NAME);+ MeasureEditor.getAggregationPlaceholder().click();++ H.popover().findByText("Metrics").should("not.exist");+ H.popover().findByText("Custom Expression").click();++ H.CustomExpressionEditor.type("[OrdersCount]").blur();+ H.popover()+ .findByText("Unknown Aggregation, Measure or Metric: OrdersCount")+ .should("be.visible");+ H.popover().button("Done").should("be.disabled");+ });++ it("should be possible to create measures with filters like CountIf", () => {+ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("CountIf([Total] > 10)");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("18,758");+ });++ it("should be possible to create measures with filters like CountIf based on segments", () => {+ H.createSegment({+ name: "LargeTotal",+ table_id: ORDERS_ID,+ definition: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ filter: [">", ["field", ORDERS.TOTAL, null], 10],+ },+ },+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("CountIf([LargeTotal])");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("18,758");+ });++ it("should be possible to create measures with filters like based on segments that are nested", () => {+ H.createSegment({+ name: "LargeTotal",+ table_id: ORDERS_ID,+ definition: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ filter: [">", ["field", ORDERS.TOTAL, null], 10],+ },+ },+ }).then(({ body: segment }) => {+ H.createSegment({+ name: "NestedSegment",+ table_id: ORDERS_ID,+ definition: {+ type: "query",+ database: SAMPLE_DB_ID,+ query: {+ "source-table": ORDERS_ID,+ filter: [+ "or",+ ["<", ["field", ORDERS.TOTAL, null], 5],+ ["segment", segment.id],+ ],+ },+ },+ });+ });++ startNewMeasure();+ MeasureEditor.getAggregationPlaceholder().click();+ H.popover().findByText("Custom Expression").click();+ H.CustomExpressionEditor.type("CountIf([NestedSegment])");+ H.CustomExpressionEditor.nameInput().type("Custom");+ H.popover().button("Done").click();+ saveMeasure();++ useMeasureInAdhocQuestion();+ verifyScalarValue("18,759");+ });++ it("should be possible to offset a measure in a query", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ H.getNotebookStep("summarize").findByText("Table Measure").click();+ H.CustomExpressionEditor.clear().type(+ `Offset([${MEASURE_NAME}], -1)`,+ );+ H.popover().button("Update").click();++ breakout("Created At");+ },+ });++ verifyRowValues([["April 2022"], ["May 2022", "52.76"]]);+ });+ });++ it("should be possible to order by an aggregation using a measure directly", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");++ H.sort();+ H.popover().findByText("Table Measure").click();+ H.getNotebookStep("sort").findByText("Table Measure").click();+ },+ });++ verifyRowValues([+ ["January 2026", "52,249.59"],+ ["January 2025", "51,634.16"],+ ]);+ });++ it("should be possible to order by an aggregation using a custom expression based on a measure", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ H.getNotebookStep("summarize").findByText("Table Measure").click();+ cy.log("Use weird formula to get different ordering in results");+ H.CustomExpressionEditor.clear().type(+ `length(text(log([${MEASURE_NAME}])))`,+ );+ H.popover().button("Update").click();++ breakout("Created At");++ H.sort();+ H.popover().findByText("Table Measure").click();+ },+ });++ verifyRowValues([+ ["August 2023", "16"],+ ["April 2026", "16"],+ ["May 2022", "17"],+ ]);+ });++ describe("follow up stages", () => {+ it("should be possible to use results of a measure in follow up stages", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");++ H.getNotebookStep("summarize").button("Filter").click();+ H.popover().within(() => {+ cy.findByText(MEASURE_NAME).click();+ cy.findByPlaceholderText("Min").type("100");+ cy.button("Add filter").click();+ });++ H.getNotebookStep("summarize").button("Custom column").click();+ H.enterCustomColumnDetails({+ formula: `floor([${MEASURE_NAME}] * 2)`,+ name: "Double measure",+ clickDone: true,+ });++ H.getNotebookStep("filter", { stage: 1 })+ .findByText("Summarize")+ .click();+ H.popover().within(() => {+ cy.findByText("Minimum of ...").click();+ cy.findByText("Double measure").click();+ });+ },+ });+ verifyScalarValue("2,531");+ });++ it("should be possible to join on a measure in a follow up stage", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");++ H.getNotebookStep("summarize").button("Join data").click();+ H.popover().within(() => {+ cy.findByText("Sample Database").click();+ cy.findByText("Orders").click();+ });++ H.popover().findByText("Table Measure").click();+ H.popover().findByText("Total").click();+ },+ });++ verifyRowValues([["April 2022", "52.76", "8685"]]);+ });+ });++ it("should be possible to join on a measure in a follow up stage with a custom expression", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });+ useMeasureInAdhocQuestion({+ customizeQuery() {+ breakout("Created At");++ H.getNotebookStep("summarize").button("Join data").click();+ H.popover().within(() => {+ cy.findByText("Sample Database").click();+ cy.findByText("Orders").click();+ });++ H.popover().findByText("Custom Expression").click();++ H.CustomExpressionEditor.clear()+ .type("floor([Table Measure]/10)")+ .blur();+ H.popover().findByText("Done").click();++ H.popover().findByText("ID").click();+ },+ });++ verifyRowValues([["April 2022", "52.76", "5", "1"]]);+ });++ describe("measure refs", () => {+ it("should be possible to rename a measure without breaking queries that reference it", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ }).then(({ body: measure }) => {+ useMeasureInAdhocQuestion();++ H.updateMeasure({+ id: measure.id,+ name: "Renamed measure",+ });++ cy.reload();+ verifyScalarValue("1,510,621.68");+ });+ });++ it("should be possible to rename an aggregation expression based on a measure without breaking it", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ useMeasureInAdhocQuestion({+ customizeQuery() {+ H.getNotebookStep("summarize").findByText("Table Measure").click();+ H.CustomExpressionEditor.nameInput()+ .clear()+ .type("Renamed aggregation");+ H.popover().button("Update").click();+ },+ });++ verifyScalarValue("1,510,621.68");+ });++ it("changing the top-level aggregation expression in a measure might break queries that reference it in follow up stages", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["count"]],+ },+ }).then(({ body: measure }) => {+ H.createQuestion({+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "day" }],+ ],+ },+ }).then(({ body: question }) => {+ cy.log("Add a second stage that references the measure");+ H.visitQuestion(question.id);+ openNotebook();+ H.getNotebookStep("summarize").findByText("Filter").click();+ H.popover().within(() => {+ cy.findByText(MEASURE_NAME).click();+ cy.findByPlaceholderText("Min").type("10");+ cy.button("Add filter").click();+ });++ cy.findByTestId("qb-header").button("Save").click();+ H.modal().within(() => {+ cy.log("Ensure that 'Replace original question' is checked");+ cy.findByLabelText(/Replace original question/i).should(+ "be.checked",+ );+ cy.button("Save").click();+ });++ H.updateMeasure({+ id: measure.id,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ });++ cy.log("Add a second stage that references the measure");+ H.visitQuestion(question.id);+ cy.findByTestId("query-builder-main")+ .findByText("There was a problem with your question")+ .should("be.visible");+ });+ });+ });+ });++ it("should be possible to use a measure in a pivot table", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ }).then(({ body: measure }) => {+ H.createQuestion(+ {+ name: "Question with measure",+ display: "pivot",+ visualization_settings: {+ "table.pivot_column": "Created At: Week",+ "table.cell_column": "Table Measure",+ },+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "year" }],+ [+ "field",+ PRODUCTS.CATEGORY,+ { "base-type": "type/Text", "source-field": ORDERS.PRODUCT_ID },+ ],+ ],+ },+ },+ { visitQuestion: true },+ );+ });++ cy.findByTestId("pivot-table").within(() => {+ cy.findByText("Row totals").should("be.visible");+ cy.findByText("Grand totals").should("be.visible");+ cy.findAllByTestId("pivot-table-cell")+ .should("have.length", 42)+ .eq(12) // a random cell+ .should("have.text", "9,031.56");+ });+ });++ describe("using measures in saved questions", () => {+ it("should be possible to use measure results in a saved question as source for a follow up question", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ }).then(({ body: measure }) => {+ H.createQuestion({+ name: "Question with measure",+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "week" }],+ ],+ },+ }).then(({ body: question }) => {+ H.createQuestion(+ {+ query: {+ "source-table": `card__${question.id}`,+ },+ display: "scalar",+ },+ { visitQuestion: true },+ );+ });+ });++ H.openNotebook();++ H.filter({ mode: "notebook" });+ H.popover().within(() => {+ cy.findByText(MEASURE_NAME).click();+ cy.findByPlaceholderText("Min").type("100");+ cy.button("Add filter").click();+ });++ H.summarize({ mode: "notebook" });+ H.popover().findByText("Custom Expression").click();+ H.enterCustomColumnDetails({+ formula: `Sum([${MEASURE_NAME}])`,+ name: "Table Measure Sum",+ clickDone: true,+ });++ H.visualize();+ verifyScalarValue("1,510,568.93");+ });++ it("should be possible to use measure results in a saved question as source for a follow up model", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, null]]],+ },+ }).then(({ body: measure }) => {+ H.createQuestion({+ name: "Question with measure",+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "week" }],+ ],+ },+ }).then(({ body: question }) => {+ H.createQuestion(+ {+ type: "model",+ query: {+ "source-table": `card__${question.id}`,+ },+ display: "scalar",+ },+ { visitQuestion: true },+ );+ });+ });++ H.openQuestionActions("Edit query definition");++ H.filter({ mode: "notebook" });+ H.popover().within(() => {+ cy.findByText(MEASURE_NAME).click();+ cy.findByPlaceholderText("Min").type("100");+ cy.button("Add filter").click();+ });++ H.summarize({ mode: "notebook" });+ H.popover().findByText("Custom Expression").click();+ H.enterCustomColumnDetails({+ formula: `Sum([${MEASURE_NAME}])`,+ name: "Table Measure Sum",+ clickDone: true,+ });++ cy.findByTestId("dataset-edit-bar").button("Save changes").click();+ verifyScalarValue("1,510,568.93");+ });++ it("should be possible x-ray a question containing a measure", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["count"]],+ },+ })+ .then(({ body: measure }) => {+ H.createQuestion({+ name: "Test model",+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "day" }],+ ],+ },+ });+ })+ .then(({ body: model }) => {+ cy.visit(`/auto/dashboard/question/${model.id}`);++ H.main()+ .findByText("A look at the Table Measure")+ .should("be.visible");+ });+ });+ });++ describe("using measures in models", () => {+ it("should be possible x-ray a model containing a measure", () => {+ H.createMeasure({+ name: MEASURE_NAME,+ table_id: ORDERS_ID,+ definition: {+ "source-table": ORDERS_ID,+ aggregation: [["count"]],+ },+ })+ .then(({ body: measure }) => {+ H.createQuestion({+ type: "model",+ name: "Test model",+ query: {+ "source-table": ORDERS_ID,+ aggregation: [+ ["measure", { "display-name": measure.name }, measure.id],+ ],+ breakout: [+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "day" }],+ ],+ },+ });+ })+ .then(({ body: model }) => {+ cy.visit(`/auto/dashboard/model/${model.id}`);++ H.main()+ .findByText("A look at the Table Measure")+ .should("be.visible");+ });+ });+ });+});++function startNewMeasure({+ name = MEASURE_NAME,+ tableId = ORDERS_ID,+}: {+ name?: string;+ tableId?: TableId;+} = {}) {+ cy.log("create a new measure");+ H.DataStudio.Tables.visitNewMeasurePage(tableId);+ MeasureEditor.getNameInput().type(name);+}++function saveMeasure(): Cypress.Chainable<Measure> {+ cy.intercept("POST", "/api/measure").as("measureCreate");+ MeasureEditor.getSaveButton().click();++ return cy.wait("@measureCreate").then(({ response }) => {+ H.undoToast().should("contain.text", "Measure created");+ return cy.wrap(response?.body as Measure);+ });+}++function useMeasureInAdhocQuestion({+ measureName = MEASURE_NAME,+ tableId = ORDERS_ID,+ customizeQuery,+}: {+ measureName?: string;+ tableId?: TableId;+ customizeQuery?: () => void;+} = {}) {+ cy.log("verify the measure works in query builder");+ H.openTable({ table: tableId, mode: "notebook" });+ H.summarize({ mode: "notebook" });+ H.popover().findByText("Measures").click();+ H.popover().findByText(measureName).click();++ customizeQuery?.();++ H.visualize();+}++function breakout(columnName = "Created At") {+ H.getNotebookStep("summarize")+ .findByText("Pick a column to group by")+ .click();+ H.popover().findByText(columnName).click();+}++function verifyScalarValue(scalarValue: string) {+ H.queryBuilderMain()+ .findByTestId("scalar-value")+ .should("have.text", scalarValue);+ H.assertQueryBuilderRowCount(1);+}++// Custom implementation of H.assertTableData that allows for empty cells+function verifyRowValues(rowValues: string[][]) {+ cy.findByTestId("view-footer").within(() => {+ cy.findByLabelText("Switch to data").click(); // Switch to the tabular view...+ });++ rowValues.flat().forEach((value, index) => {+ H.tableInteractiveBody()+ .findAllByTestId("cell-data")+ .should("have.length.gt", rowValues.length)+ .eq(index)+ .should("have.text", value);+ });+}diff --git a/e2e/test/scenarios/data-studio/published-tables-segments.cy.spec.ts b/e2e/test/scenarios/data-studio/published-tables-segments.cy.spec.tsindex 7735a9c86fb..989bbb39608 100644--- a/e2e/test/scenarios/data-studio/published-tables-segments.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/published-tables-segments.cy.spec.ts@@ -16,7 +16,7 @@ describe("scenarios > data studio > library > published tables > segments", () =H.publishTables({ table_ids: [ORDERS_ID] });cy.intercept("POST", "/api/segment").as("createSegment");- cy.intercept("DELETE", "/api/segment/*").as("deleteSegment");+ cy.intercept("PUT", "/api/segment/*").as("updateSegment");});describe("Segment list", () => {@@ -126,7 +126,7 @@ describe("scenarios > data studio > library > published tables > segments", () =SegmentEditor.getActionsButton().click();H.popover().findByText("Remove segment").click();H.modal().button("Remove").click();- cy.wait("@deleteSegment");+ cy.wait("@updateSegment");H.undoToast().should("contain.text", "Segment removed");cy.url().should(diff --git a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.tsindex 730abbbca81..a21f7e97fa6 100644--- a/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts+++ b/e2e/test/scenarios/dependencies/dependency-graph.cy.spec.ts@@ -14,6 +14,7 @@ import type {DashboardId,DependencyId,DependencyType,+ MeasureId,NativeQuerySnippetId,SegmentId,TableId,@@ -29,6 +30,7 @@ const TRANSFORM_TABLE_NAME = "transform_table";const TRANSFORM_TABLE_DISPLAY_NAME = "Transform Table";const TABLE_BASED_QUESTION_NAME = "Table-based question";const TABLE_BASED_MODEL_NAME = "Table-based model";+const TABLE_BASED_MEASURE_NAME = "Table-based measure";const TABLE_BASED_METRIC_NAME = "Table-based metric";const TABLE_BASED_TRANSFORM_NAME = "Table-based transform";const CARD_BASED_QUESTION_NAME = "Card-based question";@@ -36,6 +38,11 @@ const CARD_BASED_MODEL_NAME = "Card-based model";const CARD_BASED_METRIC_NAME = "Card-based metric";const CARD_BASED_TRANSFORM_NAME = "Card-based transform";const CARD_BASED_SNIPPET_NAME = "Card-based snippet";+const MEASURE_BASED_QUESTION_NAME = "Measure-based question";+const MEASURE_BASED_MODEL_NAME = "Measure-based model";+const MEASURE_BASED_METRIC_NAME = "Measure-based metric";+const MEASURE_BASED_TRANSFORM_NAME = "Measure-based transform";+const MEASURE_BASED_MEASURE_NAME = "Measure-based measure";const METRIC_BASED_QUESTION_NAME = "Metric-based question";const METRIC_BASED_MODEL_NAME = "Metric-based model";const METRIC_BASED_METRIC_NAME = "Metric-based metric";@@ -48,6 +55,7 @@ const SNIPPET_BASED_SNIPPET_NAME = "Snippet-based snippet";const TABLE_BASED_SEGMENT_NAME = "Table-based segment";const SEGMENT_BASED_QUESTION_NAME = "Segment-based question";const SEGMENT_BASED_MODEL_NAME = "Segment-based model";+const SEGMENT_BASED_MEASURE_NAME = "Segment-based measure";const SEGMENT_BASED_METRIC_NAME = "Segment-based metric";const SEGMENT_BASED_SEGMENT_NAME = "Segment-based segment";const ROOT_COLLECTION_NAME = "Our analytics";@@ -266,6 +274,7 @@ describe("scenarios > dependencies > dependency graph", () => {createTableBasedMetric({ tableId });createTableBasedTransform({ tableName: TABLE_NAME });createTableBasedSegment({ tableId });+ createTableBasedMeasure({ tableId });visitGraphForEntity(tableId, "table");});verifyPanelNavigation({@@ -294,6 +303,11 @@ describe("scenarios > dependencies > dependency graph", () => {groupTitle: "1 segment",dependentItemTitle: TABLE_BASED_SEGMENT_NAME,});+ verifyPanelNavigation({+ itemTitle: TABLE_DISPLAY_NAME,+ groupTitle: "1 measure",+ dependentItemTitle: TABLE_BASED_MEASURE_NAME,+ });});it("should display dependencies for a segment and navigate to them", () => {@@ -301,6 +315,7 @@ describe("scenarios > dependencies > dependency graph", () => {createTableBasedSegment({ tableId }).then(({ body: segment }) => {createSegmentBasedQuestion({ tableId, segmentId: segment.id });createSegmentBasedModel({ tableId, segmentId: segment.id });+ createSegmentBaseMeasure({ tableId, segmentId: segment.id });createSegmentBasedMetric({ tableId, segmentId: segment.id });createSegmentBasedSegment({ tableId, segmentId: segment.id });visitGraphForEntity(segment.id, "segment");@@ -316,6 +331,11 @@ describe("scenarios > dependencies > dependency graph", () => {groupTitle: "1 model",dependentItemTitle: SEGMENT_BASED_MODEL_NAME,});+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_SEGMENT_NAME,+ groupTitle: "1 measure",+ dependentItemTitle: SEGMENT_BASED_MEASURE_NAME,+ });verifyPanelNavigation({itemTitle: TABLE_BASED_SEGMENT_NAME,groupTitle: "1 metric",@@ -404,6 +424,46 @@ describe("scenarios > dependencies > dependency graph", () => {});});+ it("should display dependencies for a model and navigate to them", () => {+ getScoreboardTableId().then((tableId) => {+ createTableBasedMeasure({ tableId }).then(({ body: measure }) => {+ createMeasureBasedQuestion({ tableId, measureId: measure.id });+ createMeasureBasedModel({ tableId, measureId: measure.id });+ createMeasureBasedMetric({ tableId, measureId: measure.id });+ createMeasureBasedTransform({ tableId, measureId: measure.id });+ createMeasureBasedMeasure({ tableId, measureId: measure.id });++ visitGraphForEntity(measure.id, "measure");+ });+ });++ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MEASURE_NAME,+ groupTitle: "1 question",+ dependentItemTitle: MEASURE_BASED_QUESTION_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MEASURE_NAME,+ groupTitle: "1 model",+ dependentItemTitle: MEASURE_BASED_MODEL_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MEASURE_NAME,+ groupTitle: "1 metric",+ dependentItemTitle: MEASURE_BASED_METRIC_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MEASURE_NAME,+ groupTitle: "1 transform",+ dependentItemTitle: MEASURE_BASED_TRANSFORM_NAME,+ });+ verifyPanelNavigation({+ itemTitle: TABLE_BASED_MEASURE_NAME,+ groupTitle: "1 measure",+ dependentItemTitle: MEASURE_BASED_MEASURE_NAME,+ });+ });+it("should display dependencies for a metric and navigate to them", () => {getScoreboardTableId().then((tableId) =>createTableBasedMetric({ tableId }).then(({ body: card }) => {@@ -1168,3 +1228,127 @@ function createDocumentWithTableBasedQuestion({},});}++function createTableBasedMeasure({ tableId }: { tableId: TableId }) {+ return H.createMeasure({+ name: TABLE_BASED_MEASURE_NAME,+ table_id: tableId,+ definition: {+ "source-table": tableId,+ aggregation: [["count"]],+ },+ });+}++function createSegmentBaseMeasure({+ tableId,+ segmentId,+}: {+ tableId: TableId;+ segmentId: SegmentId;+}) {+ return H.createMeasure({+ name: SEGMENT_BASED_MEASURE_NAME,+ table_id: tableId,+ definition: {+ "source-table": tableId,+ aggregation: [["count-where", ["segment", segmentId]]],+ },+ });+}++function createMeasureBasedQuestion({+ tableId,+ measureId,+}: {+ tableId: TableId;+ measureId: MeasureId;+}) {+ return H.createQuestion({+ name: MEASURE_BASED_QUESTION_NAME,+ query: {+ "source-table": tableId,+ aggregation: [["measure", measureId]],+ },+ });+}++function createMeasureBasedModel({+ tableId,+ measureId,+}: {+ tableId: TableId;+ measureId: MeasureId;+}) {+ return H.createQuestion({+ name: MEASURE_BASED_MODEL_NAME,+ type: "model",+ query: {+ "source-table": tableId,+ aggregation: [["measure", measureId]],+ },+ });+}++function createMeasureBasedMetric({+ tableId,+ measureId,+}: {+ tableId: TableId;+ measureId: MeasureId;+}) {+ return H.createQuestion({+ name: MEASURE_BASED_METRIC_NAME,+ type: "metric",+ query: {+ "source-table": tableId,+ aggregation: [["measure", measureId]],+ },+ });+}++function createMeasureBasedTransform({+ tableId,+ measureId,+}: {+ tableId: TableId;+ measureId: MeasureId;+}) {+ return H.createTransform({+ name: MEASURE_BASED_TRANSFORM_NAME,+ source: {+ type: "query",+ query: {+ database: WRITABLE_DB_ID,+ type: "query",+ query: {+ "source-table": tableId,+ aggregation: [["measure", measureId]],+ },+ },+ },+ target: {+ type: "table",+ database: WRITABLE_DB_ID,+ schema: "public",+ name: TRANSFORM_TABLE_NAME,+ },+ });+}++function createMeasureBasedMeasure({+ tableId,+ measureId,+}: {+ tableId: TableId;+ measureId: MeasureId;+}) {+ return H.createMeasure({+ name: MEASURE_BASED_MEASURE_NAME,+ table_id: tableId,+ definition: {+ "source-table": tableId,+ aggregation: ["+", 1, ["measure", measureId]],+ },+ });+}diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj b/enterprise/backend/src/metabase_enterprise/dependencies/api.cljindex cf5f04dae83..fa25b80b40a 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/api.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/api.clj@@ -163,7 +163,8 @@:created_at :creator:collection :collection_id]:sandbox [:table :table_id]- :segment [:name :description :created_at :creator :creator_id :table :table_id]})+ :segment [:name :description :created_at :creator :creator_id :table :table_id]+ :measure [:name :description :created_at :creator :creator_id :table :table_id]})(defn- format-subentity [entity](case (t2/model entity)@@ -187,7 +188,8 @@:dashboard :model/Dashboard:document :model/Document:sandbox :model/Sandbox- :segment :model/Segment})+ :segment :model/Segment+ :measure :model/Measure});; IMPORTANT: This map defines which fields to select when fetching entities for the dependency graph.;; These field lists MUST be kept in sync with the frontend type definitions in:@@ -210,7 +212,8 @@:source]:snippet [:id :name :description]:sandbox [:id :table_id]- :segment [:id :name :description :created_at :creator_id :table_id]})+ :segment [:id :name :description :created_at :creator_id :table_id]+ :measure [:id :name :description :created_at :creator_id :table_id]})(defn- visible-entities-filter-clause"Returns a HoneySQL WHERE clause for filtering dependency graph entities by user visibility.@@ -292,8 +295,8 @@[:= visibility-type-column nil]](:only :all) nil)]}]])- ;; Segment with table permissions and archived filtering- :model/Segment+ ;; Segment/Measure with table permissions and archived filtering+ (:model/Segment :model/Measure)(let [archived-column (keyword (name table-name) "archived")table-id-column (keyword (name table-name) "table_id")][:and@@ -301,7 +304,7 @@[:in entity-id-field {:select [:id]:from [table-name]:where [:and- ;; Check that user can see the table this segment belongs to+ ;; Check that user can see the table this entity belongs to[:in table-id-column{:select [:metabase_table.id]:from [:metabase_table]@@ -378,7 +381,8 @@(= entity-type :document) (-> (t2/hydrate :creator [:collection :is_personal])(->> (map collection.root/hydrate-root-collection)))(= entity-type :sandbox) (t2/hydrate [:table :db :fields])- (= entity-type :segment) (t2/hydrate :creator [:table :db]))+ (= entity-type :segment) (t2/hydrate :creator [:table :db])+ (= entity-type :measure) (t2/hydrate :creator [:table :db]))(mapv #(entity-value entity-type % usages)))))nodes-by-type)))diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.cljindex 61dc5f1bf7c..50ea6d4fd4d 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/calculation.clj@@ -14,6 +14,7 @@(mu/defn- upstream-deps:mbql-query :- ::deps.schema/upstream-deps[query :- ::lib.schema/query]{:card (or (lib/all-source-card-ids query) #{})+ :measure (or (lib/all-measure-ids query) #{}):segment (or (lib/all-segment-ids query) #{}):table (-> #{}(into (lib/all-source-table-ids query))@@ -138,3 +139,11 @@{:segment (or (lib/all-segment-ids definition) #{}):table (cond-> (into #{} (lib/all-implicitly-joined-table-ids definition))table_id (conj table_id))})++(mu/defn upstream-deps:measure :- ::deps.schema/upstream-deps+ "Given a measure, return its upstream dependencies (the table it aggregates, any measures it references, and any segments it references)"+ [{:keys [table_id definition] :as _measure}]+ {:measure (or (lib/all-measure-ids definition) #{})+ :segment (or (lib/all-segment-ids definition) #{})+ :table (cond-> (into #{} (lib/all-implicitly-joined-table-ids definition))+ table_id (conj table_id))})diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj b/enterprise/backend/src/metabase_enterprise/dependencies/events.cljindex a451db76611..23ec662a5da 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj@@ -247,3 +247,27 @@[_ {:keys [object]}](when (premium-features/has-feature? :dependencies)(t2/delete! :model/Dependency :from_entity_type :segment :from_entity_id (:id object))))++;; ### Measures+(derive ::measure-deps :metabase/event)+(derive :event/measure-create ::measure-deps)+(derive :event/measure-update ::measure-deps)++(methodical/defmethod events/publish-event! ::measure-deps+ [_ {:keys [object]}]+ (when (premium-features/has-feature? :dependencies)+ (t2/with-transaction [_conn]+ (models.dependency/replace-dependencies! :measure (:id object)+ (ignore-errors+ (deps.calculation/upstream-deps:measure object)))+ (when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)+ (t2/update! :model/Measure (:id object)+ {:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))++(derive ::measure-delete :metabase/event)+(derive :event/measure-delete ::measure-delete)++(methodical/defmethod events/publish-event! ::measure-delete+ [_ {:keys [object]}]+ (when (premium-features/has-feature? :dependencies)+ (t2/delete! :model/Dependency :from_entity_type :measure :from_entity_id (:id object))))diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj b/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.cljindex 90aad65c4d9..910df6ee1a5 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/task/backfill.clj@@ -39,7 +39,8 @@:model/Dashboard:model/Document:model/Sandbox- :model/Segment])+ :model/Segment+ :model/Measure]);; In-memory state for tracking failed entities;; Stores {:model/Type {id {:fail-count N :next-retry-timestamp M}}}diff --git a/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj b/enterprise/backend/src/metabase_enterprise/serialization/v2/models.cljindex 8316ff02fd7..90ec9cf9ed4 100644--- a/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj+++ b/enterprise/backend/src/metabase_enterprise/serialization/v2/models.clj@@ -6,6 +6,7 @@["Database""Field""FieldUserSettings"+ "Measure""Segment""Table""Channel"])diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.cljindex c43c690d376..4f3207a6f23 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/api_test.clj@@ -2,6 +2,7 @@(:require[clojure.test :refer :all][medley.core :as m]+ [metabase.events.core :as events][metabase.lib.core :as lib][metabase.lib.metadata :as lib.metadata][metabase.native-query-snippets.models.native-query-snippet.permissions :as snippet.perms]@@ -802,3 +803,210 @@(get-in card-node [:data :document])))(is (= (:id document)(get-in card-node [:data :document_id])))))))))))++(deftest graph-segment-root-test+ (testing "GET /api/ee/dependencies/graph with segment as root node"+ (mt/with-test-user :crowberto+ (mt/with-premium-features #{:dependencies}+ (let [products-id (mt/id :products)+ price-field-id (mt/id :products :price)]+ (mt/with-temp [:model/Segment {segment-id :id :as segment} {:name "High Value Products"+ :table_id products-id+ :definition {:filter [:> [:field price-field-id nil] 50]}}]+ (events/publish-event! :event/segment-create {:object segment :user-id (mt/user->id :crowberto)})+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id segment-id+ :type "segment")+ node-types (set (map :type (:nodes response)))]+ (testing "returns segment and table nodes"+ (is (contains? node-types "segment"))+ (is (contains? node-types "table")))+ (testing "segment node has correct data"+ (let [segment-node (first (filter #(= (:type %) "segment") (:nodes response)))]+ (is (= segment-id (:id segment-node))))))))))))++(deftest graph-segment-dependents-test+ (testing "GET /api/ee/dependencies/graph/dependents with segment"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Card :model/Dependency]+ (let [products-id (mt/id :products)+ price-field-id (mt/id :products :price)]+ (mt/with-temp [:model/Segment {segment-id :id :as segment} {:name "High Value Products"+ :table_id products-id+ :definition {:filter [:> [:field price-field-id nil] 50]}}+ :model/User user {:email "[email protected]"}]+ (mt/with-test-user :crowberto+ (events/publish-event! :event/segment-create {:object segment :user-id (mt/user->id :crowberto)}))+ (let [mp (mt/metadata-provider)+ products (lib.metadata/table mp products-id)+ query-with-segment (-> (lib/query mp products)+ (lib/filter (lib.metadata/segment mp segment-id)))+ card (card/create-card! (card-with-query "Card using segment" query-with-segment) user)+ response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph/dependents"+ :id segment-id+ :type "segment"+ :dependent_type "card"+ :dependent_card_type "question")]+ (testing "returns card that uses the segment"+ (is (= 1 (count response)))+ (is (= (:id card) (:id (first response))))))))))))++(deftest graph-measure-root-test+ (testing "GET /api/ee/dependencies/graph with measure as root node"+ (mt/with-test-user :crowberto+ (mt/with-premium-features #{:dependencies}+ (let [mp (mt/metadata-provider)+ products-id (mt/id :products)+ products (lib.metadata/table mp products-id)+ price (lib.metadata/field mp (mt/id :products :price))]+ (mt/with-temp [:model/Measure {measure-id :id :as measure} {:name "Total Price"+ :table_id products-id+ :definition (-> (lib/query mp products)+ (lib/aggregate (lib/sum price)))}]+ (events/publish-event! :event/measure-create {:object measure :user-id (mt/user->id :crowberto)})+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id measure-id+ :type "measure")+ node-types (set (map :type (:nodes response)))]+ (testing "returns measure and table nodes"+ (is (contains? node-types "measure"))+ (is (contains? node-types "table")))+ (testing "measure node has correct data"+ (let [measure-node (first (filter #(= (:type %) "measure") (:nodes response)))]+ (is (= measure-id (:id measure-node))))))))))))++(deftest graph-measure-with-measure-dependency-test+ (testing "GET /api/ee/dependencies/graph with measure depending on another measure"+ (mt/with-test-user :crowberto+ (mt/with-premium-features #{:dependencies}+ (let [mp (mt/metadata-provider)+ products-id (mt/id :products)+ products (lib.metadata/table mp products-id)+ price (lib.metadata/field mp (mt/id :products :price))+ rating (lib.metadata/field mp (mt/id :products :rating))]+ (mt/with-temp [:model/Measure {measure-a-id :id :as measure-a} {:name "Measure A"+ :table_id products-id+ :definition (-> (lib/query mp products)+ (lib/aggregate (lib/sum price)))}]+ (events/publish-event! :event/measure-create {:object measure-a :user-id (mt/user->id :crowberto)})+ (let [mp' (mt/metadata-provider)]+ (mt/with-temp [:model/Measure {measure-b-id :id :as measure-b} {:name "Measure B"+ :table_id products-id+ :definition (-> (lib/query mp' products)+ (lib/aggregate (lib/+ (lib.metadata/measure mp' measure-a-id)+ (lib/sum rating))))}]+ (events/publish-event! :event/measure-create {:object measure-b :user-id (mt/user->id :crowberto)})+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id measure-b-id+ :type "measure")+ node-ids (set (map :id (:nodes response)))+ node-types (set (map :type (:nodes response)))]+ (testing "returns both measures and table"+ (is (contains? node-ids measure-a-id))+ (is (contains? node-ids measure-b-id))+ (is (contains? node-types "table")))+ (testing "edges show measure-b depends on measure-a"+ (is (some #(and (= (:from_entity_type %) "measure")+ (= (:from_entity_id %) measure-b-id)+ (= (:to_entity_type %) "measure")+ (= (:to_entity_id %) measure-a-id))+ (:edges response)))))))))))))++(deftest graph-measure-dependents-test+ (testing "GET /api/ee/dependencies/graph/dependents with measure"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Card :model/Dependency]+ (let [mp (mt/metadata-provider)+ products-id (mt/id :products)+ products (lib.metadata/table mp products-id)+ price (lib.metadata/field mp (mt/id :products :price))]+ (mt/with-temp [:model/Measure {measure-id :id :as measure} {:name "Total Price"+ :table_id products-id+ :definition (-> (lib/query mp products)+ (lib/aggregate (lib/sum price)))}+ :model/User user {:email "[email protected]"}]+ (mt/with-test-user :crowberto+ (events/publish-event! :event/measure-create {:object measure :user-id (mt/user->id :crowberto)}))+ (let [mp' (mt/metadata-provider)+ query-with-measure (-> (lib/query mp' products)+ (lib/aggregate (lib.metadata/measure mp' measure-id)))+ card (card/create-card! (card-with-query "Card using measure" query-with-measure) user)+ response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph/dependents"+ :id measure-id+ :type "measure"+ :dependent_type "card"+ :dependent_card_type "question")]+ (testing "returns card that uses the measure"+ (is (= 1 (count response)))+ (is (= (:id card) (:id (first response))))))))))))++(deftest graph-archived-measure-in-chain-test+ (testing "GET /api/ee/dependencies/graph when a measure in the chain is archived"+ (mt/with-premium-features #{:dependencies}+ (mt/with-model-cleanup [:model/Measure]+ (let [mp (mt/metadata-provider)+ products-id (mt/id :products)+ products (lib.metadata/table mp products-id)+ price (lib.metadata/field mp (mt/id :products :price))+ ;; Create measure A (base measure) via API+ {measure-a-id :id} (mt/user-http-request :crowberto :post 200 "measure"+ {:name "Measure A"+ :table_id products-id+ :definition (-> (lib/query mp products)+ (lib/aggregate (lib/sum price)))})+ mp' (mt/metadata-provider)+ ;; Create measure B that depends on measure A+ {measure-b-id :id} (mt/user-http-request :crowberto :post 200 "measure"+ {:name "Measure B"+ :table_id products-id+ :definition (-> (lib/query mp' products)+ (lib/aggregate (lib/* (lib.metadata/measure mp' measure-a-id)+ 2)))})+ mp'' (mt/metadata-provider)+ ;; Create measure C that depends on measure B+ {measure-c-id :id} (mt/user-http-request :crowberto :post 200 "measure"+ {:name "Measure C"+ :table_id products-id+ :definition (-> (lib/query mp'' products)+ (lib/aggregate (lib/+ (lib.metadata/measure mp'' measure-b-id)+ 100)))})]+ (testing "before archiving, all three measures appear in the dependency graph"+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id measure-c-id+ :type "measure")+ node-ids (set (map :id (:nodes response)))+ edges (:edges response)]+ (is (contains? node-ids measure-a-id))+ (is (contains? node-ids measure-b-id))+ (is (contains? node-ids measure-c-id))+ (is (contains? node-ids products-id))+ ;; Verify the edge from B to A exists+ (is (some #(and (= (:from_entity_type %) "measure")+ (= (:from_entity_id %) measure-b-id)+ (= (:to_entity_type %) "measure")+ (= (:to_entity_id %) measure-a-id))+ edges)+ "Edge from B to A should exist")))+ ;; Archive measure B (the middle of the chain)+ (mt/user-http-request :crowberto :put 200 (str "measure/" measure-b-id)+ {:archived true :revision_message "Archive middle measure"})+ (testing "after archiving measure B, it and measure A are excluded (chain broken)"+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id measure-c-id+ :type "measure")+ node-ids (set (map :id (:nodes response)))]+ (is (contains? node-ids measure-c-id) "measure C should still appear")+ (is (not (contains? node-ids measure-b-id)) "archived measure B should be excluded")+ (is (not (contains? node-ids measure-a-id)) "measure A should be excluded (unreachable)")+ ;; products table still appears because measure C has a direct dependency on it+ (is (contains? node-ids products-id) "products table still appears (direct dep from C)")))+ (testing "with archived=true, the full chain is visible again"+ (let [response (mt/user-http-request :crowberto :get 200 "ee/dependencies/graph"+ :id measure-c-id+ :type "measure"+ :archived true)+ node-ids (set (map :id (:nodes response)))]+ (is (contains? node-ids measure-a-id) "measure A should appear with archived=true")+ (is (contains? node-ids measure-b-id) "measure B should appear with archived=true")+ (is (contains? node-ids measure-c-id) "measure C should appear")+ (is (contains? node-ids products-id) "products table should appear"))))))))diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.cljindex faec069bfb4..80997d6e006 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/calculation_test.clj@@ -18,10 +18,12 @@(lib/filter (lib/= product-category"Widget")))}](is (= {:card #{}+ :measure #{}:segment #{}:table #{products-id}}(calculation/upstream-deps:card prod-card)))(is (= {:card #{prod-card-id}+ :measure #{}:segment #{}:table #{}}(calculation/upstream-deps:card widget-card))))))@@ -36,10 +38,12 @@:model/Card joined-card {:dataset_query (-> (lib/query mp (lib.metadata/card mp products-card-id))(lib/join orders))}](is (= {:card #{}+ :measure #{}:segment #{}:table #{products-id}}(calculation/upstream-deps:card products-card)))(is (= {:card #{products-card-id}+ :measure #{}:segment #{}:table #{orders-id}}(calculation/upstream-deps:card joined-card))))))@@ -56,6 +60,7 @@user-name (lib.tu.notebook/find-col-with-spec base-query visible-cols "User" "Name")](mt/with-temp [:model/Card card {:dataset_query (lib/with-fields base-query [venue-name user-name])}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id users-id}}(calculation/upstream-deps:card card))))))@@ -70,6 +75,7 @@venue-name (lib.tu.notebook/find-col-with-spec base-query filterable-cols "Venue" "Name")](mt/with-temp [:model/Card card {:dataset_query (lib/filter base-query (lib/= venue-name "Bird's Nest"))}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:card card))))))@@ -84,6 +90,7 @@venue-name (lib.tu.notebook/find-col-with-spec base-query breakoutable-cols "Venue" "Name")](mt/with-temp [:model/Card card {:dataset_query (lib/breakout base-query venue-name)}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:card card))))))@@ -98,6 +105,7 @@venue-price (lib.tu.notebook/find-col-with-spec base-query visible-cols "Venue" "Price")](mt/with-temp [:model/Card card {:dataset_query (lib/aggregate base-query (lib/sum venue-price))}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:card card))))))@@ -112,6 +120,7 @@venue-name (lib.tu.notebook/find-col-with-spec base-query orderable-cols "Venue" "Name")](mt/with-temp [:model/Card card {:dataset_query (lib/order-by base-query venue-name)}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:card card))))))@@ -134,6 +143,7 @@:target {:schema "PUBLIC":name "test_output"}}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id users-id}}(calculation/upstream-deps:transform transform)))))))@@ -156,6 +166,7 @@:target {:schema "PUBLIC":name "test_output"}}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:transform transform)))))))@@ -177,6 +188,7 @@:target {:schema "PUBLIC":name "test_output"}}](is (= {:card #{}+ :measure #{}:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:transform transform)))))))@@ -207,6 +219,7 @@:values_source_type "card":values_source_config {:card_id category-values-card-id}}]}](is (= {:card #{}+ :measure #{}:segment #{}:table #{products-id}}(calculation/upstream-deps:card category-values-card)))@@ -438,8 +451,9 @@[:segment segment-a-id][:segment segment-b-id]]}}}](is (= {:card #{}- :table #{products-id}- :segment #{segment-a-id segment-b-id}}+ :measure #{}+ :segment #{segment-a-id segment-b-id}+ :table #{products-id}}(calculation/upstream-deps:card card)))))))(deftest ^:parallel upstream-deps-segment-with-multiple-segments-test@@ -472,3 +486,106 @@(is (= {:segment #{}:table #{checkins-id venues-id}}(calculation/upstream-deps:segment segment)))))))++(deftest upstream-deps-measure-test+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))]+ (testing "measure depending only on table"+ (mt/with-temp [:model/Measure measure {:name "Total Quantity"+ :table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (is (= {:measure #{} :segment #{} :table #{orders-id}}+ (calculation/upstream-deps:measure measure)))))++ (testing "measure depending on another measure"+ (mt/with-temp [:model/Measure {measure-a-id :id :as measure-a} {:name "Measure A"+ :table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (let [mp' (mt/metadata-provider)]+ (mt/with-temp [:model/Measure measure-b {:name "Measure B"+ :table_id orders-id+ :definition (-> (lib/query mp' orders)+ (lib/aggregate (lib/+ (lib.metadata/measure mp' measure-a-id) 100)))}]+ (testing "base measure depends only on table"+ (is (= {:measure #{} :segment #{} :table #{orders-id}}+ (calculation/upstream-deps:measure measure-a))))+ (testing "dependent measure depends on both table and measure"+ (is (= {:measure #{measure-a-id} :segment #{} :table #{orders-id}}+ (calculation/upstream-deps:measure measure-b))))))))))++(deftest upstream-deps-measure-with-multiple-measures-test+ (testing "Measure depending on multiple other measures tracks all dependencies"+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))+ total (lib.metadata/field mp (mt/id :orders :total))]+ (mt/with-temp [:model/Measure {measure-a-id :id} {:name "Measure A"+ :table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}+ :model/Measure {measure-b-id :id} {:name "Measure B"+ :table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum total)))}]+ (let [mp' (mt/metadata-provider)]+ (mt/with-temp [:model/Measure measure-c {:name "Measure C"+ :table_id orders-id+ :definition (-> (lib/query mp' orders)+ (lib/aggregate (lib/+ (lib.metadata/measure mp' measure-a-id)+ (lib.metadata/measure mp' measure-b-id))))}]+ (is (= {:measure #{measure-a-id measure-b-id} :segment #{} :table #{orders-id}}+ (calculation/upstream-deps:measure measure-c)))))))))++(deftest upstream-deps-measure-implicit-join-test+ (testing "Measure depending on implicitly joined field adds dep on that field's table"+ (let [mp (mt/metadata-provider)+ checkins-id (mt/id :checkins)+ venues-id (mt/id :venues)+ checkins (lib.metadata/table mp checkins-id)+ base-query (lib/query mp checkins)+ visible-cols (lib/visible-columns base-query)+ venue-price (lib.tu.notebook/find-col-with-spec base-query visible-cols "Venue" "Price")]+ (mt/with-temp [:model/Measure measure {:name "Total Venue Price"+ :table_id checkins-id+ :definition (lib/aggregate base-query (lib/sum venue-price))}]+ (is (= {:measure #{} :segment #{} :table #{checkins-id venues-id}}+ (calculation/upstream-deps:measure measure)))))))++(deftest upstream-deps-card-with-measure-test+ (testing "Card using a measure depends on that measure"+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))]+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Total Quantity"+ :table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (let [mp' (mt/metadata-provider)]+ (mt/with-temp [:model/Card card {:dataset_query (-> (lib/query mp' orders)+ (lib/aggregate (lib.metadata/measure mp' measure-id)))}]+ (is (= {:card #{} :measure #{measure-id} :segment #{} :table #{orders-id}}+ (calculation/upstream-deps:card card)))))))))++(deftest upstream-deps-measure-with-segment-test+ (testing "Measure with conditional aggregation using segment depends on that segment"+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))+ total-field-id (mt/id :orders :total)]+ (mt/with-temp [:model/Segment {segment-id :id} {:table_id orders-id+ :definition {:filter [:> [:field total-field-id nil] 100]}}]+ (let [mp' (mt/metadata-provider)+ segment-meta (lib.metadata/segment mp' segment-id)]+ (mt/with-temp [:model/Measure measure {:name "Quantity Where Total > 100"+ :table_id orders-id+ :definition (-> (lib/query mp' orders)+ (lib/aggregate (lib/sum-where quantity (lib/ref segment-meta))))}]+ (is (= {:measure #{} :segment #{segment-id} :table #{orders-id}}+ (calculation/upstream-deps:measure measure)))))))))diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/events_test.cljindex 4083125d700..57fe7ac7d69 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj@@ -461,3 +461,128 @@(is (= models.dependency/current-dependency-analysis-version(t2/select-one-fn :dependency_analysis_version :model/Segment :id segment-id)))(is (empty? (t2/select :model/Dependency :from_entity_id segment-id :from_entity_type :segment))))))))))))++(deftest measure-update-sets-correct-dependencies+ (mt/with-test-user :rasta+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))+ subtotal (lib.metadata/field mp (mt/id :orders :subtotal))]+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/Measure {measure-id :id :as measure} {:table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (testing "creating a measure creates dependency to its table"+ (events/publish-event! :event/measure-create {:object measure :user-id api/*current-user-id*})+ (is (= #{{:from_entity_type :measure+ :from_entity_id measure-id+ :to_entity_type :table+ :to_entity_id orders-id}}+ (into #{} (map #(dissoc % :id)+ (t2/select :model/Dependency :from_entity_id measure-id :from_entity_type :measure))))))+ (testing "updating measure definition recalculates dependencies"+ (t2/update! :model/Measure measure-id {:definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum subtotal)))})+ (let [updated-measure (t2/select-one :model/Measure :id measure-id)]+ (events/publish-event! :event/measure-update {:object updated-measure :user-id api/*current-user-id*})+ (is (= #{{:from_entity_type :measure+ :from_entity_id measure-id+ :to_entity_type :table+ :to_entity_id orders-id}}+ (into #{} (map #(dissoc % :id)+ (t2/select :model/Dependency :from_entity_id measure-id :from_entity_type :measure)))))))+ (testing "deleting measure removes all dependencies"+ (t2/delete! :model/Measure measure-id)+ (events/publish-event! :event/measure-delete {:object measure :user-id api/*current-user-id*})+ (is (empty? (t2/select :model/Dependency :from_entity_id measure-id :from_entity_type :measure)))))))))++(deftest measure-with-measure-dependencies+ (mt/with-test-user :rasta+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))+ subtotal (lib.metadata/field mp (mt/id :orders :subtotal))]+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/Measure {measure1-id :id :as measure1} {:table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (let [mp' (mt/metadata-provider)]+ (mt/with-temp [:model/Measure {measure2-id :id :as measure2} {:table_id orders-id+ :definition (-> (lib/query mp' orders)+ (lib/aggregate (lib/+ (lib.metadata/measure mp' measure1-id)+ (lib/sum subtotal))))}]+ (testing "creating a measure that references another measure creates dependencies to both"+ (events/publish-event! :event/measure-create {:object measure1 :user-id api/*current-user-id*})+ (events/publish-event! :event/measure-create {:object measure2 :user-id api/*current-user-id*})+ (is (= #{{:from_entity_type :measure+ :from_entity_id measure2-id+ :to_entity_type :table+ :to_entity_id orders-id}+ {:from_entity_type :measure+ :from_entity_id measure2-id+ :to_entity_type :measure+ :to_entity_id measure1-id}}+ (into #{} (map #(dissoc % :id)+ (t2/select :model/Dependency :from_entity_id measure2-id :from_entity_type :measure)))))))))))))++(deftest card-with-measure-dependencies+ (mt/with-test-user :rasta+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))]+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/Measure {measure-id :id :as measure} {:table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (events/publish-event! :event/measure-create {:object measure :user-id api/*current-user-id*})+ (testing "creating a card using a measure creates dependencies to both measure and table"+ (let [mp' (mt/metadata-provider)+ query (-> (lib/query mp' orders)+ (lib/aggregate (lib.metadata/measure mp' measure-id)))]+ (mt/with-temp [:model/Card {card-id :id :as card} {:dataset_query query}]+ (events/publish-event! :event/card-create {:object card :user-id api/*current-user-id*})+ (is (= #{{:from_entity_type :card+ :from_entity_id card-id+ :to_entity_type :measure+ :to_entity_id measure-id}+ {:from_entity_type :card+ :from_entity_id card-id+ :to_entity_type :table+ :to_entity_id orders-id}}+ (into #{} (map #(dissoc % :id)+ (t2/select :model/Dependency :from_entity_id card-id :from_entity_type :card)))))))))))))++(deftest measure-dependency-calculation-error-handling-test+ (testing "When measure dependency calculation throws an error, it should be logged and the version should still be updated"+ (mt/with-test-user :rasta+ (let [mp (mt/metadata-provider)+ orders-id (mt/id :orders)+ orders (lib.metadata/table mp orders-id)+ quantity (lib.metadata/field mp (mt/id :orders :quantity))]+ (mt/with-premium-features #{:dependencies}+ (mt/with-temp [:model/Measure {measure-id :id :as measure} {:table_id orders-id+ :definition (-> (lib/query mp orders)+ (lib/aggregate (lib/sum quantity)))}]+ (log.capture/with-log-messages-for-level [messages ["metabase-enterprise.dependencies.events" :error]]+ (with-redefs [deps.calculation/upstream-deps:measure (fn [_]+ (throw (ex-info "Measure dependency calculation failed"+ {:measure-id measure-id})))]+ (testing "on create event"+ (events/publish-event! :event/measure-create {:object measure :user-id api/*current-user-id*})+ (is (some #(and (= "Measure dependency calculation failed" (ex-message (:e %)))+ (= :error (:level %)))+ (messages)))+ (is (= models.dependency/current-dependency-analysis-version+ (t2/select-one-fn :dependency_analysis_version :model/Measure :id measure-id)))+ (is (empty? (t2/select :model/Dependency :from_entity_id measure-id :from_entity_type :measure))))+ (testing "on update event"+ (events/publish-event! :event/measure-update {:object measure :user-id api/*current-user-id*})+ (is (some #(and (= "Measure dependency calculation failed" (ex-message (:e %)))+ (= :error (:level %)))+ (messages)))+ (is (= models.dependency/current-dependency-analysis-version+ (t2/select-one-fn :dependency_analysis_version :model/Measure :id measure-id)))+ (is (empty? (t2/select :model/Dependency :from_entity_id measure-id :from_entity_type :measure))))))))))))diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj b/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.cljindex 2a51a1ecf9c..abba02dfedc 100644--- a/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj+++ b/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj@@ -54,30 +54,45 @@(is (m/find-first (comp #{"Migration already performed, skipping."} :message)(:messages <>)))))))))+(defn- executions-overlap?+ "Check if any two executions overlap in time. Each entry is [tid :started/:ended timestamp].+ Returns true if there's any overlap (which would indicate lock failure)."+ [log]+ (let [by-thread (group-by first log)]+ (when (= 2 (count by-thread))+ (let [[[_tid1 entries1] [_tid2 entries2]] (seq by-thread)+ get-time (fn [entries event]+ (->> entries (filter #(= event (second %))) first last))+ start1 (get-time entries1 :started)+ end1 (get-time entries1 :ended)+ start2 (get-time entries2 :started)+ end2 (get-time entries2 :ended)]+ (when (and start1 end1 start2 end2)+ ;; Overlap occurs if one execution starts before the other ends AND vice versa+ ;; i.e., start1 < end2 AND start2 < end1+ (and (t/before? start1 end2)+ (t/before? start2 end1)))))))+(deftest migration-lock-coordination-test(mt/with-premium-features #{:semantic-search}(semantic.tu/with-test-db-defaults!- (testing "Migration of simultaneous init attempt is blocked"+ (testing "Database lock prevents concurrent migration execution"(let [original-write-fn @#'semantic.db.migration/write-successful-migration!- original-migrate-fn @#'semantic.db.connection/do-with-migrate-txoriginal-maybe-migrate @#'semantic.db.migration/maybe-migrate!results (atom {:executed-migrations 0:log []})](with-redefs-fn {#'semantic.pgvector-api/index-documents! (constantly nil)- #'semantic.db.connection/do-with-migrate-tx+ ;; Wrap maybe-migrate! to log timestamps AFTER lock is acquired+ ;; (maybe-migrate! is called inside with-migrate-tx, after the lock)+ #'semantic.db.migration/maybe-migrate!(fn [& args](let [tid (.getId (Thread/currentThread))]- ;; leaving in the timestamp for repl purposes(swap! results update :log conj [tid :started (t/local-date-time)])- (apply original-migrate-fn args)- (swap! results update :log conj [tid :ended (t/local-date-time)]))- nil)- ;; add delay into migration function to ensure that thread performing migration- ;; finishes earlier- #'semantic.db.migration/maybe-migrate!- (fn [& args]- (Thread/sleep 200)- (apply original-maybe-migrate args))+ (try+ (Thread/sleep 200)+ (apply original-maybe-migrate args)+ (finally+ (swap! results update :log conj [tid :ended (t/local-date-time)])))))#'semantic.db.migration/write-successful-migration!(fn [& args](Thread/sleep 2000)@@ -86,26 +101,17 @@nil)}(fn [](let [;; thread 1 attempts migration on clean db- f1 (future- (swap! results assoc :tid-first (.getId (Thread/currentThread)))- (semantic.core/init! (semantic.tu/mock-documents) nil))- ;; thread 2 attempts migration- f2 (future- (swap! results assoc :tid-second (.getId (Thread/currentThread)))- (Thread/sleep 100)- (semantic.core/init! (semantic.tu/mock-documents) nil))]- ;; wait for completion+ f1 (future (semantic.core/init! (semantic.tu/mock-documents) nil))+ ;; thread 2 attempts migration concurrently+ f2 (future (semantic.core/init! (semantic.tu/mock-documents) nil))]+ ;; wait for completion@f1@f2(testing "Single migration performed"- (= 1 (:executed-migrations @results)))- (testing "Database locks acquired in expected order"- (let [{:keys [tid-first tid-second]} @results]- (is (=? [[tid-first :started any?]- [tid-second :started any?]- [tid-first :ended any?]- [tid-second :ended any?]]- (:log @results)))))))))))))+ (is (= 1 (:executed-migrations @results))))+ (testing "Executions do not overlap"+ (is (not (executions-overlap? (:log @results)))+ "Executions should not overlap - lock should serialize them"))))))))))(defn- map-contains-keys?[m kseq]diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.cljindex ef1abf82c15..8856c1b5026 100644--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/e2e_test.clj@@ -186,6 +186,13 @@:source-table 4}}}{:table_id [:t 100]:creator_id [:u 10]})+ :measure (many-random-fks 30 {:spec-gen {:definition {:lib/type :mbql/query+ :database 1+ :stages [{:lib/type :mbql.stage/mbql+ :source-table 4+ :aggregation [[:count {:lib/uuid "00000000-0000-0000-0000-000000000000"}]]}]}}}+ {:table_id [:t 100]+ :creator_id [:u 10]}):native-query-snippet (many-random-fks 10 {} {:creator_id [:u 10]:collection_id [:coll 10 100]}):timeline (many-random-fks 10 {} {:creator_id [:u 10]@@ -350,6 +357,12 @@(-> (ts/extract-one "Segment" entity_id)clean-entity)))))+ (testing "for measures"+ (doseq [{:keys [entity_id] :as measure} (get @entities "Measure")]+ (is (= (clean-entity measure)+ (-> (ts/extract-one "Measure" entity_id)+ clean-entity)))))+(testing "for native query snippets"(doseq [{:keys [entity_id] :as snippet} (get @entities "NativeQuerySnippet")](is (= (clean-entity snippet)diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.cljindex 2251dffcb51..77b968eb7e9 100644--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/extract_test.clj@@ -10,6 +10,9 @@[metabase.actions.models :as action][metabase.audit-app.core :as audit][metabase.core.core :as mbc]+ [metabase.lib-be.core :as lib-be]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata][metabase.models.serialization :as serdes][metabase.query-processor :as qp][metabase.search.test-util :as search.tu]@@ -912,6 +915,53 @@{:model "Field" :id "Some Field"}]}(set (serdes/dependencies ser))))))))))+(defn- pmbql-measure-definition+ "Create an MBQL5 measure definition with a sum aggregation."+ [db-id table-id field-id]+ (let [metadata-provider (lib-be/application-database-metadata-provider db-id)+ table (lib.metadata/table metadata-provider table-id)+ query (lib/query metadata-provider table)+ field (lib.metadata/field metadata-provider field-id)]+ (lib/aggregate query (lib/sum field))))++(deftest measures-test+ (mt/with-empty-h2-app-db!+ (ts/with-temp-dpc [:model/User {ann-id :id} {:first_name "Ann"+ :last_name "Wilson"+ :email "[email protected]"}+ :model/Database {db-id :id} {:name "My Database"}+ :model/Table {no-schema-id :id} {:name "Schemaless Table" :db_id db-id}+ :model/Field {field-id :id} {:name "Some Field" :table_id no-schema-id}]+ (let [definition (pmbql-measure-definition db-id no-schema-id field-id)]+ (ts/with-temp-dpc [:model/Measure+ {m1-id :id+ m1-eid :entity_id}+ {:name "My Measure"+ :creator_id ann-id+ :table_id no-schema-id+ :definition definition}]+ ;; Uncomment to regenerate measure baseline: (round-trip-test/add-to-baseline!)+ (testing "measure"+ (let [ser (serdes/extract-one "Measure" {} (t2/select-one :model/Measure :id m1-id))]+ (is (=? {:serdes/meta [{:model "Measure" :id m1-eid :label "my_measure"}]+ :table_id ["My Database" nil "Schemaless Table"]+ :creator_id "[email protected]"+ :definition {:database "My Database"+ :type :query+ :query {:source-table ["My Database" nil "Schemaless Table"]+ :aggregation [[:sum [:field ["My Database" nil "Schemaless Table" "Some Field"] map?]]]}}+ :created_at string?}+ ser))+ (is (not (contains? ser :id)))+ (testing "depend on the Database, the Table and any fields from the definition"+ (is (= #{[{:model "Database" :id "My Database"}]+ [{:model "Database" :id "My Database"}+ {:model "Table" :id "Schemaless Table"}]+ [{:model "Database" :id "My Database"}+ {:model "Table" :id "Schemaless Table"}+ {:model "Field" :id "Some Field"}]}+ (set (serdes/dependencies ser))))))))))))+(deftest table-publishing-serdes-test(mt/with-empty-h2-app-db!(ts/with-temp-dpc [:model/Database {db-id :id} {:name "My Database"}diff --git a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.cljindex 93e1b8ba1f1..bf9bf617355 100644--- a/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj+++ b/enterprise/backend/test/metabase_enterprise/serialization/v2/load_test.clj@@ -8,7 +8,9 @@[metabase-enterprise.serialization.v2.ingest :as serdes.ingest][metabase-enterprise.serialization.v2.load :as serdes.load][metabase.actions.models :as action]+ [metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata][metabase.models.serialization :as serdes][metabase.search.core :as search][metabase.test :as mt]@@ -351,6 +353,89 @@:database (:id @db1d)}(:definition @seg1d))))))))))+(defn- pmbql-measure-definition+ "Create an MBQL5 measure definition with a sum aggregation."+ [db-id table-id field-id]+ (let [metadata-provider (lib-be/application-database-metadata-provider db-id)+ table (lib.metadata/table metadata-provider table-id)+ query (lib/query metadata-provider table)+ field (lib.metadata/field metadata-provider field-id)]+ (lib/aggregate query (lib/sum field))))++(deftest measure-test+ ;; Measure.definition is a JSON-encoded MBQL query, which contains database, table, and field IDs - these need to be+ ;; converted to a portable form and read back in.+ ;; This test has a database, table and fields, that exist on both sides with different IDs, and expects a measure that+ ;; references those fields to be correctly loaded with the dest IDs.+ (testing "embedded MBQL in Measure :definition is portable"+ (let [serialized (atom nil)+ db1s (atom nil)+ table1s (atom nil)+ field1s (atom nil)+ msr1s (atom nil)+ user1s (atom nil)+ db1d (atom nil)+ table1d (atom nil)+ field1d (atom nil)+ user1d (atom nil)+ msr1d (atom nil)+ db2d (atom nil)+ table2d (atom nil)+ field2d (atom nil)]++ (ts/with-dbs [source-db dest-db]+ (testing "serializing the original database, table, field and measure"+ (ts/with-db source-db+ (reset! db1s (ts/create! :model/Database :name "my-db"))+ (reset! table1s (ts/create! :model/Table :name "sales" :db_id (:id @db1s)))+ (reset! field1s (ts/create! :model/Field :name "amount" :table_id (:id @table1s)))+ (reset! user1s (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]"))+ (reset! msr1s (ts/create! :model/Measure :table_id (:id @table1s) :name "Total Sales"+ :definition (pmbql-measure-definition (:id @db1s) (:id @table1s) (:id @field1s))+ :creator_id (:id @user1s)))+ (reset! serialized (into [] (serdes.extract/extract {})))))++ (testing "exported form is properly converted"+ (is (=? {:database "my-db"+ :query {:aggregation [[:sum [:field ["my-db" nil "sales" "amount"] map?]]]+ :source-table ["my-db" nil "sales"]}+ :type :query}+ (-> @serialized+ (by-model "Measure")+ first+ :definition))))++ (testing "deserializing adjusts the IDs properly"+ (ts/with-db dest-db+ ;; A different database and tables, so the IDs don't match.+ (reset! db2d (ts/create! :model/Database :name "other-db"))+ (reset! table2d (ts/create! :model/Table :name "orders" :db_id (:id @db2d)))+ (reset! field2d (ts/create! :model/Field :name "subtotal" :table_id (:id @table2d)))+ (reset! user1d (ts/create! :model/User :first_name "Tom" :last_name "Scholz" :email "[email protected]"))++ ;; Load the serialized content.+ (serdes.load/load-metabase! (ingestion-in-memory @serialized))++ ;; Fetch the relevant bits+ (reset! db1d (t2/select-one :model/Database :name "my-db"))+ (reset! table1d (t2/select-one :model/Table :name "sales"))+ (reset! field1d (t2/select-one :model/Field :table_id (:id @table1d) :name "amount"))+ (reset! msr1d (t2/select-one :model/Measure :name "Total Sales"))++ (testing "the main Database, Table, and Field have different IDs now"+ (is (not= (:id @db1s) (:id @db1d)))+ (is (not= (:id @table1s) (:id @table1d)))+ (is (not= (:id @field1s) (:id @field1d))))++ (is (not= (:definition @msr1s)+ (:definition @msr1d)))+ (testing "the Measure's definition is based on the new Database, Table, and Field IDs"+ (is (=? {:lib/type :mbql/query+ :stages [{:source-table (:id @table1d)+ :aggregation [[:sum map? [:field map? (:id @field1d)]]]}]+ :database (:id @db1d)}+ (:definition @msr1d))))))))))+#_{:clj-kondo/ignore [:metabase/i-like-making-cams-eyes-bleed-with-horrifically-long-tests]}(deftest dashboard-card-test;; DashboardCard.parameter_mappings and Card.parameter_mappings are JSON-encoded lists of parameter maps, whichdiff --git a/enterprise/frontend/src/metabase-enterprise/api/tags.ts b/enterprise/frontend/src/metabase-enterprise/api/tags.tsindex a9d02e0ee14..114ce6161ba 100644--- a/enterprise/frontend/src/metabase-enterprise/api/tags.ts+++ b/enterprise/frontend/src/metabase-enterprise/api/tags.ts@@ -17,6 +17,7 @@ import type {DependencyGraph,DependencyNode,DocumentDependencyNode,+ MeasureDependencyNode,PythonLibrary,SandboxDependencyNode,SegmentDependencyNode,@@ -235,6 +236,16 @@ function provideSegmentDependencyNodeTags(];}+function provideMeasureDependencyNodeTags(+ node: MeasureDependencyNode,+): TagDescription<EnterpriseTagType>[] {+ return [+ idTag("measure", node.id),+ ...(node.data.creator != null ? provideUserTags(node.data.creator) : []),+ ...(node.data.table ? provideTableTags(node.data.table) : []),+ ];+}+export function provideDependencyNodeTags(node: DependencyNode,): TagDescription<EnterpriseTagType>[] {@@ -255,6 +266,8 @@ export function provideDependencyNodeTags(return provideSandboxDependencyNodeTags(node);case "segment":return provideSegmentDependencyNodeTags(node);+ case "measure":+ return provideMeasureDependencyNodeTags(node);}}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.module.cssrename to enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsxnew file mode 100644index 00000000000..d800be9dfd2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/Breadcrumbs.tsx@@ -0,0 +1,65 @@+import { Fragment } from "react";+import { Link } from "react-router";++import { Ellipsified } from "metabase/common/components/Ellipsified";+import { Flex, Group, Text } from "metabase/ui";++import S from "./Breadcrumbs.module.css";++export type BreadcrumbItem = {+ label: string;+ to?: string;+};++type BreadcrumbsProps = {+ items: BreadcrumbItem[];+};++export function Breadcrumbs({ items }: BreadcrumbsProps) {+ return (+ <Group c="text-secondary" gap="sm" wrap="nowrap" px="lg" pt="md">+ {items.map((item, index) => (+ <Fragment key={index}>+ {index > 0 && <Separator />}+ {item.to ? (+ <BreadcrumbLink to={item.to}>+ <Ellipsified>{item.label}</Ellipsified>+ </BreadcrumbLink>+ ) : (+ <BreadcrumbText>+ <Ellipsified>{item.label}</Ellipsified>+ </BreadcrumbText>+ )}+ </Fragment>+ ))}+ </Group>+ );+}++function BreadcrumbLink({+ to,+ children,+}: {+ to: string;+ children: React.ReactNode;+}) {+ return (+ <Link to={to} className={S.link}>+ <Flex align="center" gap="xs" wrap="nowrap">+ {children}+ </Flex>+ </Link>+ );+}++function BreadcrumbText({ children }: { children: React.ReactNode }) {+ return (+ <Flex align="center" gap="xs" wrap="nowrap">+ {children}+ </Flex>+ );+}++function Separator() {+ return <Text span>/</Text>;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsxnew file mode 100644index 00000000000..1d6499349ae--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/DataModelBreadcrumbs.tsx@@ -0,0 +1,54 @@+import { skipToken } from "@reduxjs/toolkit/query";+import { Link } from "react-router";++import { useListDatabaseSchemasQuery } from "metabase/api";+import { Ellipsified } from "metabase/common/components/Ellipsified";+import * as Urls from "metabase/lib/urls";+import type { Table } from "metabase-types/api";++import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";++type DataModelBreadcrumbsProps = {+ table: Table;+ entityName: string | undefined;+ newEntityLabel: string;+ tableListUrl: string;+};++export function DataModelBreadcrumbs({+ table,+ entityName,+ newEntityLabel,+ tableListUrl,+}: DataModelBreadcrumbsProps) {+ const { data: schemas, isLoading } = useListDatabaseSchemasQuery(+ table.db_id ? { id: table.db_id } : skipToken,+ );++ const showSchema = schemas && schemas.length > 1 && table.schema;++ return (+ <DataStudioBreadcrumbs loading={isLoading}>+ {table.db && (+ <Link to={Urls.dataStudioData({ databaseId: table.db_id })}>+ <Ellipsified>{table.db.name}</Ellipsified>+ </Link>+ )}++ {showSchema && (+ <Link+ to={Urls.dataStudioData({+ databaseId: table.db_id,+ schemaName: table.schema,+ })}+ >+ <Ellipsified>{table.schema}</Ellipsified>+ </Link>+ )}+ <Link to={tableListUrl}>+ <Ellipsified>{table.display_name}</Ellipsified>+ </Link>+ <span>{entityName ?? newEntityLabel}</span>+ </DataStudioBreadcrumbs>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsxnew file mode 100644index 00000000000..9a98e81b02a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/PublishedTableBreadcrumbs.tsx@@ -0,0 +1,42 @@+import { Link } from "react-router";++import * as Urls from "metabase/lib/urls";+import type { Table } from "metabase-types/api";++import { useCollectionPath } from "../../hooks/use-collection-path/useCollectionPath";+import { DataStudioBreadcrumbs } from "../DataStudioBreadcrumbs";++type PublishedTableBreadcrumbsProps = {+ table: Table;+ entityName: string | undefined;+ newEntityLabel: string;+ tableListUrl: string;+};++export function PublishedTableBreadcrumbs({+ table,+ entityName,+ newEntityLabel,+ tableListUrl,+}: PublishedTableBreadcrumbsProps) {+ const { path, isLoadingPath } = useCollectionPath({+ collectionId: table.collection_id,+ });++ return (+ <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>+ ))}+ <Link to={tableListUrl}>{table.display_name}</Link>+ <span>{entityName ?? newEntityLabel}</span>+ </DataStudioBreadcrumbs>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/index.tsnew file mode 100644index 00000000000..441842183aa--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Breadcrumbs/index.ts@@ -0,0 +1,3 @@+export { Breadcrumbs, type BreadcrumbItem } from "./Breadcrumbs";+export { DataModelBreadcrumbs } from "./DataModelBreadcrumbs";+export { PublishedTableBreadcrumbs } from "./PublishedTableBreadcrumbs";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsxsimilarity index 78%rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentTabs.tsxrename to enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsxindex 40a141270bf..464059780d7 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs.tsx@@ -7,13 +7,18 @@ import {type PaneHeaderTab,PaneHeaderTabs,} from "metabase-enterprise/data-studio/common/components/PaneHeader";-import type { SegmentTabUrls } from "metabase-enterprise/data-studio/segments/types";-type SegmentTabsProps = {- urls: SegmentTabUrls;+export type EntityDetailTabUrls = {+ definition: string;+ revisions: string;+ dependencies: string;};-export function SegmentTabs({ urls }: SegmentTabsProps) {+type EntityDetailTabsProps = {+ urls: EntityDetailTabUrls;+};++export function EntityDetailTabs({ urls }: EntityDetailTabsProps) {const location = useSelector(getLocation);const tabs: PaneHeaderTab[] = [diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu.tsxnew file mode 100644index 00000000000..f71fc577f80--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu.tsx@@ -0,0 +1,77 @@+import { useDisclosure } from "@mantine/hooks";+import { Link } from "react-router";+import { t } from "ttag";++import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { ActionIcon, Icon, Menu } from "metabase/ui";++type MoreMenuProps = {+ previewUrl?: string;+ onRemove?: () => void;+ ariaLabel: string;+ removeLabel: string;+ removeTitle: string;+ removeMessage: string;+};++export function MoreMenu({+ previewUrl,+ onRemove,+ ariaLabel,+ removeLabel,+ removeTitle,+ removeMessage,+}: MoreMenuProps) {+ const [isConfirmOpen, { open: openConfirm, close: closeConfirm }] =+ useDisclosure();++ const handleConfirm = () => {+ closeConfirm();+ onRemove?.();+ };++ if (!previewUrl && !onRemove) {+ return null;+ }++ return (+ <>+ <Menu>+ <Menu.Target>+ <ActionIcon aria-label={ariaLabel}>+ <Icon name="ellipsis" />+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown>+ {previewUrl && (+ <Menu.Item+ component={Link}+ to={previewUrl}+ target="_blank"+ leftSection={<Icon name="share" />}+ >+ {t`Preview`}+ </Menu.Item>+ )}+ {onRemove && (+ <Menu.Item+ c="danger"+ leftSection={<Icon name="trash" />}+ onClick={openConfirm}+ >+ {removeLabel}+ </Menu.Item>+ )}+ </Menu.Dropdown>+ </Menu>+ <ConfirmModal+ title={removeTitle}+ message={removeMessage}+ opened={isConfirmOpen}+ onClose={closeConfirm}+ onConfirm={handleConfirm}+ confirmButtonText={t`Remove`}+ />+ </>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url.tsnew file mode 100644index 00000000000..9f55506a995--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url.ts@@ -0,0 +1,11 @@+import * as Urls from "metabase/lib/urls";+import type { DatasetQuery } from "metabase-types/api";++export function getDatasetQueryPreviewUrl(+ definition: DatasetQuery | null | undefined,+): string | undefined {+ if (!definition) {+ return undefined;+ }+ return Urls.newQuestion({ dataset_query: definition });+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.cssnew file mode 100644index 00000000000..e6d0094bdf5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css@@ -0,0 +1,13 @@+.filter {+ color: var(--mb-color-filter);+ background-color: color-mix(in srgb, var(--mb-color-filter) 14%, transparent);+ border-radius: 1rem;+ overflow-wrap: anywhere;+}++.aggregation {+ color: var(--mb-color-text-white);+ background-color: var(--mb-color-summarize);+ border-radius: 1rem;+ overflow-wrap: anywhere;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.tsxnew file mode 100644index 00000000000..512abfaf89d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.tsx@@ -0,0 +1,28 @@+import type { ReactNode } from "react";++import { Flex } from "metabase/ui";++import S from "./ClausePill.module.css";+import type { DefinitionType } from "./types";++type ClausePillProps = {+ children: ReactNode;+ variant: DefinitionType;+};++export function ClausePill({ children, variant }: ClausePillProps) {+ return (+ <Flex+ className={variant === "filters" ? S.filter : S.aggregation}+ align="center"+ px="sm"+ py={4}+ fw={600}+ fz="sm"+ lh={1.25}+ data-testid={`${variant}-pill`}+ >+ {children}+ </Flex>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/QueryClauseDisplay.tsxnew file mode 100644index 00000000000..5282da5c98d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/QueryClauseDisplay.tsx@@ -0,0 +1,66 @@+import { useSelector } from "metabase/lib/redux";+import { getMetadata } from "metabase/selectors/metadata";+import { Flex } from "metabase/ui";+import * as Lib from "metabase-lib";+import type { DatasetQuery, TableId } from "metabase-types/api";++import { ClausePill } from "./ClausePill";+import type { DefinitionType } from "./types";++const STAGE_INDEX = -1;++type QueryClauseDisplayProps = {+ definition: DatasetQuery;+ tableId: TableId;+ clauseType: DefinitionType;+};++export function QueryClauseDisplay({+ definition,+ tableId,+ clauseType,+}: QueryClauseDisplayProps) {+ const metadata = useSelector(getMetadata);+ const query = getQuery(definition, tableId, metadata);++ if (!query) {+ return null;+ }++ const clauses =+ clauseType === "filters"+ ? Lib.filters(query, STAGE_INDEX)+ : Lib.aggregations(query, STAGE_INDEX);++ if (clauses.length === 0) {+ return null;+ }++ return (+ <Flex gap="sm" wrap="wrap">+ {clauses.map((clause, index) => (+ <ClausePill key={index} variant={clauseType}>+ {Lib.displayInfo(query, STAGE_INDEX, clause).displayName}+ </ClausePill>+ ))}+ </Flex>+ );+}++function getQuery(+ definition: DatasetQuery | undefined,+ tableId: TableId | undefined,+ metadata: ReturnType<typeof getMetadata>,+) {+ if (!definition) {+ return undefined;+ }++ const databaseId = definition.database;+ if (!databaseId) {+ return undefined;+ }++ const metadataProvider = Lib.metadataProvider(databaseId, metadata);+ return Lib.fromJsQuery(metadataProvider, definition);+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionDiff.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsxsimilarity index 74%rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionDiff.tsxrename to enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsxindex 0140c188a8b..f3a607c8a1d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionDiff.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx@@ -1,32 +1,38 @@import { diffWords } from "diff";import { t } from "ttag";-import { QueryDefinition } from "metabase/admin/datamodel/components/QueryDefinition";import { Box, Flex, Icon, Text } from "metabase/ui";import type { DatasetQuery, TableId } from "metabase-types/api";+import { QueryClauseDisplay } from "./QueryClauseDisplay";+import type { DefinitionType } from "./types";+type DiffValue = {before?: unknown;after?: unknown;};-type SegmentRevisionDiffProps = {+type RevisionDiffProps = {property: string;diff: DiffValue | undefined;tableId: TableId;+ definitionLabel: string;+ definitionType: DefinitionType;};-export function SegmentRevisionDiff({+export function RevisionDiff({property,diff,tableId,-}: SegmentRevisionDiffProps) {+ definitionLabel,+ definitionType,+}: RevisionDiffProps) {if (!diff) {return null;}const { before, after } = diff;- const label = getPropertyLabel(property);+ const label = getPropertyLabel(property, definitionLabel);return (<Box p="md" bg="bg-light" bd="1px solid border">@@ -38,7 +44,12 @@ export function SegmentRevisionDiff({</Flex>{property === "definition" ? (- <DefinitionDiff before={before} after={after} tableId={tableId} />+ <DefinitionDiff+ before={before}+ after={after}+ tableId={tableId}+ definitionType={definitionType}+ />) : (<TextDiff before={before} after={after} />)}@@ -56,14 +67,14 @@ function DiffIcon({ before, after }: { before: unknown; after: unknown }) {return <Icon name="add" size={12} c="success" />;}-function getPropertyLabel(property: string): string {+function getPropertyLabel(property: string, definitionLabel: string): string {switch (property) {case "name":return t`Name`;case "description":return t`Description`;case "definition":- return t`Filter`;+ return definitionLabel;default:return property;}@@ -116,18 +127,30 @@ type DefinitionDiffProps = {before: unknown;after: unknown;tableId: TableId;+ definitionType: DefinitionType;};function isDatasetQuery(value: unknown): value is DatasetQuery {return value != null && typeof value === "object";}-function DefinitionDiff({ before, after, tableId }: DefinitionDiffProps) {+function DefinitionDiff({+ before,+ after,+ tableId,+ definitionType,+}: DefinitionDiffProps) {const definition = after ?? before;if (!isDatasetQuery(definition)) {return null;}- return <QueryDefinition definition={definition} tableId={tableId} />;+ return (+ <QueryClauseDisplay+ definition={definition}+ tableId={tableId}+ clauseType={definitionType}+ />+ );}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistory.module.csssimilarity index 100%rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.module.cssrename to enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistory.module.cssdiff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsxnew file mode 100644index 00000000000..13c3587a9db--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionHistoryTimeline.tsx@@ -0,0 +1,82 @@+import { useMemo } from "react";+import { t } from "ttag";++import { useListRevisionsQuery } from "metabase/api";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { assignUserColors } from "metabase/lib/formatting";+import { useSelector } from "metabase/lib/redux";+import { getUserId } from "metabase/selectors/user";+import { Center, Stack, Text, Timeline } from "metabase/ui";+import type { RevisionEntityType, TableId } from "metabase-types/api";++import { RevisionItem } from "./RevisionItem";+import type { DefinitionType, RevisionActionDescriptor } from "./types";++type RevisionHistoryTimelineProps = {+ entityType: RevisionEntityType;+ entityId: number;+ tableId: TableId;+ getActionDescription: RevisionActionDescriptor;+ definitionLabel: string;+ definitionType: DefinitionType;+};++export function RevisionHistoryTimeline({+ entityType,+ entityId,+ tableId,+ getActionDescription,+ definitionLabel,+ definitionType,+}: RevisionHistoryTimelineProps) {+ const currentUserId = useSelector(getUserId);+ const {+ data: revisions,+ isLoading,+ error,+ } = useListRevisionsQuery({ entity: entityType, id: entityId });++ const userColorAssignments = useMemo(() => {+ if (!revisions || currentUserId == null) {+ return {};+ }+ return assignUserColors(+ revisions.map((r) => String(r.user.id)),+ String(currentUserId),+ );+ }, [revisions, currentUserId]);++ if (isLoading || error != null) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ if (!revisions || revisions.length === 0) {+ return (+ <Center h="100%">+ <Text c="text-secondary">{t`No revision history available.`}</Text>+ </Center>+ );+ }++ return (+ <Stack p="xl" maw={720} mx="auto" w="100%">+ <Timeline bulletSize={40} lineWidth={2}>+ {revisions.map((revision) => (+ <RevisionItem+ key={revision.id}+ revision={revision}+ tableId={tableId}+ userColor={userColorAssignments[String(revision.user.id)]}+ getActionDescription={getActionDescription}+ definitionLabel={definitionLabel}+ definitionType={definitionType}+ />+ ))}+ </Timeline>+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionItem.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionItem.tsxsimilarity index 69%rename from enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionItem.tsxrename to enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionItem.tsxindex 2585c241916..75666426a9e 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionItem.tsx@@ -8,22 +8,29 @@ import { getUserId } from "metabase/selectors/user";import { Box, Flex, Stack, Text, Timeline } from "metabase/ui";import type { Revision, TableId } from "metabase-types/api";-import { SegmentRevisionDiff } from "./SegmentRevisionDiff";-import S from "./SegmentRevisionHistory.module.css";+import { RevisionDiff } from "./RevisionDiff";+import S from "./RevisionHistory.module.css";+import type { DefinitionType, RevisionActionDescriptor } from "./types";dayjs.extend(relativeTime);-type SegmentRevisionItemProps = {+type RevisionItemProps = {revision: Revision;tableId: TableId;userColor?: string;+ getActionDescription: RevisionActionDescriptor;+ definitionLabel: string;+ definitionType: DefinitionType;};-export function SegmentRevisionItem({+export function RevisionItem({revision,tableId,userColor,-}: SegmentRevisionItemProps) {+ getActionDescription,+ definitionLabel,+ definitionType,+}: RevisionItemProps) {const currentUserId = useSelector(getUserId);const isCurrentUser = revision.user.id === currentUserId;const userName = isCurrentUser ? t`You` : revision.user.common_name;@@ -63,11 +70,13 @@ export function SegmentRevisionItem({{diffKeys.length > 0 && (<Stack gap="sm" mt="sm">{diffKeys.map((key) => (- <SegmentRevisionDiff+ <RevisionDiffkey={key}property={key}diff={getDiffForKey(revision.diff, key)}tableId={tableId}+ definitionLabel={definitionLabel}+ definitionType={definitionType}/>))}</Stack>@@ -77,41 +86,14 @@ export function SegmentRevisionItem({);}-function getActionDescription(revision: Revision): string {- if (revision.is_creation) {- return t`created this segment`;- }- if (revision.is_reversion) {- return t`reverted to a previous version`;- }-- const changedKeys = Object.keys(revision.diff || {});- if (changedKeys.length === 1) {- switch (changedKeys[0]) {- case "name":- return t`renamed the segment`;- case "description":- return t`updated the description`;- case "definition":- return t`changed the filter definition`;- }- }-- if (changedKeys.length > 1) {- return t`made multiple changes`;- }-- return t`made changes`;-}--type RevisionDiff = Record<string, { before?: unknown; after?: unknown }>;+type RevisionDiffMap = Record<string, { before?: unknown; after?: unknown }>;function getDiffKeys(revision: Revision): string[] {if (!revision.diff) {return [];}- const diff = revision.diff as unknown as RevisionDiff;+ const diff = revision.diff as unknown as RevisionDiffMap;let keys = Object.keys(diff);if (revision.is_creation) {@@ -129,6 +111,6 @@ function getDiffForKey(return undefined;}- const revisionDiff = diff as unknown as RevisionDiff;+ const revisionDiff = diff as unknown as RevisionDiffMap;return revisionDiff[key];}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/index.tsnew file mode 100644index 00000000000..1158fdd7002--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/index.ts@@ -0,0 +1,4 @@+export { RevisionHistoryTimeline } from "./RevisionHistoryTimeline";+export { RevisionItem } from "./RevisionItem";+export { RevisionDiff } from "./RevisionDiff";+export type { DefinitionType, RevisionActionDescriptor } from "./types";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/types.tsnew file mode 100644index 00000000000..ec9ecfcdc89--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/types.ts@@ -0,0 +1,5 @@+import type { Revision } from "metabase-types/api";++export type RevisionActionDescriptor = (revision: Revision) => string;++export type DefinitionType = "filters" | "aggregations";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.module.cssnew file mode 100644index 00000000000..c099e1f0102--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.module.css@@ -0,0 +1,7 @@+.card {+ box-shadow: 0 2px 4px 0 hsla(0, 0%, 0%, 0.05);++ &:hover {+ background-color: var(--mb-color-brand-lighter);+ }+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.tsxnew file mode 100644index 00000000000..9340157bd9f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.tsx@@ -0,0 +1,42 @@+import { Link } from "react-router";++import { Ellipsified } from "metabase/common/components/Ellipsified";+import { Card, Flex, Icon, Stack, Text } from "metabase/ui";+import type { Measure } from "metabase-types/api";++import S from "./MeasureItem.module.css";++type MeasureItemProps = {+ measure: Measure;+ href: string;+};++export function MeasureItem({ measure, href }: MeasureItemProps) {+ return (+ <Card+ className={S.card}+ component={Link}+ to={href}+ aria-label={measure.name}+ role="listitem"+ px="md"+ py="0.75rem"+ withBorder+ >+ <Stack gap="xs">+ <Flex align="center" gap="sm">+ <Icon name="sum" c="brand" />+ <Ellipsified lines={1} tooltip={measure.name}>+ <Text fw="bold">{measure.name}</Text>+ </Ellipsified>+ </Flex>++ {measure.definition_description && (+ <Text data-testid="list-item-description">+ {measure.definition_description}+ </Text>+ )}+ </Stack>+ </Card>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.unit.spec.tsxnew file mode 100644index 00000000000..a6871fe54d6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureItem.unit.spec.tsx@@ -0,0 +1,53 @@+import { Route } from "react-router";++import { renderWithProviders, screen } from "__support__/ui";+import { createMockMeasure } from "metabase-types/api/mocks";++import { MeasureItem } from "./MeasureItem";++describe("MeasureItem", () => {+ it("should render measure with name, description, link, and list role", () => {+ const measure = createMockMeasure({+ name: "Total Revenue",+ definition_description: "Sum of Total",+ });++ const measureUrl =+ "/data-studio/data/database/1/schema/1:PUBLIC/table/1/measures/42";++ renderWithProviders(+ <Route+ path="/"+ component={() => <MeasureItem measure={measure} href={measureUrl} />}+ />,+ { withRouter: true },+ );++ expect(screen.getByText("Total Revenue")).toBeInTheDocument();+ expect(screen.getByText("Sum of Total")).toBeInTheDocument();++ const item = screen.getByRole("listitem");+ expect(item).toBeInTheDocument();+ expect(item).toHaveAttribute("href", measureUrl);+ expect(item).toHaveAttribute("aria-label", "Total Revenue");+ });++ it("should not render definition description when empty", () => {+ const measure = createMockMeasure({+ name: "Count",+ definition_description: "",+ });++ renderWithProviders(+ <Route+ path="/"+ component={() => <MeasureItem measure={measure} href="/test" />}+ />,+ { withRouter: true },+ );++ expect(+ screen.queryByTestId("list-item-description"),+ ).not.toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsxnew file mode 100644index 00000000000..b9773c2e2af--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.tsx@@ -0,0 +1,62 @@+import { t } from "ttag";++import EmptyState from "metabase/common/components/EmptyState";+import { ForwardRefLink } from "metabase/common/components/Link";+import * as Urls from "metabase/lib/urls";+import { Button, Group, Icon, Stack } from "metabase/ui";+import type { Table } from "metabase-types/api";++import { MeasureItem } from "./MeasureItem";++type MeasureListProps = {+ table: Table;+};++export function MeasureList({ table }: MeasureListProps) {+ const measures = table.measures ?? [];+ const getMeasureHref = (measureId: number) =>+ Urls.dataStudioDataModelMeasure({+ databaseId: table.db_id,+ schemaName: table.schema,+ tableId: table.id,+ measureId,+ });++ return (+ <Stack gap="md" data-testid="table-measures-page">+ <Group gap="md" justify="flex-start" wrap="nowrap">+ <Button+ component={ForwardRefLink}+ to={Urls.newDataStudioDataModelMeasure({+ databaseId: table.db_id,+ schemaName: table.schema,+ tableId: table.id,+ })}+ h={32}+ px="sm"+ py="xs"+ size="xs"+ leftSection={<Icon name="add" />}+ >{t`New measure`}</Button>+ </Group>++ {measures.length === 0 ? (+ <EmptyState+ illustrationElement={<Icon name="sum" size={32} c="text-secondary" />}+ title={t`No measures yet`}+ message={t`Create a measure to define a reusable aggregation for this table.`}+ />+ ) : (+ <Stack gap="sm" role="list">+ {measures.map((measure) => (+ <MeasureItem+ key={measure.id}+ measure={measure}+ href={getMeasureHref(measure.id)}+ />+ ))}+ </Stack>+ )}+ </Stack>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsxnew file mode 100644index 00000000000..90c8a8dc525--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/MeasureList.unit.spec.tsx@@ -0,0 +1,66 @@+import { Route } from "react-router";++import { renderWithProviders, screen } from "__support__/ui";+import type { Measure, Table } from "metabase-types/api";+import { createMockMeasure, createMockTable } from "metabase-types/api/mocks";++import { MeasureList } from "./MeasureList";++type SetupOpts = {+ measures?: Measure[];+ table?: Partial<Table>;+};++function setup({ measures = [], table = {} }: SetupOpts = {}) {+ const mockTable = createMockTable({+ id: 1,+ db_id: 1,+ schema: "PUBLIC",+ measures,+ ...table,+ });++ renderWithProviders(+ <Route path="/" component={() => <MeasureList table={mockTable} />} />,+ { withRouter: true },+ );+}++describe("MeasureList", () => {+ it("should render empty state when no measures", () => {+ setup({ measures: [] });++ expect(screen.getByText("No measures yet")).toBeInTheDocument();+ expect(+ screen.getByText(+ "Create a measure to define a reusable aggregation for this table.",+ ),+ ).toBeInTheDocument();+ expect(+ screen.getByRole("link", { name: /New measure/i }),+ ).toBeInTheDocument();+ });++ it("should render measure items", () => {+ const measures = [+ createMockMeasure({+ id: 1,+ name: "Total Revenue",+ definition_description: "Sum of Total",+ }),+ createMockMeasure({ id: 2, name: "Order Count" }),+ ];+ setup({ measures });++ expect(screen.getByRole("list")).toBeInTheDocument();+ expect(screen.getByText("Total Revenue")).toBeInTheDocument();+ expect(screen.getByText("Sum of Total")).toBeInTheDocument();+ expect(screen.getByText("Order Count")).toBeInTheDocument();+ expect(+ screen.getByRole("listitem", { name: "Total Revenue" }),+ ).toHaveAttribute(+ "href",+ "/data-studio/data/database/1/schema/1:PUBLIC/table/1/measures/1",+ );+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsxindex 1aef2a285d6..0061d498bf1 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.tsx@@ -36,6 +36,7 @@ import { PublishTablesModal } from "metabase-enterprise/data-studio/common/compoimport { UnpublishTablesModal } from "metabase-enterprise/data-studio/common/components/UnpublishTablesModal";import type { FieldId, Table, TableFieldOrder } from "metabase-types/api";+import { MeasureList } from "./MeasureList";import { SegmentList } from "./SegmentList";import { TableAttributesEditSingle } from "./TableAttributesEditSingle";import { TableCollection } from "./TableCollection";@@ -257,87 +258,99 @@ const TableSectionBase = ({{table.is_published && <TableCollection table={table} />}- <Tabs value={activeTab} onChange={handleTabChange}>- <Tabs.List mb="md">- <Tabs.Tab- value="field"- leftSection={<Icon name="list" />}- >{t`Fields`}</Tabs.Tab>- <Tabs.Tab- value="segments"- leftSection={<Icon name="segment2" />}- >{t`Segments`}</Tabs.Tab>- </Tabs.List>-- <Tabs.Panel value="field">- <Stack gap="md">- <Group gap="md" justify="flex-start" wrap="nowrap">- {isUpdatingSorting && (- <Loader data-testid="loading-indicator" size="xs" />+ <Box px="lg">+ <Tabs value={activeTab} onChange={handleTabChange}>+ <Tabs.List mb="md">+ <Tabs.Tab+ value="field"+ leftSection={<Icon name="list" />}+ >{t`Fields`}</Tabs.Tab>+ <Tabs.Tab+ value="segments"+ leftSection={<Icon name="segment2" />}+ >{t`Segments`}</Tabs.Tab>+ <Tabs.Tab+ value="measures"+ leftSection={<Icon name="sum" />}+ >{t`Measures`}</Tabs.Tab>+ </Tabs.List>++ <Tabs.Panel value="field">+ <Stack gap="md">+ <Group gap="md" justify="flex-start" wrap="nowrap">+ {isUpdatingSorting && (+ <Loader data-testid="loading-indicator" size="xs" />+ )}++ {!isSorting && hasFields && (+ <ResponsiveButton+ icon="sort_arrows"+ showLabel+ onClick={() => setIsSorting(true)}+ >{t`Sorting`}</ResponsiveButton>+ )}++ {isSorting && (+ <FieldOrderPicker+ value={table.field_order}+ onChange={handleFieldOrderTypeChange}+ />+ )}++ {isSorting && (+ <ResponsiveButton+ icon="check"+ showLabel+ onClick={() => setIsSorting(false)}+ >{t`Done`}</ResponsiveButton>+ )}+ </Group>++ {!hasFields && (+ <EmptyState message={t`This table has no fields`} />)}- {!isSorting && hasFields && (- <ResponsiveButton- icon="sort_arrows"- showLabel- onClick={() => setIsSorting(true)}- >{t`Sorting`}</ResponsiveButton>+ {hasFields && (+ <>+ <Box+ style={{+ display: isSorting ? "block" : "none",+ }}+ aria-hidden={!isSorting}+ >+ <TableSortableFieldList+ activeFieldId={activeFieldId}+ table={table}+ onChange={handleCustomFieldOrderChange}+ />+ </Box>++ <Box+ style={{+ display: isSorting ? "none" : "block",+ }}+ aria-hidden={isSorting}+ >+ <TableFieldList+ table={table}+ activeFieldId={activeFieldId}+ getFieldHref={getFieldHref}+ />+ </Box>+ </>)}+ </Stack>+ </Tabs.Panel>- {isSorting && (- <FieldOrderPicker- value={table.field_order}- onChange={handleFieldOrderTypeChange}- />- )}+ <Tabs.Panel value="segments">+ <SegmentList table={table} />+ </Tabs.Panel>- {isSorting && (- <ResponsiveButton- icon="check"- showLabel- onClick={() => setIsSorting(false)}- >{t`Done`}</ResponsiveButton>- )}- </Group>-- {!hasFields && <EmptyState message={t`This table has no fields`} />}-- {hasFields && (- <>- <Box- style={{- display: isSorting ? "block" : "none",- }}- aria-hidden={!isSorting}- >- <TableSortableFieldList- activeFieldId={activeFieldId}- table={table}- onChange={handleCustomFieldOrderChange}- />- </Box>-- <Box- style={{- display: isSorting ? "none" : "block",- }}- aria-hidden={isSorting}- >- <TableFieldList- table={table}- activeFieldId={activeFieldId}- getFieldHref={getFieldHref}- />- </Box>- </>- )}- </Stack>- </Tabs.Panel>-- <Tabs.Panel value="segments">- <SegmentList table={table} />- </Tabs.Panel>- </Tabs>+ <Tabs.Panel value="measures">+ <MeasureList table={table} />+ </Tabs.Panel>+ </Tabs>+ </Box><CreateLibraryModaltitle={t`First, let's create your Library`}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsxindex 6d73ad35a1b..92dfb21d1e0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/routes.tsx@@ -1,6 +1,10 @@import { IndexRoute, Redirect, Route } from "react-router";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { DataModelMeasureDependenciesPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage";+import { DataModelMeasureDetailPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage";+import { DataModelMeasureRevisionHistoryPage } from "metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage";+import { DataModelNewMeasurePage } from "metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage";import { DataModelNewSegmentPage } from "metabase-enterprise/data-studio/segments/pages/DataModelNewSegmentPage";import { DataModelSegmentDependenciesPage } from "metabase-enterprise/data-studio/segments/pages/DataModelSegmentDependenciesPage";import { DataModelSegmentDetailPage } from "metabase-enterprise/data-studio/segments/pages/DataModelSegmentDetailPage";@@ -42,6 +46,26 @@ export function getDataStudioMetadataRoutes() {<IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} /></Route>)}+ <Route+ path="database/:databaseId/schema/:schemaId/table/:tableId/measures/new"+ component={DataModelNewMeasurePage}+ />+ <Route+ path="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId"+ component={DataModelMeasureDetailPage}+ />+ <Route+ path="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId/revisions"+ component={DataModelMeasureRevisionHistoryPage}+ />+ {PLUGIN_DEPENDENCIES.isEnabled && (+ <Route+ path="database/:databaseId/schema/:schemaId/table/:tableId/measures/:measureId/dependencies"+ component={DataModelMeasureDependenciesPage}+ >+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ </Route>+ )}<Routepath="database/:databaseId/schema/:schemaId/table/:tableId/:tab"component={DataModel}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsxnew file mode 100644index 00000000000..8c74981e1db--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.tsx@@ -0,0 +1,46 @@+import { t } from "ttag";++import * as Urls from "metabase/lib/urls";+import {+ DataModelBreadcrumbs,+ PublishedTableBreadcrumbs,+} from "metabase-enterprise/data-studio/common/components/Breadcrumbs";+import type { Measure, Table } from "metabase-types/api";++type MeasureBreadcrumbsProps = {+ table: Table;+ measure?: Measure;+};++export function PublishedTableMeasureBreadcrumbs({+ table,+ measure,+}: MeasureBreadcrumbsProps) {+ return (+ <PublishedTableBreadcrumbs+ table={table}+ entityName={measure?.name}+ newEntityLabel={t`New measure`}+ tableListUrl={Urls.dataStudioTableMeasures(table.id)}+ />+ );+}++export function DataModelMeasureBreadcrumbs({+ table,+ measure,+}: MeasureBreadcrumbsProps) {+ return (+ <DataModelBreadcrumbs+ table={table}+ entityName={measure?.name}+ newEntityLabel={t`New measure`}+ tableListUrl={Urls.dataStudioData({+ databaseId: table.db_id,+ schemaName: table.schema,+ tableId: table.id,+ tab: "measures",+ })}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsxnew file mode 100644index 00000000000..8e10a183f9c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/MeasureBreadcrumbs.unit.spec.tsx@@ -0,0 +1,216 @@+import { Route } from "react-router";++import {+ setupCollectionByIdEndpoint,+ setupSchemaEndpoints,+ setupTablesEndpoints,+} from "__support__/server-mocks";+import { renderWithProviders, screen, waitFor } from "__support__/ui";+import { checkNotNull } from "metabase/lib/types";+import type { Collection, Measure, Table } from "metabase-types/api";+import {+ createMockCollection,+ createMockDatabase,+ createMockMeasure,+ createMockTable,+} from "metabase-types/api/mocks";++import {+ DataModelMeasureBreadcrumbs,+ PublishedTableMeasureBreadcrumbs,+} from "./MeasureBreadcrumbs";++const SINGLE_SCHEMA_DB = createMockDatabase({+ id: 1,+ name: "Sample Database",+ tables: [createMockTable({ schema: "PUBLIC" })],+});++const TEST_TABLE = createMockTable({+ id: 42,+ db_id: SINGLE_SCHEMA_DB.id,+ db: SINGLE_SCHEMA_DB,+ display_name: "Orders",+ schema: "PUBLIC",+ collection_id: 1,+});++const TEST_MEASURE = createMockMeasure({+ id: 1,+ name: "Total Revenue",+ table_id: TEST_TABLE.id,+});++describe("PublishedTableMeasureBreadcrumbs", () => {+ function setup({+ table = TEST_TABLE,+ measure,+ collection = createMockCollection({+ id: 1,+ name: "Data",+ effective_ancestors: [],+ }),+ }: {+ table?: Table;+ measure?: Measure;+ collection?: Collection | null;+ } = {}) {+ if (collection) {+ setupCollectionByIdEndpoint({ collections: [collection] });+ }++ renderWithProviders(+ <Route+ path="/"+ component={() => (+ <PublishedTableMeasureBreadcrumbs table={table} measure={measure} />+ )}+ />,+ { withRouter: true },+ );+ }++ it("renders collection as link, table as link to measures, and measure as text", async () => {+ setup({ measure: TEST_MEASURE });++ await waitFor(() => {+ expect(screen.getByText("Data")).toBeInTheDocument();+ });++ const collectionLink = screen.getByText("Data").closest("a");+ expect(collectionLink).toHaveAttribute("href", "/data-studio/library");++ const tableLink = screen.getByText("Orders").closest("a");+ expect(tableLink).toHaveAttribute(+ "href",+ `/data-studio/library/tables/${TEST_TABLE.id}/measures`,+ );++ const measureText = screen.getByText("Total Revenue");+ expect(measureText.closest("a")).toBeNull();+ });++ it("renders ancestor chain with separators and correct links", async () => {+ const grandparent = createMockCollection({ id: 3, name: "Root" });+ const parent = createMockCollection({+ id: 2,+ name: "Analytics",+ effective_ancestors: [grandparent],+ });+ const collection = createMockCollection({+ id: 1,+ name: "Sales",+ effective_ancestors: [grandparent, parent],+ });++ setup({ collection });++ await waitFor(() => {+ expect(screen.getByText("Root")).toBeInTheDocument();+ });++ expect(screen.getByText("Analytics")).toBeInTheDocument();+ expect(screen.getByText("Sales")).toBeInTheDocument();++ expect(screen.getByText("Root").closest("a")).toHaveAttribute(+ "href",+ `/data-studio/library`,+ );+ expect(screen.getByText("Analytics").closest("a")).toHaveAttribute(+ "href",+ `/data-studio/library?expandedId=${parent.id}`,+ );+ });++ it("uses display_name for table and renders 'New measure' when measure undefined", async () => {+ const tableWithDifferentNames = createMockTable({+ ...TEST_TABLE,+ name: "orders_table",+ display_name: "Customer Orders",+ });++ setup({ table: tableWithDifferentNames, measure: undefined });++ await waitFor(() => {+ expect(screen.getByText("Customer Orders")).toBeInTheDocument();+ });++ expect(screen.queryByText("orders_table")).not.toBeInTheDocument();+ const newMeasureText = screen.getByText("New measure");+ expect(newMeasureText).toBeInTheDocument();+ expect(newMeasureText.closest("a")).toBeNull();+ });++ it("renders without collection when collection_id is null", async () => {+ const tableNoCollection = createMockTable({+ ...TEST_TABLE,+ id: 44,+ display_name: "Unpublished Table",+ collection_id: null,+ });++ setup({ table: tableNoCollection, collection: null });++ await waitFor(() => {+ expect(screen.getByText("Unpublished Table")).toBeInTheDocument();+ });+ });+});++describe("DataModelMeasureBreadcrumbs", () => {+ function setup({+ table = TEST_TABLE,+ measure,+ }: {+ table?: Table;+ measure?: Measure;+ } = {}) {+ setupTablesEndpoints([table]);+ setupSchemaEndpoints(checkNotNull(table.db));++ renderWithProviders(+ <Route+ path="/"+ component={() => (+ <DataModelMeasureBreadcrumbs table={table} measure={measure} />+ )}+ />,+ { withRouter: true },+ );+ }++ it("renders database as link, table as link to measures tab, and measure as text", async () => {+ setup({ measure: TEST_MEASURE });++ await waitFor(() => {+ expect(screen.getByText("Sample Database")).toBeInTheDocument();+ });++ const dbLink = screen.getByText("Sample Database").closest("a");+ expect(dbLink).toHaveAttribute(+ "href",+ `/data-studio/data/database/${SINGLE_SCHEMA_DB.id}`,+ );++ const tableLink = screen.getByText("Orders").closest("a");+ expect(tableLink).toHaveAttribute(+ "href",+ `/data-studio/data/database/${SINGLE_SCHEMA_DB.id}/schema/${SINGLE_SCHEMA_DB.id}:PUBLIC/table/${TEST_TABLE.id}/measures`,+ );++ const measureText = screen.getByText("Total Revenue");+ expect(measureText.closest("a")).toBeNull();+ });++ it("hides schema when single schema, shows separators, and renders 'New measure' when undefined", async () => {+ setup({ measure: undefined });++ await waitFor(() => {+ expect(screen.getByText("Sample Database")).toBeInTheDocument();+ });++ expect(screen.queryByText("PUBLIC")).not.toBeInTheDocument();+ expect(screen.getByText("Orders")).toBeInTheDocument();+ expect(screen.getByText("New measure")).toBeInTheDocument();+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/index.tsnew file mode 100644index 00000000000..7612b56b556--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureBreadcrumbs/index.ts@@ -0,0 +1,4 @@+export {+ DataModelMeasureBreadcrumbs,+ PublishedTableMeasureBreadcrumbs,+} from "./MeasureBreadcrumbs";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.module.cssnew file mode 100644index 00000000000..250a3874179--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.module.css@@ -0,0 +1,7 @@+.scrollable {+ overflow: auto;+}++.descriptionLabel {+ margin-bottom: 0.75rem;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsxnew file mode 100644index 00000000000..c373a58e093--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/MeasureEditor.tsx@@ -0,0 +1,41 @@+import { t } from "ttag";++import { MeasureAggregationPicker } from "metabase/querying/measures";+import { Card, Stack, TextInput } from "metabase/ui";+import type * as Lib from "metabase-lib";++import S from "./MeasureEditor.module.css";++type MeasureEditorProps = {+ query: Lib.Query | undefined;+ description: string;+ onQueryChange: (query: Lib.Query) => void;+ onDescriptionChange: (description: string) => void;+};++export function MeasureEditor({+ query,+ description,+ onQueryChange,+ onDescriptionChange,+}: MeasureEditorProps) {+ return (+ <Card withBorder p="xl">+ <Stack flex={1} gap="xl" p={0} className={S.scrollable}>+ {query && (+ <MeasureAggregationPicker query={query} onChange={onQueryChange} />+ )}+ <TextInput+ label={t`Give it a description`}+ placeholder={t`Only if it really needs it`}+ value={description}+ onChange={(e) => onDescriptionChange(e.target.value)}+ maw={400}+ classNames={{+ label: S.descriptionLabel,+ }}+ />+ </Stack>+ </Card>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/index.tsnew file mode 100644index 00000000000..6a9a0ff6757--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureEditor/index.ts@@ -0,0 +1 @@+export { MeasureEditor } from "./MeasureEditor";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsxnew file mode 100644index 00000000000..62703eb08ef--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/MeasureHeader.tsx@@ -0,0 +1,93 @@+import type { ReactNode } from "react";+import { t } from "ttag";++import { useUpdateMeasureMutation } from "metabase/api";+import { useMetadataToasts } from "metabase/metadata/hooks";+import { Stack } from "metabase/ui";+import { EntityDetailTabs } from "metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";+import {+ PaneHeader,+ PaneHeaderInput,+} from "metabase-enterprise/data-studio/common/components/PaneHeader";+import type { Measure } from "metabase-types/api";++import type { MeasureTabUrls } from "../../types";+import { MeasureMoreMenu } from "../MeasureMoreMenu";++const MEASURE_NAME_MAX_LENGTH = 254;++type MeasureHeaderProps = {+ measure: Measure;+ tabUrls: MeasureTabUrls;+ previewUrl?: string;+ onRemove: () => void;+ onNameChange?: (name: string) => void;+ breadcrumbs?: ReactNode;+ actions?: ReactNode;+};++export function MeasureHeader({+ measure,+ tabUrls,+ previewUrl,+ onRemove,+ onNameChange,+ breadcrumbs,+ actions,+}: MeasureHeaderProps) {+ return (+ <Stack gap={0}>+ <PaneHeader+ data-testid="measure-pane-header"+ title={+ <MeasureNameInput measure={measure} onNameChange={onNameChange} />+ }+ icon="sum"+ menu={<MeasureMoreMenu previewUrl={previewUrl} onRemove={onRemove} />}+ tabs={<EntityDetailTabs urls={tabUrls} />}+ actions={actions}+ breadcrumbs={breadcrumbs}+ />+ </Stack>+ );+}++type MeasureNameInputProps = {+ measure: Measure;+ onNameChange?: (name: string) => void;+};++function MeasureNameInput({ measure, onNameChange }: MeasureNameInputProps) {+ const [updateMeasure] = useUpdateMeasureMutation();+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();++ const handleChange = async (newName: string) => {+ onNameChange?.(newName);++ if (newName === measure.name) {+ return;+ }++ const { error } = await updateMeasure({+ id: measure.id,+ name: newName,+ revision_message: t`Updated measure name`,+ });++ if (error) {+ sendErrorToast(t`Failed to update measure name`);+ } else {+ sendSuccessToast(t`Measure name updated`);+ }+ };++ return (+ <PaneHeaderInput+ initialValue={measure.name}+ placeholder={t`New measure`}+ maxLength={MEASURE_NAME_MAX_LENGTH}+ onChange={handleChange}+ onContentChange={onNameChange}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/index.tsnew file mode 100644index 00000000000..a0630403a48--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureHeader/index.ts@@ -0,0 +1 @@+export { MeasureHeader } from "./MeasureHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsxnew file mode 100644index 00000000000..715356e7fae--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/MeasureMoreMenu.tsx@@ -0,0 +1,24 @@+import { t } from "ttag";++import { MoreMenu } from "metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu";++type MeasureMoreMenuProps = {+ previewUrl?: string;+ onRemove?: () => void;+};++export function MeasureMoreMenu({+ previewUrl,+ onRemove,+}: MeasureMoreMenuProps) {+ return (+ <MoreMenu+ previewUrl={previewUrl}+ onRemove={onRemove}+ ariaLabel={t`Measure actions`}+ removeLabel={t`Remove measure`}+ removeTitle={t`Remove this measure?`}+ removeMessage={t`This measure will be permanently removed.`}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/index.tsnew file mode 100644index 00000000000..1ddeb63207a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureMoreMenu/index.ts@@ -0,0 +1 @@+export { MeasureMoreMenu } from "./MeasureMoreMenu";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsxnew file mode 100644index 00000000000..cda2de4a2ae--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.tsx@@ -0,0 +1,51 @@+import { t } from "ttag";++import type { Measure, Revision } from "metabase-types/api";++import { RevisionHistoryTimeline } from "../../../components/RevisionHistory";++type MeasureRevisionHistoryProps = {+ measure: Measure;+};++export function MeasureRevisionHistory({+ measure,+}: MeasureRevisionHistoryProps) {+ return (+ <RevisionHistoryTimeline+ entityType="measure"+ entityId={measure.id}+ tableId={measure.table_id}+ getActionDescription={getMeasureActionDescription}+ definitionLabel={t`Aggregation`}+ definitionType="aggregations"+ />+ );+}++function getMeasureActionDescription(revision: Revision): string {+ if (revision.is_creation) {+ return t`created this measure`;+ }+ if (revision.is_reversion) {+ return t`reverted to a previous version`;+ }++ const changedKeys = Object.keys(revision.diff || {});+ if (changedKeys.length === 1) {+ switch (changedKeys[0]) {+ case "name":+ return t`renamed the measure`;+ case "description":+ return t`updated the description`;+ case "definition":+ return t`changed the aggregation definition`;+ }+ }++ if (changedKeys.length > 1) {+ return t`made multiple changes`;+ }++ return t`made changes`;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsxnew file mode 100644index 00000000000..2cb9c1b280c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/MeasureRevisionHistory.unit.spec.tsx@@ -0,0 +1,295 @@+import fetchMock from "fetch-mock";++import { setupMeasureRevisionsEndpoint } from "__support__/server-mocks";+import {+ renderWithProviders,+ screen,+ waitForLoaderToBeRemoved,+} from "__support__/ui";+import type { Measure, Revision } from "metabase-types/api";+import {+ createMockMeasure,+ createMockRevision,+ createMockUser,+} from "metabase-types/api/mocks";+import { createMockState } from "metabase-types/store/mocks";++import { MeasureRevisionHistory } from "./MeasureRevisionHistory";++const TEST_MEASURE = createMockMeasure({+ id: 1,+ name: "Test Measure",+ table_id: 42,+});++type SetupOpts = {+ measure?: Measure;+ revisions?: Revision[];+ hasError?: boolean;+ currentUserId?: number;+};++function setup({+ measure = TEST_MEASURE,+ revisions = [],+ hasError = false,+ currentUserId = 1,+}: SetupOpts = {}) {+ if (hasError) {+ fetchMock.get(`path:/api/revision?entity=measure&id=${measure.id}`, {+ status: 500,+ body: "Server error",+ });+ } else {+ setupMeasureRevisionsEndpoint(measure.id, revisions);+ }++ const storeInitialState = createMockState({+ currentUser: createMockUser({+ id: currentUserId,+ first_name: "Current",+ last_name: "User",+ common_name: "Current User",+ }),+ });++ renderWithProviders(<MeasureRevisionHistory measure={measure} />, {+ storeInitialState,+ });+}++describe("MeasureRevisionHistory", () => {+ it("shows loading state while fetching revisions", async () => {+ setup({ revisions: [] });+ expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();+ await waitForLoaderToBeRemoved();+ });++ it("shows error state when API fails", async () => {+ setup({ hasError: true });+ await waitForLoaderToBeRemoved();+ expect(screen.getByText("Server error")).toBeInTheDocument();+ });++ it("shows empty state message when no revisions exist", async () => {+ setup({ revisions: [] });+ await waitForLoaderToBeRemoved();++ expect(+ screen.getByText("No revision history available."),+ ).toBeInTheDocument();+ });++ it("renders revision with user name, action, and avatar initials", async () => {+ const revisions = [+ createMockRevision({+ id: 1,+ is_creation: true,+ user: {+ id: 99,+ first_name: "John",+ last_name: "Doe",+ common_name: "John Doe",+ },+ }),+ ];++ setup({ revisions });+ await waitForLoaderToBeRemoved();++ expect(screen.getByText("John Doe")).toBeInTheDocument();+ expect(screen.getByText("created this measure")).toBeInTheDocument();+ expect(screen.getByText("JD")).toBeInTheDocument();+ });++ it("shows 'You' instead of name for current user's revisions", async () => {+ const revisions = [+ createMockRevision({+ id: 1,+ is_creation: true,+ user: {+ id: 1,+ first_name: "Current",+ last_name: "User",+ common_name: "Current User",+ },+ }),+ ];++ setup({ revisions, currentUserId: 1 });+ await waitForLoaderToBeRemoved();++ expect(screen.getByText("You")).toBeInTheDocument();+ expect(screen.queryByText("Current User")).not.toBeInTheDocument();+ });++ it("displays multiple revision items with different users", async () => {+ const revisions = [+ createMockRevision({+ id: 2,+ is_creation: false,+ diff: { name: { before: "Old", after: "New" } },+ user: {+ id: 98,+ first_name: "Alice",+ last_name: "Smith",+ common_name: "Alice Smith",+ },+ }),+ createMockRevision({+ id: 1,+ is_creation: true,+ user: {+ id: 99,+ first_name: "Bob",+ last_name: "Jones",+ common_name: "Bob Jones",+ },+ }),+ ];++ setup({ revisions });+ await waitForLoaderToBeRemoved();++ expect(screen.getByText("Alice Smith")).toBeInTheDocument();+ expect(screen.getByText("Bob Jones")).toBeInTheDocument();+ expect(screen.getByText("renamed the measure")).toBeInTheDocument();+ expect(screen.getByText("created this measure")).toBeInTheDocument();+ });++ it("shows correct action descriptions for different change types", async () => {+ const revisions = [+ createMockRevision({+ id: 4,+ is_creation: false,+ is_reversion: true,+ user: {+ id: 96,+ first_name: "D",+ last_name: "D",+ common_name: "User D",+ },+ }),+ createMockRevision({+ id: 3,+ is_creation: false,+ diff: { description: { before: "Old", after: "New" } },+ user: {+ id: 97,+ first_name: "C",+ last_name: "C",+ common_name: "User C",+ },+ }),+ createMockRevision({+ id: 2,+ is_creation: false,+ diff: {+ definition: {+ before: { aggregation: [["sum", ["field", 1, null]]] },+ after: { aggregation: [["count"]] },+ },+ },+ user: {+ id: 98,+ first_name: "B",+ last_name: "B",+ common_name: "User B",+ },+ }),+ createMockRevision({+ id: 1,+ is_creation: true,+ user: {+ id: 99,+ first_name: "A",+ last_name: "A",+ common_name: "User A",+ },+ }),+ ];++ setup({ revisions });+ await waitForLoaderToBeRemoved();++ expect(+ screen.getByText("reverted to a previous version"),+ ).toBeInTheDocument();+ expect(screen.getByText("updated the description")).toBeInTheDocument();+ expect(+ screen.getByText("changed the aggregation definition"),+ ).toBeInTheDocument();+ expect(screen.getByText("created this measure")).toBeInTheDocument();+ });++ it("shows 'made multiple changes' for multi-field updates and 'made changes' for empty diff", async () => {+ const revisions = [+ createMockRevision({+ id: 2,+ is_creation: false,+ diff: {+ name: { before: "Old", after: "New" },+ description: { before: "Old desc", after: "New desc" },+ },+ user: {+ id: 98,+ first_name: "A",+ last_name: "A",+ common_name: "User A",+ },+ }),+ createMockRevision({+ id: 1,+ is_creation: false,+ diff: {},+ user: {+ id: 99,+ first_name: "B",+ last_name: "B",+ common_name: "User B",+ },+ }),+ ];++ setup({ revisions });+ await waitForLoaderToBeRemoved();++ expect(screen.getByText("made multiple changes")).toBeInTheDocument();+ expect(screen.getByText("made changes")).toBeInTheDocument();+ });++ it("displays revision message when provided, omits when null", async () => {+ const revisions = [+ createMockRevision({+ id: 2,+ is_creation: false,+ message: "Updated from Data Studio",+ diff: { name: { before: "Old", after: "New" } },+ user: {+ id: 98,+ first_name: "A",+ last_name: "A",+ common_name: "User A",+ },+ }),+ createMockRevision({+ id: 1,+ is_creation: false,+ message: null,+ diff: { description: { before: "Old", after: "New" } },+ user: {+ id: 99,+ first_name: "B",+ last_name: "B",+ common_name: "User B",+ },+ }),+ ];++ setup({ revisions });+ await waitForLoaderToBeRemoved();++ expect(screen.getByText("Updated from Data Studio")).toBeInTheDocument();+ expect(screen.getAllByText(/User [AB]/)).toHaveLength(2);+ });+});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/index.tsnew file mode 100644index 00000000000..b017e07e2c4--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/MeasureRevisionHistory/index.ts@@ -0,0 +1 @@+export { MeasureRevisionHistory } from "./MeasureRevisionHistory";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsxnew file mode 100644index 00000000000..8e952a50cc3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/NewMeasureHeader.tsx@@ -0,0 +1,44 @@+import type { ReactNode } from "react";+import { t } from "ttag";++import EditableText from "metabase/common/components/EditableText";+import { PaneHeader } from "metabase-enterprise/data-studio/common/components/PaneHeader";++import { MeasureMoreMenu } from "../MeasureMoreMenu";++const MEASURE_NAME_MAX_LENGTH = 254;++type NewMeasureHeaderProps = {+ breadcrumbs: ReactNode;+ previewUrl?: string;+ onNameChange: (name: string) => void;+ actions?: ReactNode;+};++export function NewMeasureHeader({+ breadcrumbs,+ previewUrl,+ onNameChange,+ actions,+}: NewMeasureHeaderProps) {+ return (+ <PaneHeader+ data-testid="measure-pane-header"+ title={+ <EditableText+ initialValue=""+ placeholder={t`New measure`}+ maxLength={MEASURE_NAME_MAX_LENGTH}+ p={0}+ fw="bold"+ fz="h3"+ lh="h3"+ onContentChange={onNameChange}+ />+ }+ menu={previewUrl && <MeasureMoreMenu previewUrl={previewUrl} />}+ actions={actions}+ breadcrumbs={breadcrumbs}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/index.tsnew file mode 100644index 00000000000..5717e5adc8f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/components/NewMeasureHeader/index.ts@@ -0,0 +1 @@+export { NewMeasureHeader } from "./NewMeasureHeader";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/index.tsnew file mode 100644index 00000000000..3aa65373fe8--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/index.ts@@ -0,0 +1,2 @@+export { useDataModelMeasurePage } from "./use-data-model-measure-page";+export { usePublishedTableMeasurePage } from "./use-published-table-measure-page";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-data-model-measure-page.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-data-model-measure-page.tsnew file mode 100644index 00000000000..af5da41f373--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-data-model-measure-page.ts@@ -0,0 +1,109 @@+import { useCallback, useMemo } from "react";+import { push } from "react-router-redux";+import { t } from "ttag";++import {+ skipToken,+ useGetMeasureQuery,+ useUpdateMeasureMutation,+} from "metabase/api";+import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";+import { useMetadataToasts } from "metabase/metadata/hooks";+import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";++import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";+import type { MeasureTabUrls } from "../types";++type DataModelMeasurePageParams = {+ databaseId: string;+ schemaId: string;+ tableId: string;+ measureId: string;+};++export function useDataModelMeasurePage(params: DataModelMeasurePageParams) {+ const dispatch = useDispatch();+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();+ const [updateMeasure] = useUpdateMeasureMutation();++ const databaseId = Number(params.databaseId);+ const schemaName = getSchemaName(params.schemaId);+ const tableId = Urls.extractEntityId(params.tableId);+ const measureId = Urls.extractEntityId(params.measureId);++ const {+ data: measure,+ isLoading: isLoadingMeasure,+ error: measureError,+ } = useGetMeasureQuery(measureId ?? skipToken);++ const {+ table,+ isLoading: isLoadingTable,+ error: tableError,+ } = useLoadTableWithMetadata(measure?.table_id, {+ includeForeignTables: true,+ });++ const handleRemove = useCallback(async () => {+ if (measure == null || tableId == null || schemaName == null) {+ return;+ }++ const { error } = await updateMeasure({+ id: measure.id,+ archived: true,+ revision_message: t`Removed from Data Studio`,+ });++ if (error) {+ sendErrorToast(t`Failed to remove measure`);+ } else {+ sendSuccessToast(t`Measure removed`);+ dispatch(+ push(+ Urls.dataStudioData({+ databaseId,+ schemaName,+ tableId,+ tab: "measures",+ }),+ ),+ );+ }+ }, [+ measure,+ tableId,+ schemaName,+ databaseId,+ updateMeasure,+ dispatch,+ sendSuccessToast,+ sendErrorToast,+ ]);++ const isLoading = isLoadingMeasure || isLoadingTable;+ const error = measureError ?? tableError;++ const tabUrls: MeasureTabUrls | null = useMemo(() => {+ if (tableId == null || schemaName == null || measureId == null) {+ return null;+ }+ const urlParams = { databaseId, schemaName, tableId, measureId };+ return {+ definition: Urls.dataStudioDataModelMeasure(urlParams),+ revisions: Urls.dataStudioDataModelMeasureRevisions(urlParams),+ dependencies: Urls.dataStudioDataModelMeasureDependencies(urlParams),+ };+ }, [databaseId, schemaName, tableId, measureId]);++ return {+ isLoading,+ error,+ measure: measure ?? null,+ table: table ?? null,+ tabUrls,+ onRemove: handleRemove,+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-measure-query.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-measure-query.tsnew file mode 100644index 00000000000..815ad42ac62--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-measure-query.ts@@ -0,0 +1,33 @@+import { useMemo } from "react";++import * as Lib from "metabase-lib";+import type Metadata from "metabase-lib/v1/metadata/Metadata";+import type { DatasetQuery } from "metabase-types/api";++type UseMeasureQueryResult = {+ query: Lib.Query | undefined;+ aggregations: Lib.AggregationClause[];+};++export function useMeasureQuery(+ definition: DatasetQuery | null,+ metadata: Metadata,+): UseMeasureQueryResult {+ const query = useMemo(() => {+ if (!definition?.database) {+ return undefined;+ }+ const metadataProvider = Lib.metadataProvider(+ definition.database,+ metadata,+ );+ return Lib.fromJsQuery(metadataProvider, definition);+ }, [metadata, definition]);++ const aggregations = useMemo(+ () => (query ? Lib.aggregations(query, -1) : []),+ [query],+ );++ return { query, aggregations };+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-published-table-measure-page.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-published-table-measure-page.tsnew file mode 100644index 00000000000..7d9146d0a23--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/hooks/use-published-table-measure-page.ts@@ -0,0 +1,93 @@+import { useCallback, useMemo } from "react";+import { push } from "react-router-redux";+import { t } from "ttag";++import {+ skipToken,+ useGetMeasureQuery,+ useUpdateMeasureMutation,+} from "metabase/api";+import { useToast } from "metabase/common/hooks/use-toast";+import { useDispatch } from "metabase/lib/redux";+import * as Urls from "metabase/lib/urls";++import { useLoadTableWithMetadata } from "../../common/hooks/use-load-table-with-metadata";+import type { MeasureTabUrls } from "../types";++type PublishedTableMeasurePageParams = {+ tableId: string;+ measureId: string;+};++export function usePublishedTableMeasurePage(+ params: PublishedTableMeasurePageParams,+) {+ const dispatch = useDispatch();+ const [sendToast] = useToast();+ const [updateMeasure] = useUpdateMeasureMutation();++ const tableId = Urls.extractEntityId(params.tableId);+ const measureId = Urls.extractEntityId(params.measureId);++ const {+ data: measure,+ isLoading: isLoadingMeasure,+ error: measureError,+ } = useGetMeasureQuery(measureId ?? skipToken);++ const {+ table,+ isLoading: isLoadingTable,+ error: tableError,+ } = useLoadTableWithMetadata(measure?.table_id, {+ includeForeignTables: true,+ });++ const handleRemove = useCallback(async () => {+ if (measure == null || tableId == null) {+ return;+ }++ const { error } = await updateMeasure({+ id: measure.id,+ archived: true,+ revision_message: t`Removed from Data Studio`,+ });++ if (error) {+ sendToast({ icon: "warning", message: t`Failed to remove measure` });+ } else {+ sendToast({ icon: "check", message: t`Measure removed` });+ dispatch(push(Urls.dataStudioTableMeasures(tableId)));+ }+ }, [measure, tableId, updateMeasure, dispatch, sendToast]);++ const isLoading = isLoadingMeasure || isLoadingTable;+ const error = measureError ?? tableError;++ const tabUrls: MeasureTabUrls | null = useMemo(() => {+ if (tableId == null || measureId == null) {+ return null;+ }+ return {+ definition: Urls.dataStudioPublishedTableMeasure(tableId, measureId),+ revisions: Urls.dataStudioPublishedTableMeasureRevisions(+ tableId,+ measureId,+ ),+ dependencies: Urls.dataStudioPublishedTableMeasureDependencies(+ tableId,+ measureId,+ ),+ };+ }, [tableId, measureId]);++ return {+ isLoading,+ error,+ measure: measure ?? null,+ table: table ?? null,+ tabUrls,+ onRemove: handleRemove,+ };+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsxnew file mode 100644index 00000000000..02fc86527a5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/DataModelMeasureDependenciesPage.tsx@@ -0,0 +1,49 @@+import type { ReactNode } from "react";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { useDataModelMeasurePage } from "../../hooks";+import { MeasureDependenciesPage } from "../MeasureDependenciesPage";++type DataModelMeasureDependenciesPageParams = {+ databaseId: string;+ schemaId: string;+ tableId: string;+ measureId: string;+};++type DataModelMeasureDependenciesPageProps = {+ params: DataModelMeasureDependenciesPageParams;+ children?: ReactNode;+};++export function DataModelMeasureDependenciesPage({+ params,+ children,+}: DataModelMeasureDependenciesPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ useDataModelMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureDependenciesPage+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <DataModelMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ >+ {children}+ </MeasureDependenciesPage>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.tsnew file mode 100644index 00000000000..3ca072fa9fe--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDependenciesPage/index.ts@@ -0,0 +1 @@+export { DataModelMeasureDependenciesPage } from "./DataModelMeasureDependenciesPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsxnew file mode 100644index 00000000000..f85db818d0f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/DataModelMeasureDetailPage.tsx@@ -0,0 +1,48 @@+import type { Route } from "react-router";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { useDataModelMeasurePage } from "../../hooks";+import { MeasureDetailPage } from "../MeasureDetailPage";++type DataModelMeasureDetailPageParams = {+ databaseId: string;+ schemaId: string;+ tableId: string;+ measureId: string;+};++type DataModelMeasureDetailPageProps = {+ params: DataModelMeasureDetailPageParams;+ route: Route;+};++export function DataModelMeasureDetailPage({+ params,+ route,+}: DataModelMeasureDetailPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ useDataModelMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureDetailPage+ route={route}+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <DataModelMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/index.tsnew file mode 100644index 00000000000..41ca67da5a1--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureDetailPage/index.ts@@ -0,0 +1 @@+export { DataModelMeasureDetailPage } from "./DataModelMeasureDetailPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsxnew file mode 100644index 00000000000..9b97a915153--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/DataModelMeasureRevisionHistoryPage.tsx@@ -0,0 +1,43 @@+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { useDataModelMeasurePage } from "../../hooks";+import { MeasureRevisionHistoryPage } from "../MeasureRevisionHistoryPage";++type DataModelMeasureRevisionHistoryPageParams = {+ databaseId: string;+ schemaId: string;+ tableId: string;+ measureId: string;+};++type DataModelMeasureRevisionHistoryPageProps = {+ params: DataModelMeasureRevisionHistoryPageParams;+};++export function DataModelMeasureRevisionHistoryPage({+ params,+}: DataModelMeasureRevisionHistoryPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ useDataModelMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureRevisionHistoryPage+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <DataModelMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.tsnew file mode 100644index 00000000000..a7ee1d46bad--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelMeasureRevisionHistoryPage/index.ts@@ -0,0 +1 @@+export { DataModelMeasureRevisionHistoryPage } from "./DataModelMeasureRevisionHistoryPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsxnew file mode 100644index 00000000000..be7c0951271--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/DataModelNewMeasurePage.tsx@@ -0,0 +1,60 @@+import type { ReactNode } from "react";+import type { Route } from "react-router";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import * as Urls from "metabase/lib/urls";+import { Center } from "metabase/ui";+import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";+import { getSchemaName } from "metabase-lib/v1/metadata/utils/schema";++import { DataModelMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { NewMeasurePage } from "../NewMeasurePage";++type DataModelNewMeasurePageParams = {+ databaseId: string;+ schemaId: string;+ tableId: string;+};++type DataModelNewMeasurePageProps = {+ params: DataModelNewMeasurePageParams;+ route: Route;+ children?: ReactNode;+};++export function DataModelNewMeasurePage({+ params,+ route,+}: DataModelNewMeasurePageProps) {+ const databaseId = Number(params.databaseId);+ const schemaName = getSchemaName(params.schemaId);+ const tableId = Urls.extractEntityId(params.tableId);++ const { table, isLoading, error } = useLoadTableWithMetadata(tableId, {+ includeForeignTables: true,+ });++ if (isLoading || error || !table || tableId == null || schemaName == null) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <NewMeasurePage+ route={route}+ table={table}+ breadcrumbs={<DataModelMeasureBreadcrumbs table={table} />}+ getSuccessUrl={(measure) =>+ Urls.dataStudioDataModelMeasure({+ databaseId,+ schemaName,+ tableId,+ measureId: measure.id,+ })+ }+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/index.tsnew file mode 100644index 00000000000..a726426916a--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/DataModelNewMeasurePage/index.ts@@ -0,0 +1 @@+export { DataModelNewMeasurePage } from "./DataModelNewMeasurePage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsxnew file mode 100644index 00000000000..3611e52e589--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/MeasureDependenciesPage.tsx@@ -0,0 +1,48 @@+import type { ReactNode } from "react";++import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { Card } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";+import type { Measure } from "metabase-types/api";++import { MeasureHeader } from "../../components/MeasureHeader";+import type { MeasureTabUrls } from "../../types";++type MeasureDependenciesPageProps = {+ measure: Measure;+ tabUrls: MeasureTabUrls;+ breadcrumbs: ReactNode;+ onRemove: () => Promise<void>;+ children?: ReactNode;+};++export function MeasureDependenciesPage({+ measure,+ tabUrls,+ breadcrumbs,+ onRemove,+ children,+}: MeasureDependenciesPageProps) {+ return (+ <PageContainer data-testid="measure-dependencies-page">+ <MeasureHeader+ measure={measure}+ tabUrls={tabUrls}+ previewUrl={getDatasetQueryPreviewUrl(measure.definition)}+ onRemove={onRemove}+ breadcrumbs={breadcrumbs}+ />+ <PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider+ value={{+ baseUrl: tabUrls.dependencies,+ defaultEntry: { id: measure.id, type: "measure" },+ }}+ >+ <Card withBorder p={0} flex={1}>+ {children}+ </Card>+ </PLUGIN_DEPENDENCIES.DependencyGraphPageContext.Provider>+ </PageContainer>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/index.tsnew file mode 100644index 00000000000..e453c2cf737--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDependenciesPage/index.ts@@ -0,0 +1 @@+export { MeasureDependenciesPage } from "./MeasureDependenciesPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsxnew file mode 100644index 00000000000..78178333dd6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/MeasureDetailPage.tsx@@ -0,0 +1,134 @@+import type { ReactNode } from "react";+import { useCallback, useMemo, useState } from "react";+import type { Route } from "react-router";+import { t } from "ttag";++import { useUpdateMeasureMutation } from "metabase/api";+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";+import { useSelector } from "metabase/lib/redux";+import { useMetadataToasts } from "metabase/metadata/hooks";+import { getMetadata } from "metabase/selectors/metadata";+import { Button, Group } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";+import * as Lib from "metabase-lib";+import type { Measure } from "metabase-types/api";++import { MeasureEditor } from "../../components/MeasureEditor";+import { MeasureHeader } from "../../components/MeasureHeader";+import { useMeasureQuery } from "../../hooks/use-measure-query";+import type { MeasureTabUrls } from "../../types";++type MeasureDetailPageProps = {+ route: Route;+ measure: Measure;+ tabUrls: MeasureTabUrls;+ breadcrumbs: ReactNode;+ onRemove: () => Promise<void>;+};++export function MeasureDetailPage({+ route,+ measure,+ tabUrls,+ breadcrumbs,+ onRemove,+}: MeasureDetailPageProps) {+ const metadata = useSelector(getMetadata);+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();++ const [description, setDescription] = useState(measure.description ?? "");+ const [definition, setDefinition] = useState(measure.definition);+ const [savedMeasure, setSavedMeasure] = useState(measure);++ const { query, aggregations } = useMeasureQuery(definition, metadata);++ const isDirty = useMemo(+ () =>+ description !== (savedMeasure.description ?? "") ||+ !Lib.areLegacyQueriesEqual(definition, savedMeasure.definition),+ [description, definition, savedMeasure],+ );++ const isValid = aggregations.length === 1;+ const previewUrl = isValid+ ? getDatasetQueryPreviewUrl(definition)+ : undefined;++ const setQuery = useCallback((newQuery: Lib.Query) => {+ setDefinition(Lib.toJsQuery(newQuery));+ }, []);++ const [updateMeasure, { isLoading: isSaving }] = useUpdateMeasureMutation();++ const handleSave = useCallback(async () => {+ if (!isValid) {+ return;+ }+ const { error } = await updateMeasure({+ id: measure.id,+ name: measure.name,+ description: description.trim() || undefined,+ definition: definition,+ revision_message: t`Updated from Data Studio`,+ });++ if (error) {+ sendErrorToast(t`Failed to update measure`);+ } else {+ setSavedMeasure({ ...measure, description, definition });+ sendSuccessToast(t`Measure updated`);+ }+ }, [+ measure,+ definition,+ description,+ isValid,+ updateMeasure,+ sendSuccessToast,+ sendErrorToast,+ ]);++ const handleReset = useCallback(() => {+ setDescription(savedMeasure.description ?? "");+ setDefinition(savedMeasure.definition);+ }, [savedMeasure]);++ return (+ <PageContainer data-testid="measure-detail-page">+ <MeasureHeader+ measure={measure}+ tabUrls={tabUrls}+ previewUrl={previewUrl}+ onRemove={onRemove}+ breadcrumbs={breadcrumbs}+ actions={+ isDirty && (+ <Group gap="sm">+ <Button onClick={handleReset}>{t`Cancel`}</Button>+ <Button+ variant="filled"+ disabled={!isValid}+ loading={isSaving}+ onClick={handleSave}+ >+ {t`Save`}+ </Button>+ </Group>+ )+ }+ />+ <MeasureEditor+ query={query}+ description={description}+ onQueryChange={setQuery}+ onDescriptionChange={setDescription}+ />+ <LeaveRouteConfirmModal+ key={measure.id}+ route={route}+ isEnabled={isDirty && !isSaving}+ />+ </PageContainer>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/index.tsnew file mode 100644index 00000000000..3338a3c46ad--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureDetailPage/index.ts@@ -0,0 +1 @@+export { MeasureDetailPage } from "./MeasureDetailPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.cssnew file mode 100644index 00000000000..fa3469e028e--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.module.css@@ -0,0 +1,3 @@+.scrollable {+ overflow: auto;+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsxnew file mode 100644index 00000000000..0485688405d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/MeasureRevisionHistoryPage.tsx@@ -0,0 +1,41 @@+import type { ReactNode } from "react";++import { Stack } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";+import type { Measure } from "metabase-types/api";++import { MeasureHeader } from "../../components/MeasureHeader";+import { MeasureRevisionHistory } from "../../components/MeasureRevisionHistory";+import type { MeasureTabUrls } from "../../types";++import S from "./MeasureRevisionHistoryPage.module.css";++type MeasureRevisionHistoryPageProps = {+ measure: Measure;+ tabUrls: MeasureTabUrls;+ breadcrumbs: ReactNode;+ onRemove: () => Promise<void>;+};++export function MeasureRevisionHistoryPage({+ measure,+ tabUrls,+ breadcrumbs,+ onRemove,+}: MeasureRevisionHistoryPageProps) {+ return (+ <PageContainer data-testid="measure-revision-history-page">+ <MeasureHeader+ measure={measure}+ tabUrls={tabUrls}+ previewUrl={getDatasetQueryPreviewUrl(measure.definition)}+ onRemove={onRemove}+ breadcrumbs={breadcrumbs}+ />+ <Stack flex={1} className={S.scrollable}>+ <MeasureRevisionHistory measure={measure} />+ </Stack>+ </PageContainer>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/index.tsnew file mode 100644index 00000000000..6af796f4197--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/MeasureRevisionHistoryPage/index.ts@@ -0,0 +1 @@+export { MeasureRevisionHistoryPage } from "./MeasureRevisionHistoryPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsxnew file mode 100644index 00000000000..3f6d0840d78--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/NewMeasurePage.tsx@@ -0,0 +1,127 @@+import type { ReactNode } from "react";+import { useCallback, useEffect, useRef, useState } from "react";+import type { Route } from "react-router";+import { push } from "react-router-redux";+import { t } from "ttag";++import { useCreateMeasureMutation } from "metabase/api";+import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";+import { useDispatch, useSelector } from "metabase/lib/redux";+import { useMetadataToasts } from "metabase/metadata/hooks";+import { getMetadata } from "metabase/selectors/metadata";+import { Button } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";+import * as Lib from "metabase-lib";+import type { DatasetQuery, Measure, Table } from "metabase-types/api";++import { MeasureEditor } from "../../components/MeasureEditor";+import { NewMeasureHeader } from "../../components/NewMeasureHeader";+import { useMeasureQuery } from "../../hooks/use-measure-query";+import { createInitialQueryForTable } from "../../utils/measure-query";++type NewMeasurePageProps = {+ route: Route;+ table: Table;+ breadcrumbs: ReactNode;+ getSuccessUrl: (measure: Measure) => string;+};++export function NewMeasurePage({+ route,+ table,+ breadcrumbs,+ getSuccessUrl,+}: NewMeasurePageProps) {+ const dispatch = useDispatch();+ const metadata = useSelector(getMetadata);+ const { sendSuccessToast, sendErrorToast } = useMetadataToasts();++ const [name, setName] = useState("");+ const [description, setDescription] = useState("");+ const [definition, setDefinition] = useState<DatasetQuery | null>(null);++ const isInitialized = useRef(false);++ useEffect(() => {+ if (table && !isInitialized.current) {+ isInitialized.current = true;+ setDefinition(createInitialQueryForTable(table, metadata));+ }+ }, [table, metadata]);++ const { query, aggregations } = useMeasureQuery(definition, metadata);++ const isDirty =+ name.trim().length > 0 || description.length > 0 || aggregations.length > 0;+ const isValid = name.trim().length > 0 && aggregations.length === 1;+ const previewUrl =+ aggregations.length === 1+ ? getDatasetQueryPreviewUrl(definition)+ : undefined;++ const setQuery = useCallback((newQuery: Lib.Query) => {+ setDefinition(Lib.toJsQuery(newQuery));+ }, []);++ const [createMeasure, { isLoading: isSaving }] = useCreateMeasureMutation();++ const handleSave = useCallback(async () => {+ if (!table || !definition || !isValid) {+ return;+ }+ const { data: measure, error } = await createMeasure({+ name: name.trim(),+ table_id: table.id,+ definition: definition,+ description: description.trim() || undefined,+ });++ if (error) {+ sendErrorToast(t`Failed to create measure`);+ } else if (measure) {+ sendSuccessToast(t`Measure created`);+ dispatch(push(getSuccessUrl(measure)));+ }+ }, [+ table,+ definition,+ name,+ description,+ isValid,+ createMeasure,+ dispatch,+ getSuccessUrl,+ sendSuccessToast,+ sendErrorToast,+ ]);++ return (+ <PageContainer data-testid="new-measure-page" gap="xl">+ <NewMeasureHeader+ previewUrl={previewUrl}+ onNameChange={setName}+ breadcrumbs={breadcrumbs}+ actions={+ isDirty && (+ <Button+ variant="filled"+ disabled={!isValid}+ loading={isSaving}+ onClick={handleSave}+ >+ {t`Save`}+ </Button>+ )+ }+ />+ <MeasureEditor+ query={query}+ description={description}+ onQueryChange={setQuery}+ onDescriptionChange={setDescription}+ />+ <LeaveRouteConfirmModal route={route} isEnabled={isDirty && !isSaving} />+ </PageContainer>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/index.tsnew file mode 100644index 00000000000..3c814fc42a2--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/NewMeasurePage/index.ts@@ -0,0 +1 @@+export { NewMeasurePage } from "./NewMeasurePage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsxnew file mode 100644index 00000000000..e8feae0416c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/PublishedTableMeasureDependenciesPage.tsx@@ -0,0 +1,47 @@+import type { ReactNode } from "react";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { usePublishedTableMeasurePage } from "../../hooks";+import { MeasureDependenciesPage } from "../MeasureDependenciesPage";++type PublishedTableMeasureDependenciesPageParams = {+ tableId: string;+ measureId: string;+};++type PublishedTableMeasureDependenciesPageProps = {+ params: PublishedTableMeasureDependenciesPageParams;+ children?: ReactNode;+};++export function PublishedTableMeasureDependenciesPage({+ params,+ children,+}: PublishedTableMeasureDependenciesPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ usePublishedTableMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureDependenciesPage+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <PublishedTableMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ >+ {children}+ </MeasureDependenciesPage>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.tsnew file mode 100644index 00000000000..ca3634149d6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage/index.ts@@ -0,0 +1 @@+export { PublishedTableMeasureDependenciesPage } from "./PublishedTableMeasureDependenciesPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsxnew file mode 100644index 00000000000..2b96a4330ce--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/PublishedTableMeasureDetailPage.tsx@@ -0,0 +1,46 @@+import type { Route } from "react-router";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { usePublishedTableMeasurePage } from "../../hooks";+import { MeasureDetailPage } from "../MeasureDetailPage";++type PublishedTableMeasureDetailPageParams = {+ tableId: string;+ measureId: string;+};++type PublishedTableMeasureDetailPageProps = {+ params: PublishedTableMeasureDetailPageParams;+ route: Route;+};++export function PublishedTableMeasureDetailPage({+ params,+ route,+}: PublishedTableMeasureDetailPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ usePublishedTableMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureDetailPage+ route={route}+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <PublishedTableMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.tsnew file mode 100644index 00000000000..acbc654836c--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage/index.ts@@ -0,0 +1 @@+export { PublishedTableMeasureDetailPage } from "./PublishedTableMeasureDetailPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsxnew file mode 100644index 00000000000..76cd2f5d163--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/PublishedTableMeasureRevisionHistoryPage.tsx@@ -0,0 +1,41 @@+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import { Center } from "metabase/ui";++import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { usePublishedTableMeasurePage } from "../../hooks";+import { MeasureRevisionHistoryPage } from "../MeasureRevisionHistoryPage";++type PublishedTableMeasureRevisionHistoryPageParams = {+ tableId: string;+ measureId: string;+};++type PublishedTableMeasureRevisionHistoryPageProps = {+ params: PublishedTableMeasureRevisionHistoryPageParams;+};++export function PublishedTableMeasureRevisionHistoryPage({+ params,+}: PublishedTableMeasureRevisionHistoryPageProps) {+ const { isLoading, error, measure, table, tabUrls, onRemove } =+ usePublishedTableMeasurePage(params);++ if (isLoading || error || !measure || !table || !tabUrls) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <MeasureRevisionHistoryPage+ measure={measure}+ tabUrls={tabUrls}+ breadcrumbs={+ <PublishedTableMeasureBreadcrumbs table={table} measure={measure} />+ }+ onRemove={onRemove}+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.tsnew file mode 100644index 00000000000..958d1013ad5--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage/index.ts@@ -0,0 +1 @@+export { PublishedTableMeasureRevisionHistoryPage } from "./PublishedTableMeasureRevisionHistoryPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsxnew file mode 100644index 00000000000..79762ef382d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/PublishedTableNewMeasurePage.tsx@@ -0,0 +1,50 @@+import type { ReactNode } from "react";+import type { Route } from "react-router";++import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import * as Urls from "metabase/lib/urls";+import { Center } from "metabase/ui";+import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";++import { PublishedTableMeasureBreadcrumbs } from "../../components/MeasureBreadcrumbs";+import { NewMeasurePage } from "../NewMeasurePage";++type PublishedTableNewMeasurePageParams = {+ tableId: string;+};++type PublishedTableNewMeasurePageProps = {+ params: PublishedTableNewMeasurePageParams;+ route: Route;+ children?: ReactNode;+};++export function PublishedTableNewMeasurePage({+ params,+ route,+}: PublishedTableNewMeasurePageProps) {+ const tableId = Urls.extractEntityId(params.tableId);++ const { table, isLoading, error } = useLoadTableWithMetadata(tableId, {+ includeForeignTables: true,+ });++ if (isLoading || error || !table || tableId == null) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <NewMeasurePage+ route={route}+ table={table}+ breadcrumbs={<PublishedTableMeasureBreadcrumbs table={table} />}+ getSuccessUrl={(measure) =>+ Urls.dataStudioPublishedTableMeasure(tableId, measure.id)+ }+ />+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/index.tsnew file mode 100644index 00000000000..45ff96a1a1d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage/index.ts@@ -0,0 +1 @@+export { PublishedTableNewMeasurePage } from "./PublishedTableNewMeasurePage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/routes.tsxnew file mode 100644index 00000000000..f63b9c147e3--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/routes.tsx@@ -0,0 +1,26 @@+import { IndexRoute, Route } from "react-router";++import { PLUGIN_DEPENDENCIES } from "metabase/plugins";++import { MeasureDependenciesPage } from "./pages/MeasureDependenciesPage";+import { MeasureDetailPage } from "./pages/MeasureDetailPage";+import { MeasureRevisionHistoryPage } from "./pages/MeasureRevisionHistoryPage";+import { NewMeasurePage } from "./pages/NewMeasurePage";++export function getDataStudioMeasureRoutes() {+ return (+ <Route path="measures">+ <Route path="new" component={NewMeasurePage} />+ <Route path=":measureId" component={MeasureDetailPage} />+ <Route path=":measureId/history" component={MeasureRevisionHistoryPage} />+ {PLUGIN_DEPENDENCIES.isEnabled && (+ <Route+ path=":measureId/dependencies"+ component={MeasureDependenciesPage}+ >+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ </Route>+ )}+ </Route>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/types.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/types.tsnew file mode 100644index 00000000000..570ea86acb9--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/types.ts@@ -0,0 +1,34 @@+import type { ReactNode } from "react";+import type { Route } from "react-router";++import type { Measure, Table } from "metabase-types/api";++export type MeasureTabUrls = {+ definition: string;+ revisions: string;+ dependencies: string;+};++export type NewMeasurePageProps = {+ route: Route;+ table: Table;+ breadcrumbs: ReactNode;+ getSuccessUrl: (measure: Measure) => string;+};++export type ExistingMeasurePageProps = {+ measure: Measure;+ tabUrls: MeasureTabUrls;+ breadcrumbs: ReactNode;+ onRemove: () => Promise<void>;+};++export type MeasureDetailPageProps = ExistingMeasurePageProps & {+ route: Route;+};++export type MeasureRevisionHistoryPageProps = ExistingMeasurePageProps;++export type MeasureDependenciesPageProps = ExistingMeasurePageProps & {+ children?: ReactNode;+};diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/measures/utils/measure-query.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/utils/measure-query.tsnew file mode 100644index 00000000000..cb8cc40ab3f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/measures/utils/measure-query.ts@@ -0,0 +1,19 @@+import * as Lib from "metabase-lib";+import type Metadata from "metabase-lib/v1/metadata/Metadata";+import type { DatasetQuery, Table } from "metabase-types/api";++export function createInitialQueryForTable(+ table: Table,+ metadata: Metadata,+): DatasetQuery | null {+ const metadataProvider = Lib.metadataProvider(table.db_id, metadata);+ const tableMetadata = Lib.tableOrCardMetadata(metadataProvider, table.id);+ if (!tableMetadata) {+ return null;+ }+ const query = Lib.queryFromTableOrCardMetadata(+ metadataProvider,+ tableMetadata,+ );+ return Lib.toJsQuery(query);+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsxindex e06e427409e..60f6e29f868 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/routes.tsx@@ -18,6 +18,7 @@ import { TransformsSectionLayout } from "./app/pages/TransformsSectionLayout";import { getDataStudioMetadataRoutes } from "./data-model/routes";import { getDataStudioGlossaryRoutes } from "./glossary/routes";import { getDataStudioMetricRoutes } from "./metrics/routes";+import { getDataStudioSegmentRoutes } from "./segments/routes";import { getDataStudioSnippetRoutes } from "./snippets/routes";import { getDataStudioTableRoutes } from "./tables/routes";@@ -52,6 +53,7 @@ export function getDataStudioRoutes(<IndexRoute component={LibrarySectionLayout} />{getDataStudioTableRoutes()}{getDataStudioMetricRoutes()}+ {getDataStudioSegmentRoutes()}{getDataStudioSnippetRoutes()}</Route>{PLUGIN_DEPENDENCIES.isEnabled && (diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsxindex e1d2400534b..14af2b60bf9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.tsx@@ -1,12 +1,10 @@-import { skipToken } from "@reduxjs/toolkit/query";-import { Link } from "react-router";import { t } from "ttag";-import { useListDatabaseSchemasQuery } from "metabase/api";-import { Ellipsified } from "metabase/common/components/Ellipsified";import * as Urls from "metabase/lib/urls";-import { DataStudioBreadcrumbs } from "metabase-enterprise/data-studio/common/components/DataStudioBreadcrumbs";-import { useCollectionPath } from "metabase-enterprise/data-studio/common/hooks/use-collection-path/useCollectionPath";+import {+ DataModelBreadcrumbs,+ PublishedTableBreadcrumbs,+} from "metabase-enterprise/data-studio/common/components/Breadcrumbs";import type { Segment, Table } from "metabase-types/api";type SegmentBreadcrumbsProps = {@@ -18,30 +16,13 @@ export function PublishedTableSegmentBreadcrumbs({table,segment,}: SegmentBreadcrumbsProps) {- const { path, isLoadingPath } = useCollectionPath({- collectionId: table.collection_id,- });-return (- <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>- ))}- <Link- key={`table-${table.id}`}- to={Urls.dataStudioTableSegments(table.id)}- >- {table.display_name}- </Link>- <span>{segment?.name ?? t`New segment`}</span>- </DataStudioBreadcrumbs>+ <PublishedTableBreadcrumbs+ table={table}+ entityName={segment?.name}+ newEntityLabel={t`New segment`}+ tableListUrl={Urls.dataStudioTableSegments(table.id)}+ />);}@@ -49,41 +30,17 @@ export function DataModelSegmentBreadcrumbs({table,segment,}: SegmentBreadcrumbsProps) {- const { data: schemas, isLoading } = useListDatabaseSchemasQuery(- table.db_id ? { id: table.db_id } : skipToken,- );-- const showSchema = schemas && schemas.length > 1 && table.schema;-return (- <DataStudioBreadcrumbs loading={isLoading}>- {table.db && (- <Link to={Urls.dataStudioData({ databaseId: table.db_id })}>- <Ellipsified>{table.db.name}</Ellipsified>- </Link>- )}-- {showSchema && (- <Link- to={Urls.dataStudioData({- databaseId: table.db_id,- schemaName: table.schema,- })}- >- <Ellipsified>{table.schema}</Ellipsified>- </Link>- )}- <Link- to={Urls.dataStudioData({- databaseId: table.db_id,- schemaName: table.schema,- tableId: table.id,- tab: "segments",- })}- >- <Ellipsified>{table.display_name}</Ellipsified>- </Link>- {segment?.name ?? t`New segment`}- </DataStudioBreadcrumbs>+ <DataModelBreadcrumbs+ table={table}+ entityName={segment?.name}+ newEntityLabel={t`New segment`}+ tableListUrl={Urls.dataStudioData({+ databaseId: table.db_id,+ schemaName: table.schema,+ tableId: table.id,+ tab: "segments",+ })}+ />);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsxindex 48550b4464b..003543e875d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx@@ -82,7 +82,7 @@ describe("PublishedTableSegmentBreadcrumbs", () => {const collectionLink = screen.getByText("Data").closest("a");expect(collectionLink).toHaveAttribute("href",- "/data-studio/library?expandedId=1",+ `/data-studio/library?expandedId=${TEST_COLLECTION.id}`,);const tableLink = screen.getByText("Orders").closest("a");@@ -131,11 +131,8 @@ describe("PublishedTableSegmentBreadcrumbs", () => {);expect(screen.getByText("Analytics").closest("a")).toHaveAttribute("href",- "/data-studio/library?expandedId=2",+ `/data-studio/library?expandedId=${parent.id}`,);-- const separators = screen.getAllByRole("img");- expect(separators.length).toBeGreaterThan(0);});it("uses display_name for table and renders 'New segment' when segment undefined", async () => {@@ -231,8 +228,5 @@ describe("DataModelSegmentBreadcrumbs", () => {expect(screen.queryByText("PUBLIC")).not.toBeInTheDocument();expect(screen.getByText("Orders")).toBeInTheDocument();expect(screen.getByText("New segment")).toBeInTheDocument();-- const separators = screen.getAllByRole("img");- expect(separators).toHaveLength(2);});});diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsxindex a66181ffa93..9ff9f297eae 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/SegmentHeader.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import { useUpdateSegmentMutation } from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";import { Stack } from "metabase/ui";+import { EntityDetailTabs } from "metabase-enterprise/data-studio/common/components/EntityDetailTabs/EntityDetailTabs";import {PaneHeader,PaneHeaderInput,@@ -13,8 +14,6 @@ import type { Segment } from "metabase-types/api";import { SegmentMoreMenu } from "../SegmentMoreMenu";-import { SegmentTabs } from "./SegmentTabs";-const SEGMENT_NAME_MAX_LENGTH = 254;type SegmentHeaderProps = {@@ -45,7 +44,7 @@ export function SegmentHeader({}icon="segment"menu={<SegmentMoreMenu previewUrl={previewUrl} onRemove={onRemove} />}- tabs={<SegmentTabs urls={tabUrls} />}+ tabs={<EntityDetailTabs urls={tabUrls} />}actions={actions}breadcrumbs={breadcrumbs}/>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.tsindex ae01edd374c..ce96b585238 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentHeader/index.ts@@ -1,2 +1 @@export { SegmentHeader } from "./SegmentHeader";-export { SegmentTabs } from "./SegmentTabs";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsxindex 96f69a5ecfb..a0a7bb2c291 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentMoreMenu/SegmentMoreMenu.tsx@@ -1,9 +1,6 @@-import { useDisclosure } from "@mantine/hooks";-import { Link } from "react-router";import { t } from "ttag";-import { ConfirmModal } from "metabase/common/components/ConfirmModal";-import { ActionIcon, Icon, Menu } from "metabase/ui";+import { MoreMenu } from "metabase-enterprise/data-studio/common/components/MoreMenu/MoreMenu";type SegmentMoreMenuProps = {previewUrl?: string;@@ -14,56 +11,14 @@ export function SegmentMoreMenu({previewUrl,onRemove,}: SegmentMoreMenuProps) {- const [isConfirmOpen, { open: openConfirm, close: closeConfirm }] =- useDisclosure();-- const handleConfirm = () => {- closeConfirm();- onRemove?.();- };-- if (!previewUrl && !onRemove) {- return null;- }-return (- <>- <Menu>- <Menu.Target>- <ActionIcon aria-label={t`Segment actions`}>- <Icon name="ellipsis" />- </ActionIcon>- </Menu.Target>- <Menu.Dropdown>- {previewUrl && (- <Menu.Item- component={Link}- to={previewUrl}- target="_blank"- leftSection={<Icon name="share" />}- >- {t`Preview`}- </Menu.Item>- )}- {onRemove && (- <Menu.Item- c="danger"- leftSection={<Icon name="trash" />}- onClick={openConfirm}- >- {t`Remove segment`}- </Menu.Item>- )}- </Menu.Dropdown>- </Menu>- <ConfirmModal- title={t`Remove this segment?`}- message={t`This segment will be permanently removed.`}- opened={isConfirmOpen}- onClose={closeConfirm}- onConfirm={handleConfirm}- confirmButtonText={t`Remove`}- />- </>+ <MoreMenu+ previewUrl={previewUrl}+ onRemove={onRemove}+ ariaLabel={t`Segment actions`}+ removeLabel={t`Remove segment`}+ removeTitle={t`Remove this segment?`}+ removeMessage={t`This segment will be permanently removed.`}+ />);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsxindex 43c05823565..454b08c92b3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/components/SegmentRevisionHistory/SegmentRevisionHistory.tsx@@ -1,15 +1,8 @@-import { useMemo } from "react";import { t } from "ttag";-import { useListRevisionsQuery } from "metabase/api";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { assignUserColors } from "metabase/lib/formatting";-import { useSelector } from "metabase/lib/redux";-import { getUserId } from "metabase/selectors/user";-import { Center, Stack, Text, Timeline } from "metabase/ui";-import type { Segment } from "metabase-types/api";+import type { Revision, Segment } from "metabase-types/api";-import { SegmentRevisionItem } from "./SegmentRevisionItem";+import { RevisionHistoryTimeline } from "../../../components/RevisionHistory";type SegmentRevisionHistoryProps = {segment: Segment;@@ -18,51 +11,41 @@ type SegmentRevisionHistoryProps = {export function SegmentRevisionHistory({segment,}: SegmentRevisionHistoryProps) {- const currentUserId = useSelector(getUserId);- const {- data: revisions,- isLoading,- error,- } = useListRevisionsQuery({ entity: "segment", id: segment.id });+ return (+ <RevisionHistoryTimeline+ entityType="segment"+ entityId={segment.id}+ tableId={segment.table_id}+ getActionDescription={getSegmentActionDescription}+ definitionLabel={t`Filter`}+ definitionType="filters"+ />+ );+}- const userColorAssignments = useMemo(() => {- if (!revisions || currentUserId == null) {- return {};- }- return assignUserColors(- revisions.map((r) => String(r.user.id)),- String(currentUserId),- );- }, [revisions, currentUserId]);+function getSegmentActionDescription(revision: Revision): string {+ if (revision.is_creation) {+ return t`created this segment`;+ }+ if (revision.is_reversion) {+ return t`reverted to a previous version`;+ }- if (isLoading || error != null) {- return (- <Center h="100%">- <LoadingAndErrorWrapper loading={isLoading} error={error} />- </Center>- );+ const changedKeys = Object.keys(revision.diff || {});+ if (changedKeys.length === 1) {+ switch (changedKeys[0]) {+ case "name":+ return t`renamed the segment`;+ case "description":+ return t`updated the description`;+ case "definition":+ return t`changed the filter definition`;+ }}- if (!revisions || revisions.length === 0) {- return (- <Center h="100%">- <Text c="text-secondary">{t`No revision history available.`}</Text>- </Center>- );+ if (changedKeys.length > 1) {+ return t`made multiple changes`;}- return (- <Stack p="xl" maw={720} mx="auto" w="100%">- <Timeline bulletSize={40} lineWidth={2}>- {revisions.map((revision) => (- <SegmentRevisionItem- key={revision.id}- revision={revision}- tableId={segment.table_id}- userColor={userColorAssignments[String(revision.user.id)]}- />- ))}- </Timeline>- </Stack>- );+ return t`made changes`;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.tsindex bd274e0d900..b9d58db64f3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-data-model-segment-page.ts@@ -4,8 +4,8 @@ import { t } from "ttag";import {skipToken,- useDeleteSegmentMutation,useGetSegmentQuery,+ useUpdateSegmentMutation,} from "metabase/api";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";@@ -25,7 +25,7 @@ type DataModelSegmentPageParams = {export function useDataModelSegmentPage(params: DataModelSegmentPageParams) {const dispatch = useDispatch();const { sendSuccessToast, sendErrorToast } = useMetadataToasts();- const [deleteSegment] = useDeleteSegmentMutation();+ const [updateSegment] = useUpdateSegmentMutation();const databaseId = Number(params.databaseId);const schemaName = getSchemaName(params.schemaId);@@ -51,8 +51,9 @@ export function useDataModelSegmentPage(params: DataModelSegmentPageParams) {return;}- const { error } = await deleteSegment({+ const { error } = await updateSegment({id: segment.id,+ archived: true,revision_message: t`Removed from Data Studio`,});@@ -76,7 +77,7 @@ export function useDataModelSegmentPage(params: DataModelSegmentPageParams) {tableId,schemaName,databaseId,- deleteSegment,+ updateSegment,dispatch,sendSuccessToast,sendErrorToast,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.tsindex 7866cc7e4a4..b41bacff9b3 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/hooks/use-published-table-segment-page.ts@@ -4,8 +4,8 @@ import { t } from "ttag";import {skipToken,- useDeleteSegmentMutation,useGetSegmentQuery,+ useUpdateSegmentMutation,} from "metabase/api";import { useToast } from "metabase/common/hooks/use-toast";import { useDispatch } from "metabase/lib/redux";@@ -24,7 +24,7 @@ export function usePublishedTableSegmentPage() {const dispatch = useDispatch();const [sendToast] = useToast();- const [deleteSegment] = useDeleteSegmentMutation();+ const [updateSegment] = useUpdateSegmentMutation();const tableId = Urls.extractEntityId(params.tableId);const segmentId = Urls.extractEntityId(params.segmentId);@@ -48,8 +48,9 @@ export function usePublishedTableSegmentPage(return;}- const { error } = await deleteSegment({+ const { error } = await updateSegment({id: segment.id,+ archived: true,revision_message: t`Removed from Data Studio`,});@@ -59,7 +60,7 @@ export function usePublishedTableSegmentPage(sendToast({ icon: "check", message: t`Segment removed` });dispatch(push(Urls.dataStudioTableSegments(tableId)));}- }, [segment, tableId, deleteSegment, dispatch, sendToast]);+ }, [segment, tableId, updateSegment, dispatch, sendToast]);const isLoading = isLoadingSegment || isLoadingTable;const error = segmentError ?? tableError;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsxindex 86c094427a7..62cd1a7b3ab 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/NewSegmentPage/NewSegmentPage.tsx@@ -11,16 +11,14 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";import { Button } from "metabase/ui";import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";import * as Lib from "metabase-lib";import type { DatasetQuery, Segment, Table } from "metabase-types/api";import { NewSegmentHeader } from "../../components/NewSegmentHeader";import { SegmentEditor } from "../../components/SegmentEditor";import { useSegmentQuery } from "../../hooks/use-segment-query";-import {- createInitialQueryForTable,- getPreviewUrl,-} from "../../utils/segment-query";+import { createInitialQueryForTable } from "../../utils/segment-query";type NewSegmentPageProps = {route: Route;@@ -57,7 +55,8 @@ export function NewSegmentPage({const isDirty =name.trim().length > 0 || description.length > 0 || filters.length > 0;const isValid = name.trim().length > 0 && filters.length > 0;- const previewUrl = filters.length > 0 ? getPreviewUrl(definition) : undefined;+ const previewUrl =+ filters.length > 0 ? getDatasetQueryPreviewUrl(definition) : undefined;const setQuery = useCallback((newQuery: Lib.Query) => {setDefinition(Lib.toJsQuery(newQuery));diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsxindex 108f234b9ec..e702bdeea46 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDependenciesPage/SegmentDependenciesPage.tsx@@ -3,11 +3,11 @@ import type { ReactNode } from "react";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Card } from "metabase/ui";import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";import type { Segment } from "metabase-types/api";import { SegmentHeader } from "../../components/SegmentHeader";import type { SegmentTabUrls } from "../../types";-import { getSegmentPreviewUrl } from "../../utils/get-segment-preview-url";type SegmentDependenciesPageProps = {segment: Segment;@@ -29,7 +29,7 @@ export function SegmentDependenciesPage({<SegmentHeadersegment={segment}tabUrls={tabUrls}- previewUrl={getSegmentPreviewUrl(segment)}+ previewUrl={getDatasetQueryPreviewUrl(segment.definition)}onRemove={onRemove}breadcrumbs={breadcrumbs}/>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsxindex 713ce7b404d..b8aac328259 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentDetailPage/SegmentDetailPage.tsx@@ -10,6 +10,7 @@ import { useMetadataToasts } from "metabase/metadata/hooks";import { getMetadata } from "metabase/selectors/metadata";import { Button, Group } from "metabase/ui";import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";import * as Lib from "metabase-lib";import type { Segment } from "metabase-types/api";@@ -17,7 +18,6 @@ import { SegmentEditor } from "../../components/SegmentEditor";import { SegmentHeader } from "../../components/SegmentHeader";import { useSegmentQuery } from "../../hooks/use-segment-query";import type { SegmentTabUrls } from "../../types";-import { getPreviewUrl } from "../../utils/segment-query";type SegmentDetailPageProps = {route: Route;@@ -51,10 +51,8 @@ export function SegmentDetailPage({);const isValid = filters.length > 0;- const previewUrl = useMemo(- () => (filters.length > 0 ? getPreviewUrl(definition) : undefined),- [definition, filters],- );+ const previewUrl =+ filters.length > 0 ? getDatasetQueryPreviewUrl(definition) : undefined;const setQuery = useCallback((newQuery: Lib.Query) => {setDefinition(Lib.toJsQuery(newQuery));diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsxindex 0746e094792..c9bd7731231 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/pages/SegmentRevisionHistoryPage/SegmentRevisionHistoryPage.tsx@@ -2,12 +2,12 @@ import type { ReactNode } from "react";import { Stack } from "metabase/ui";import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { getDatasetQueryPreviewUrl } from "metabase-enterprise/data-studio/common/utils/get-dataset-query-preview-url";import type { Segment } from "metabase-types/api";import { SegmentHeader } from "../../components/SegmentHeader";import { SegmentRevisionHistory } from "../../components/SegmentRevisionHistory";import type { SegmentTabUrls } from "../../types";-import { getSegmentPreviewUrl } from "../../utils/get-segment-preview-url";import S from "./SegmentRevisionHistoryPage.module.css";@@ -29,7 +29,7 @@ export function SegmentRevisionHistoryPage({<SegmentHeadersegment={segment}tabUrls={tabUrls}- previewUrl={getSegmentPreviewUrl(segment)}+ previewUrl={getDatasetQueryPreviewUrl(segment.definition)}onRemove={onRemove}breadcrumbs={breadcrumbs}/>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/routes.tsxnew file mode 100644index 00000000000..80fa1f0ccec--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/routes.tsx@@ -0,0 +1,26 @@+import { IndexRoute, Route } from "react-router";++import { PLUGIN_DEPENDENCIES } from "metabase/plugins";++import { NewSegmentPage } from "./pages/NewSegmentPage";+import { SegmentDependenciesPage } from "./pages/SegmentDependenciesPage";+import { SegmentDetailPage } from "./pages/SegmentDetailPage";+import { SegmentRevisionHistoryPage } from "./pages/SegmentRevisionHistoryPage";++export function getDataStudioSegmentRoutes() {+ return (+ <Route path="segments">+ <Route path="new" component={NewSegmentPage} />+ <Route path=":segmentId" component={SegmentDetailPage} />+ <Route path=":segmentId/history" component={SegmentRevisionHistoryPage} />+ {PLUGIN_DEPENDENCIES.isEnabled && (+ <Route+ path=":segmentId/dependencies"+ component={SegmentDependenciesPage}+ >+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ </Route>+ )}+ </Route>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/get-segment-preview-url.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/get-segment-preview-url.tsdeleted file mode 100644index 4ac939c26f0..00000000000--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/get-segment-preview-url.ts+++ /dev/null@@ -1,9 +0,0 @@-import * as Urls from "metabase/lib/urls";-import type { Segment } from "metabase-types/api";--export function getSegmentPreviewUrl(segment: Segment): string | undefined {- if (!segment.definition) {- return undefined;- }- return Urls.newQuestion({ dataset_query: segment.definition });-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.tsindex fd4bc84a45b..cb8cc40ab3f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/segments/utils/segment-query.ts@@ -1,4 +1,3 @@-import * as Urls from "metabase/lib/urls";import * as Lib from "metabase-lib";import type Metadata from "metabase-lib/v1/metadata/Metadata";import type { DatasetQuery, Table } from "metabase-types/api";@@ -18,12 +17,3 @@ export function createInitialQueryForTable();return Lib.toJsQuery(query);}--export function getPreviewUrl(- definition: DatasetQuery | null,-): string | undefined {- if (!definition) {- return undefined;- }- return Urls.newQuestion({ dataset_query: definition });-}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsxindex ca3d846bd6f..04e14dfa81f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/components/TableHeader/TableTabs/TableTabs.tsx@@ -45,6 +45,14 @@ function getTabs(table: Table, location: Location): PaneHeaderTab[] {),});+ tabs.push({+ label: t`Measures`,+ to: Urls.dataStudioTableMeasures(table.id),+ isSelected: location.pathname.startsWith(+ Urls.dataStudioTableMeasures(table.id),+ ),+ });+if (PLUGIN_DEPENDENCIES.isEnabled) {tabs.push({label: t`Dependencies`,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsxnew file mode 100644index 00000000000..6da2ad03a02--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasures.tsx@@ -0,0 +1,43 @@+import { t } from "ttag";++import * as Urls from "metabase/lib/urls";+import { Flex } from "metabase/ui";+import type { Table } from "metabase-types/api";++import {+ EntityList,+ EntityListItem,+} from "../../../common/components/EntityList";++type TableMeasuresProps = {+ table: Table;+};++export function TableMeasures({ table }: TableMeasuresProps) {+ const measures = table.measures ?? [];++ return (+ <Flex direction="column" flex={1}>+ <EntityList+ items={measures}+ title={t`Measures`}+ emptyState={{+ icon: "sum",+ title: t`No measures yet`,+ message: t`Create a measure to define aggregations for this table.`,+ }}+ newButtonLabel={t`New measure`}+ newButtonUrl={Urls.dataStudioPublishedTableMeasureNew(table.id)}+ renderItem={(measure) => (+ <EntityListItem+ key={measure.id}+ name={measure.name}+ description={measure.definition_description}+ icon="sum"+ href={Urls.dataStudioPublishedTableMeasure(table.id, measure.id)}+ />+ )}+ />+ </Flex>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsxnew file mode 100644index 00000000000..7de88d4fcfc--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/TableMeasuresPage.tsx@@ -0,0 +1,37 @@+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import * as Urls from "metabase/lib/urls";+import { Center } from "metabase/ui";+import { PageContainer } from "metabase-enterprise/data-studio/common/components/PageContainer";+import { useLoadTableWithMetadata } from "metabase-enterprise/data-studio/common/hooks/use-load-table-with-metadata";++import { TableHeader } from "../../components/TableHeader";++import { TableMeasures } from "./TableMeasures";++type TableMeasuresPageParams = {+ tableId: string;+};++type TableMeasuresPageProps = {+ params: TableMeasuresPageParams;+};++export function TableMeasuresPage({ params }: TableMeasuresPageProps) {+ const tableId = Urls.extractEntityId(params.tableId);+ const { table, isLoading, error } = useLoadTableWithMetadata(tableId);++ if (isLoading || error != null || table == null) {+ return (+ <Center h="100%">+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Center>+ );+ }++ return (+ <PageContainer data-testid="table-measures-page">+ <TableHeader table={table} />+ <TableMeasures table={table} />+ </PageContainer>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/index.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/index.tsnew file mode 100644index 00000000000..ed6068a9a46--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableMeasuresPage/index.ts@@ -0,0 +1 @@+export { TableMeasuresPage } from "./TableMeasuresPage";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsxindex 18a6fe9d6f0..df84221e549 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/routes.tsx@@ -1,6 +1,10 @@import { IndexRoute, Route } from "react-router";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";+import { PublishedTableMeasureDependenciesPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDependenciesPage";+import { PublishedTableMeasureDetailPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureDetailPage";+import { PublishedTableMeasureRevisionHistoryPage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableMeasureRevisionHistoryPage";+import { PublishedTableNewMeasurePage } from "metabase-enterprise/data-studio/measures/pages/PublishedTableNewMeasurePage";import { PublishedTableNewSegmentPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableNewSegmentPage";import { PublishedTableSegmentDependenciesPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDependenciesPage";import { PublishedTableSegmentDetailPage } from "metabase-enterprise/data-studio/segments/pages/PublishedTableSegmentDetailPage";@@ -8,6 +12,7 @@ import { PublishedTableSegmentRevisionHistoryPage } from "metabase-enterprise/daimport { TableDependenciesPage } from "./pages/TableDependenciesPage";import { TableFieldsPage } from "./pages/TableFieldsPage";+import { TableMeasuresPage } from "./pages/TableMeasuresPage";import { TableOverviewPage } from "./pages/TableOverviewPage";import { TableSegmentsPage } from "./pages/TableSegmentsPage";@@ -38,6 +43,27 @@ export function getDataStudioTableRoutes() {<IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} /></Route>)}+ <Route path=":tableId/measures" component={TableMeasuresPage} />+ <Route+ path=":tableId/measures/new"+ component={PublishedTableNewMeasurePage}+ />+ <Route+ path=":tableId/measures/:measureId"+ component={PublishedTableMeasureDetailPage}+ />+ <Route+ path=":tableId/measures/:measureId/revisions"+ component={PublishedTableMeasureRevisionHistoryPage}+ />+ {PLUGIN_DEPENDENCIES.isEnabled && (+ <Route+ path=":tableId/measures/:measureId/dependencies"+ component={PublishedTableMeasureDependenciesPage}+ >+ <IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />+ </Route>+ )}{PLUGIN_DEPENDENCIES.isEnabled && (<Route path=":tableId/dependencies" component={TableDependenciesPage}><IndexRoute component={PLUGIN_DEPENDENCIES.DependencyGraphPage} />diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsxindex a291aaec348..e48c45565e9 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/DependencyGraph.tsx@@ -113,7 +113,7 @@ export function DependencyGraph({onEdgesChange={onEdgesChange}><Background />- <Controls className={S.controls} />+ <Controls className={S.controls} showInteractive={false} /><GraphNodeLayout /><Panel position="top-left"><Group>diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.tsindex e2827561b30..72dcdc3f53b 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphDependencyPanel/PanelHeader/utils.ts@@ -33,5 +33,7 @@ export function getHeaderLabel(return t`Row and column security rules that use ${nodeLabel}`;case "segment":return t`Segments that use ${nodeLabel}`;+ case "measure":+ return t`Measures that use ${nodeLabel}`;}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.tsindex 2dafe40245e..90674c5d6ed 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelBody/utils.ts@@ -17,6 +17,7 @@ export function getNodeCreatedAt(node: DependencyNode): string | null {case "dashboard":case "document":case "segment":+ case "measure":return node.data.created_at;case "table":case "transform":@@ -32,6 +33,7 @@ export function getNodeCreatedBy(node: DependencyNode): UserInfo | null {case "dashboard":case "document":case "segment":+ case "measure":return node.data.creator ?? null;case "table":case "transform":@@ -47,6 +49,7 @@ export function getNodeLastEditedAt(node: DependencyNode): string | null {case "dashboard":return node.data["last-edit-info"]?.timestamp ?? null;case "segment":+ case "measure":case "table":case "transform":case "snippet":@@ -62,6 +65,7 @@ export function getNodeLastEditedBy(node: DependencyNode): LastEditInfo | null {case "dashboard":return node.data["last-edit-info"] ?? null;case "segment":+ case "measure":case "table":case "transform":case "snippet":@@ -129,6 +133,7 @@ export function getNodeFields(node: DependencyNode): Field[] {case "dashboard":case "document":case "segment":+ case "measure":return [];}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.tsindex 3880da75a34..0049ac60302 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/utils.ts@@ -16,6 +16,7 @@ export function getDependentGroups(node: DependencyNode): DependentGroup[] {document = 0,sandbox = 0,segment = 0,+ measure = 0,} = node.dependents_count ?? {};const groups: DependentGroup[] = [@@ -29,6 +30,7 @@ export function getDependentGroups(node: DependencyNode): DependentGroup[] {{ type: "document", count: document },{ type: "sandbox", count: sandbox },{ type: "segment", count: segment },+ { type: "measure", count: measure },];return groups.filter(({ count }) => count !== 0);@@ -83,5 +85,11 @@ export function getDependentGroupLabel({`${count} segments`,count,);+ case "measure":+ return c("{0} is the number of measures").ngettext(+ msgid`${count} measure`,+ `${count} measures`,+ count,+ );}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.tsindex 000048799ee..36d49c29195 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.ts@@ -148,6 +148,8 @@ export function getNodeIconWithType(return "permissions_limited";case "segment":return "segment";+ case "measure":+ return "sum";}}@@ -176,7 +178,7 @@ export function getNodeLink(node: DependencyNode): NodeLink | null {case "table":return {label: t`View metadata`,- url: Urls.dataModel({+ url: Urls.dataStudioData({databaseId: node.data.db_id,schemaName: node.data.schema,tableId: node.id,@@ -210,10 +212,31 @@ export function getNodeLink(node: DependencyNode): NodeLink | null {}return null;case "segment":- return {- label: t`View this segment`,- url: Urls.dataModelSegment(node.id),- };+ if (node.data.table != null) {+ return {+ label: t`View this segment`,+ url: Urls.dataStudioDataModelSegment({+ databaseId: node.data.table.db_id,+ schemaName: node.data.table.schema,+ tableId: node.data.table.id,+ segmentId: node.id,+ }),+ };+ }+ return null;+ case "measure":+ if (node.data.table != null) {+ return {+ label: t`View this measure`,+ url: Urls.dataStudioDataModelMeasure({+ databaseId: node.data.table.db_id,+ schemaName: node.data.table.schema,+ tableId: node.data.table.id,+ measureId: node.id,+ }),+ };+ }+ return null;case "snippet":return null;}@@ -252,11 +275,11 @@ export function getNodeLocationInfo(node: DependencyNode): NodeLink[] | null {return [{label: node.data.db.name,- url: Urls.dataModel({ databaseId: node.data.db_id }),+ url: Urls.dataStudioData({ databaseId: node.data.db_id }),},{label: node.data.schema,- url: Urls.dataModel({+ url: Urls.dataStudioData({databaseId: node.data.db_id,schemaName: node.data.schema,}),@@ -276,14 +299,16 @@ export function getNodeLocationInfo(node: DependencyNode): NodeLink[] | null {}return null;case "segment":+ case "measure":if (node.data.table != null) {return [{label: node.data.table.display_name,- url: Urls.dataModel({+ url: Urls.dataStudioData({databaseId: node.data.table.db_id,schemaName: node.data.table.schema,tableId: node.data.table.id,+ tab: node.type === "segment" ? "segments" : "measures",}),},];@@ -312,6 +337,7 @@ export function getNodeViewCount(node: DependencyNode): number | null {case "snippet":case "sandbox":case "segment":+ case "measure":return null;}}@@ -366,5 +392,7 @@ export function getNodeTypeInfo(node: DependencyNode): NodeTypeInfo {return { label: t`Row and column security rule`, color: "error" };case "segment":return { label: t`Segment`, color: "accent2" };+ case "measure":+ return { label: t`Measure`, color: "summarize" };}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.tsindex 71a12ae9f6f..4586fb2f481 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/utils.unit.spec.ts@@ -5,7 +5,9 @@ import {createMockCardDependencyNode,createMockCardDependencyNodeData,createMockSegmentDependencyNode,+ createMockSegmentDependencyNodeData,createMockSnippetDependencyNode,+ createMockTable,createMockTableDependencyNode,createMockTableDependencyNodeData,createMockTransformDependencyNode,@@ -119,16 +121,22 @@ describe("getNodeLink", () => {}),expectedLink: {label: "View metadata",- url: "/admin/datamodel/database/2/schema/2:not%20public/table/1",+ url: "/data-studio/data/database/2/schema/2:not%20public/table/1",},},{node: createMockSegmentDependencyNode({id: 1,+ data: createMockSegmentDependencyNodeData({+ table: createMockTable({+ id: 1,+ name: "My table",+ }),+ }),}),expectedLink: {label: "View this segment",- url: "/admin/datamodel/segment/1",+ url: "/data-studio/data/database/1/schema/1:public/table/1/segments/1",},},])("should get the node link", ({ node, expectedLink }) => {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.tsindex 11cb3a75379..ec5645c3f84 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/pages/DependencyGraphPage/utils.ts@@ -20,6 +20,7 @@ function parseDependencyType(type: unknown): DependencyType | undefined {case "document":case "sandbox":case "segment":+ case "measure":return type;default:return undefined;diff --git a/frontend/src/metabase-lib/index.ts b/frontend/src/metabase-lib/index.tsindex 1cc3d436783..dce97293760 100644--- a/frontend/src/metabase-lib/index.ts+++ b/frontend/src/metabase-lib/index.ts@@ -15,6 +15,7 @@ export * from "./filter";export * from "./join";export * from "./limit";export * from "./metadata";+export * from "./measures";export * from "./metrics";export * from "./native";export * from "./order_by";diff --git a/frontend/src/metabase-lib/measures.ts b/frontend/src/metabase-lib/measures.tsnew file mode 100644index 00000000000..a3c80ba21ba--- /dev/null+++ b/frontend/src/metabase-lib/measures.ts@@ -0,0 +1,22 @@+import * as ML from "cljs/metabase.lib.js";+import type { MeasureId } from "metabase-types/api";++import type { MeasureMetadata, Query } from "./types";++export function availableMeasures(+ query: Query,+ stageIndex: number,+): MeasureMetadata[] {+ return ML.available_measures(query, stageIndex);+}++export function measureMetadata(+ query: Query,+ measureId: MeasureId,+): MeasureMetadata | null {+ return ML.measure_metadata(query, measureId);+}++export function isMeasureMetadata(arg: unknown): arg is MeasureMetadata {+ return ML.measure_metadata_QMARK_(arg);+}diff --git a/frontend/src/metabase-lib/metadata.ts b/frontend/src/metabase-lib/metadata.tsindex 055748fb616..b0ecdf81411 100644--- a/frontend/src/metabase-lib/metadata.ts+++ b/frontend/src/metabase-lib/metadata.ts@@ -35,6 +35,8 @@ import type {FilterOperatorDisplayInfo,JoinStrategy,JoinStrategyDisplayInfo,+ MeasureDisplayInfo,+ MeasureMetadata,MetadataProvider,MetricDisplayInfo,MetricMetadata,@@ -117,6 +119,11 @@ declare function DisplayInfoFn(stageIndex: number,metric: MetricMetadata,): MetricDisplayInfo;+declare function DisplayInfoFn(+ query: Query,+ stageIndex: number,+ measure: MeasureMetadata,+): MeasureDisplayInfo;declare function DisplayInfoFn(query: Query,stageIndex: number,diff --git a/frontend/src/metabase-lib/query.ts b/frontend/src/metabase-lib/query.tsindex bd82286318a..92c22b189c6 100644--- a/frontend/src/metabase-lib/query.ts+++ b/frontend/src/metabase-lib/query.ts@@ -16,6 +16,7 @@ import type {ClauseType,ColumnMetadata,Join,+ MeasureMetadata,MetadataProvider,MetricMetadata,Query,@@ -89,7 +90,13 @@ export function replaceClause(query: Query,stageIndex: number,targetClause: Clause | Join,- newClause: Clause | ColumnMetadata | MetricMetadata | SegmentMetadata | Join,+ newClause:+ | Clause+ | ColumnMetadata+ | MeasureMetadata+ | MetricMetadata+ | SegmentMetadata+ | Join,): Query {return ML.replace_clause(query, stageIndex, targetClause, newClause);}diff --git a/frontend/src/metabase-lib/types.ts b/frontend/src/metabase-lib/types.tsindex c685b6a3a4e..cb51ad27730 100644--- a/frontend/src/metabase-lib/types.ts+++ b/frontend/src/metabase-lib/types.ts@@ -42,12 +42,21 @@ export type MetricMetadata = unknown & {_opaque: typeof MetricMetadataSymbol;};+declare const MeasureMetadataSymbol: unique symbol;+export type MeasureMetadata = unknown & {+ _opaque: typeof MeasureMetadataSymbol;+};+declare const AggregationClauseSymbol: unique symbol;export type AggregationClause = unknown & {_opaque: typeof AggregationClauseSymbol;};-export type Aggregable = AggregationClause | MetricMetadata | ExpressionClause;+export type Aggregable =+ | AggregationClause+ | MetricMetadata+ | MeasureMetadata+ | ExpressionClause;declare const AggregationOperatorSymbol: unique symbol;export type AggregationOperator = unknown & {@@ -243,6 +252,14 @@ export type MetricDisplayInfo = {aggregationPosition?: number;};+export type MeasureDisplayInfo = {+ name: string;+ displayName: string;+ longDisplayName: string;+ description: string;+ aggregationPositions?: number[];+};+export type ClauseDisplayInfo = Pick<ColumnDisplayInfo,"name" | "displayName" | "longDisplayName" | "table"@@ -269,7 +286,8 @@ export type ExpressionArg =| string| ColumnMetadata| SegmentMetadata- | MetricMetadata;+ | MetricMetadata+ | MeasureMetadata;export type ExpressionParts = {operator: ExpressionOperator;diff --git a/frontend/src/metabase-lib/v1/metadata/Measure.ts b/frontend/src/metabase-lib/v1/metadata/Measure.tsnew file mode 100644index 00000000000..d6e07a8d895--- /dev/null+++ b/frontend/src/metabase-lib/v1/metadata/Measure.ts@@ -0,0 +1,36 @@+import type { NormalizedMeasure } from "metabase-types/api";++import type Metadata from "./Metadata";+import type Table from "./Table";++interface Measure extends Omit<NormalizedMeasure, "table"> {+ table?: Table;+ metadata?: Metadata;+}++/**+ * @deprecated use RTK Query endpoints and plain api objects from metabase-types/api+ */+class Measure {+ private readonly _plainObject: NormalizedMeasure;++ constructor(measure: NormalizedMeasure) {+ this._plainObject = measure;+ Object.assign(this, measure);+ }++ getPlainObject() {+ return this._plainObject;+ }++ displayName() {+ return this.name;+ }++ isActive() {+ return !this.archived;+ }+}++// eslint-disable-next-line import/no-default-export -- deprecated usage+export default Measure;diff --git a/frontend/src/metabase-lib/v1/metadata/Metadata.ts b/frontend/src/metabase-lib/v1/metadata/Metadata.tsindex 16750f1b3a0..b28c7d86f64 100644--- a/frontend/src/metabase-lib/v1/metadata/Metadata.ts+++ b/frontend/src/metabase-lib/v1/metadata/Metadata.ts@@ -5,6 +5,7 @@ import type {DatabaseId,FieldId,FieldReference,+ MeasureId,NativeQuerySnippet,SchemaId,SegmentId,@@ -17,6 +18,7 @@ import type Question from "../Question";import type Database from "./Database";import type Field from "./Field";+import type Measure from "./Measure";import type Schema from "./Schema";import type Segment from "./Segment";import type Table from "./Table";@@ -29,6 +31,7 @@ interface MetadataOpts {tables?: Record<string, Table>;fields?: Record<string, Field>;segments?: Record<string, Segment>;+ measures?: Record<string, Measure>;questions?: Record<string, Question>;settings?: Settings;}@@ -45,6 +48,7 @@ class Metadata {tables: Record<string, Table> = {};fields: Record<string, Field> = {};segments: Record<string, Segment> = {};+ measures: Record<string, Measure> = {};questions: Record<string, Question> = {};snippets: Record<string, NativeQuerySnippet> = {};settings?: Settings;@@ -92,6 +96,20 @@ class Metadata {return (segmentId != null && this.segments[segmentId]) || null;}+ /**+ * @deprecated load data via RTK Query - useListMeasuresQuery+ */+ measuresList(): Measure[] {+ return Object.values(this.measures);+ }++ /**+ * @deprecated load data via RTK Query - useGetMeasureQuery+ */+ measure(measureId: MeasureId | undefined | null): Measure | null {+ return (measureId != null && this.measures[measureId]) || null;+ }+/*** @deprecated load data via RTK Query - useGetDatabaseQuery*/diff --git a/frontend/src/metabase-lib/v1/metadata/Table.ts b/frontend/src/metabase-lib/v1/metadata/Table.tsindex 3c6cadb5d05..9ff603931c4 100644--- a/frontend/src/metabase-lib/v1/metadata/Table.ts+++ b/frontend/src/metabase-lib/v1/metadata/Table.ts@@ -9,6 +9,7 @@ import Question from "../Question";import type Database from "./Database";import type Field from "./Field";import type ForeignKey from "./ForeignKey";+import type Measure from "./Measure";import type Metadata from "./Metadata";import type Schema from "./Schema";import type Segment from "./Segment";@@ -16,13 +17,14 @@ import type Segment from "./Segment";interface Tableextends Omit<NormalizedTable,- "db" | "schema" | "fields" | "fks" | "segments" | "metrics"+ "db" | "schema" | "fields" | "fks" | "segments" | "measures" | "metrics"> {db?: Database;schema?: Schema;fields?: Field[];fks?: ForeignKey[];segments?: Segment[];+ measures?: Measure[];metrics?: Question[];metadata?: Metadata;}diff --git a/frontend/src/metabase-types/api/dependencies.ts b/frontend/src/metabase-types/api/dependencies.tsindex a4274bbc273..02091dac5fd 100644--- a/frontend/src/metabase-types/api/dependencies.ts+++ b/frontend/src/metabase-types/api/dependencies.ts@@ -6,6 +6,7 @@import type { Card, CardType } from "./card";import type { Dashboard } from "./dashboard";import type { Document } from "./document";+import type { Measure } from "./measure";import type { Segment } from "./segment";import type { NativeQuerySnippet } from "./snippets";import type { Table, TableId } from "./table";@@ -20,7 +21,8 @@ export type DependencyType =| "dashboard"| "document"| "sandbox"- | "segment";+ | "segment"+ | "measure";export type DependencyGroupType = CardType | Exclude<DependencyType, "card">;export type DependencyEntry = {@@ -146,6 +148,18 @@ export type SegmentDependencyNode = BaseDependencyNode<SegmentDependencyNodeData>;+export type MeasureDependencyNodeData = Pick<+ Measure,+ "name" | "description" | "table_id" | "created_at" | "creator_id" | "creator"+> & {+ table?: Table | null;+};++export type MeasureDependencyNode = BaseDependencyNode<+ "measure",+ MeasureDependencyNodeData+>;+export type DependencyNode =| TableDependencyNode| TransformDependencyNode@@ -154,7 +168,8 @@ export type DependencyNode =| DashboardDependencyNode| DocumentDependencyNode| SandboxDependencyNode- | SegmentDependencyNode;+ | SegmentDependencyNode+ | MeasureDependencyNode;export type DependencyEdge = {from_entity_id: DependencyId;diff --git a/frontend/src/metabase-types/api/index.ts b/frontend/src/metabase-types/api/index.tsindex 73cab89ddb2..86b4b0a9dda 100644--- a/frontend/src/metabase-types/api/index.ts+++ b/frontend/src/metabase-types/api/index.ts@@ -24,6 +24,7 @@ export * from "./field";export * from "./geojson";export * from "./group";export * from "./logger";+export * from "./measure";export * from "./metabot";export * from "./modelIndexes";export * from "./models";diff --git a/frontend/src/metabase-types/api/measure.ts b/frontend/src/metabase-types/api/measure.tsnew file mode 100644index 00000000000..c7a0bd567e5--- /dev/null+++ b/frontend/src/metabase-types/api/measure.ts@@ -0,0 +1,36 @@+import type { DatasetQuery } from "./query";+import type { Table, TableId } from "./table";+import type { UserInfo } from "./user";++export type MeasureId = number;++export interface Measure {+ id: MeasureId;+ name: string;+ description: string | null;+ table_id: TableId;+ table?: Table;+ archived: boolean;+ definition: DatasetQuery;+ definition_description?: string;+ revision_message?: string;+ created_at: string;+ creator_id: number;+ creator?: UserInfo;+}++export interface CreateMeasureRequest {+ name: string;+ table_id: TableId;+ definition: DatasetQuery;+ description?: string;+}++export interface UpdateMeasureRequest {+ id: MeasureId;+ name?: string;+ definition?: DatasetQuery;+ revision_message: string;+ archived?: boolean;+ description?: string;+}diff --git a/frontend/src/metabase-types/api/mocks/index.ts b/frontend/src/metabase-types/api/mocks/index.tsindex 4108e3f64e7..be4805a735d 100644--- a/frontend/src/metabase-types/api/mocks/index.ts+++ b/frontend/src/metabase-types/api/mocks/index.ts@@ -15,6 +15,7 @@ export * from "./field";export * from "./geojson";export * from "./group";export * from "./logger";+export * from "./measure";export * from "./metabot";export * from "./modelIndexes";export * from "./models";diff --git a/frontend/src/metabase-types/api/mocks/measure.ts b/frontend/src/metabase-types/api/mocks/measure.tsnew file mode 100644index 00000000000..7b8ce006ac5--- /dev/null+++ b/frontend/src/metabase-types/api/mocks/measure.ts@@ -0,0 +1,16 @@+import type { Measure } from "metabase-types/api";++import { createMockStructuredDatasetQuery } from "./query";++export const createMockMeasure = (opts?: Partial<Measure>): Measure => ({+ id: 1,+ name: "Measure",+ description: "A measure",+ table_id: 1,+ archived: false,+ definition: createMockStructuredDatasetQuery(),+ definition_description: "",+ created_at: "2021-01-01T00:00:00Z",+ creator_id: 1,+ ...opts,+});diff --git a/frontend/src/metabase-types/api/mocks/schema.ts b/frontend/src/metabase-types/api/mocks/schema.tsindex 471c1d41fc4..1d18b05d4a6 100644--- a/frontend/src/metabase-types/api/mocks/schema.ts+++ b/frontend/src/metabase-types/api/mocks/schema.ts@@ -42,6 +42,7 @@ export const createMockNormalizedTable = ({fields,fks,segments,+ measures,metrics,...opts}: Partial<NormalizedTable> = {}): NormalizedTable => ({@@ -51,6 +52,7 @@ export const createMockNormalizedTable = ({fields,fks,segments,+ measures,metrics,});diff --git a/frontend/src/metabase-types/api/query.ts b/frontend/src/metabase-types/api/query.tsindex a6d7af16ba8..fc43bfe5ac8 100644--- a/frontend/src/metabase-types/api/query.ts+++ b/frontend/src/metabase-types/api/query.ts@@ -198,6 +198,10 @@ type CommonAggregation =export type MetricAgg = ["metric", CardId];+export type MeasureAgg =+ | ["measure", { "display-name"?: string }, CardId]+ | ["measure", CardId];+type InlineExpressionAgg = ["aggregation-options",CommonAggregation,@@ -207,7 +211,11 @@ type InlineExpressionAgg = [/*** An aggregation MBQL clause*/-export type Aggregation = CommonAggregation | MetricAgg | InlineExpressionAgg;+export type Aggregation =+ | CommonAggregation+ | MetricAgg+ | MeasureAgg+ | InlineExpressionAgg;type BreakoutClause = Breakout[];export type Breakout = ConcreteFieldReference;diff --git a/frontend/src/metabase-types/api/revision.ts b/frontend/src/metabase-types/api/revision.tsindex 79287006aea..544857f596f 100644--- a/frontend/src/metabase-types/api/revision.ts+++ b/frontend/src/metabase-types/api/revision.ts@@ -32,13 +32,21 @@ export interface Revision {};}+export type RevisionEntityType =+ | "card"+ | "dashboard"+ | "segment"+ | "measure"+ | "document"+ | "transform";+export interface ListRevisionRequest {- entity: "card" | "dashboard" | "segment" | "document" | "transform";+ entity: RevisionEntityType;id: number | string;}export interface RevertRevisionRequest {- entity: "card" | "dashboard" | "segment" | "document" | "transform";+ entity: RevisionEntityType;id: number | string;revision_id: number;}diff --git a/frontend/src/metabase-types/api/schema.ts b/frontend/src/metabase-types/api/schema.tsindex f71e16f73c6..c5fee3de340 100644--- a/frontend/src/metabase-types/api/schema.ts+++ b/frontend/src/metabase-types/api/schema.ts@@ -5,6 +5,7 @@ import type { Dashboard } from "./dashboard";import type { Database, DatabaseId } from "./database";import type { Document } from "./document";import type { Field, FieldDimension, FieldId } from "./field";+import type { Measure, MeasureId } from "./measure";import type { Segment, SegmentId } from "./segment";import type { NativeQuerySnippet } from "./snippets";import type {@@ -37,12 +38,13 @@ export interface NormalizedSchema extends Omit<Schema, "database" | "tables"> {export interface NormalizedTableextends Omit<Table,- "db" | "fields" | "fks" | "segments" | "metrics" | "schema"+ "db" | "fields" | "fks" | "segments" | "measures" | "metrics" | "schema"> {db?: DatabaseId;fields?: FieldId[];fks?: NormalizedForeignKey[];segments?: SegmentId[];+ measures?: MeasureId[];metrics?: CardId[];schema?: SchemaId;schema_name?: SchemaName;@@ -73,6 +75,10 @@ export interface NormalizedSegment extends Omit<Segment, "table"> {table?: TableId;}+export interface NormalizedMeasure extends Omit<Measure, "table"> {+ table?: TableId;+}+export interface NormalizedTimelineextends Omit<Timeline, "collection" | "events"> {collection?: CollectionId;diff --git a/frontend/src/metabase-types/api/segment.ts b/frontend/src/metabase-types/api/segment.tsindex e7ed7aa887e..93fc25f1f3d 100644--- a/frontend/src/metabase-types/api/segment.ts+++ b/frontend/src/metabase-types/api/segment.ts@@ -38,8 +38,3 @@ export interface UpdateSegmentRequest {points_of_interest?: string;show_in_getting_started?: boolean;}--export interface DeleteSegmentRequest {- id: SegmentId;- revision_message: string;-}diff --git a/frontend/src/metabase-types/api/table.ts b/frontend/src/metabase-types/api/table.tsindex 4a975fe6438..09f8edf99de 100644--- a/frontend/src/metabase-types/api/table.ts+++ b/frontend/src/metabase-types/api/table.ts@@ -3,6 +3,7 @@ import type { Collection, CollectionId } from "./collection";import type { Database, DatabaseId, InitialSyncStatus } from "./database";import type { DatasetData } from "./dataset";import type { Field, FieldId } from "./field";+import type { Measure } from "./measure";import type { Segment } from "./segment";import type { Transform, TransformId } from "./transform";import type { UserId } from "./user";@@ -49,6 +50,7 @@ export type Table = {fks?: ForeignKey[];fields?: Field[];segments?: Segment[];+ measures?: Measure[];metrics?: Card[];field_order: TableFieldOrder;diff --git a/frontend/src/metabase-types/store/entities.ts b/frontend/src/metabase-types/store/entities.tsindex b1b70fbeeb7..7dd249c94b1 100644--- a/frontend/src/metabase-types/store/entities.ts+++ b/frontend/src/metabase-types/store/entities.ts@@ -6,6 +6,7 @@ import type {NormalizedDocument,NormalizedField,NormalizedIndexedEntity,+ NormalizedMeasure,NormalizedNativeQuerySnippet,NormalizedSchema,NormalizedSegment,@@ -23,6 +24,7 @@ export interface EntitiesState {tables: Record<string, NormalizedTable>;fields: Record<string, NormalizedField>;segments: Record<string, NormalizedSegment>;+ measures: Record<string, NormalizedMeasure>;indexedEntities: Record<string, NormalizedIndexedEntity>;snippets: Record<string, NormalizedNativeQuerySnippet>;questions: Record<string, NormalizedCard>;diff --git a/frontend/src/metabase-types/store/mocks/entities.ts b/frontend/src/metabase-types/store/mocks/entities.tsindex 0fbfb23a62e..f2d2e9cd256 100644--- a/frontend/src/metabase-types/store/mocks/entities.ts+++ b/frontend/src/metabase-types/store/mocks/entities.ts@@ -12,6 +12,7 @@ export const createMockNormalizedEntitiesState = (): EntitiesState => ({tables: {},fields: {},segments: {},+ measures: {},snippets: {},questions: {},indexedEntities: {},diff --git a/frontend/src/metabase/api/index.ts b/frontend/src/metabase/api/index.tsindex 759d06df1a7..41fb0ac3e91 100644--- a/frontend/src/metabase/api/index.ts+++ b/frontend/src/metabase/api/index.ts@@ -20,6 +20,7 @@ export * from "./field";export * from "./google";export * from "./ldap";export * from "./login-history";+export * from "./measure";export * from "./model-index";export * from "./moderation";export * from "./notification";diff --git a/frontend/src/metabase/api/measure.ts b/frontend/src/metabase/api/measure.tsnew file mode 100644index 00000000000..b19ad89d196--- /dev/null+++ b/frontend/src/metabase/api/measure.ts@@ -0,0 +1,75 @@+import { updateMetadata } from "metabase/lib/redux/metadata";+import { MeasureSchema } from "metabase/schema";+import type {+ CreateMeasureRequest,+ Measure,+ MeasureId,+ UpdateMeasureRequest,+} from "metabase-types/api";++import { Api } from "./api";+import {+ idTag,+ invalidateTags,+ listTag,+ provideMeasureListTags,+ provideMeasureTags,+ tag,+} from "./tags";+import { handleQueryFulfilled } from "./utils/lifecycle";++export const measureApi = Api.injectEndpoints({+ endpoints: (builder) => ({+ listMeasures: builder.query<Measure[], void>({+ query: () => ({+ method: "GET",+ url: "/api/measure",+ }),+ providesTags: (measures = []) => provideMeasureListTags(measures),+ onQueryStarted: (_, { queryFulfilled, dispatch }) =>+ handleQueryFulfilled(queryFulfilled, (data) =>+ dispatch(updateMetadata(data, [MeasureSchema])),+ ),+ }),+ getMeasure: builder.query<Measure, MeasureId>({+ query: (id) => ({+ method: "GET",+ url: `/api/measure/${id}`,+ }),+ providesTags: (measure) => (measure ? provideMeasureTags(measure) : []),+ onQueryStarted: (_, { queryFulfilled, dispatch }) =>+ handleQueryFulfilled(queryFulfilled, (data) =>+ dispatch(updateMetadata(data, MeasureSchema)),+ ),+ }),+ createMeasure: builder.mutation<Measure, CreateMeasureRequest>({+ query: (body) => ({+ method: "POST",+ url: "/api/measure",+ body,+ }),+ invalidatesTags: (_, error) =>+ invalidateTags(error, [listTag("measure"), tag("table")]),+ }),+ updateMeasure: builder.mutation<Measure, UpdateMeasureRequest>({+ query: ({ id, ...body }) => ({+ method: "PUT",+ url: `/api/measure/${id}`,+ body,+ }),+ invalidatesTags: (_, error, { id }) =>+ invalidateTags(error, [+ listTag("measure"),+ idTag("measure", id),+ tag("table"),+ ]),+ }),+ }),+});++export const {+ useListMeasuresQuery,+ useGetMeasureQuery,+ useCreateMeasureMutation,+ useUpdateMeasureMutation,+} = measureApi;diff --git a/frontend/src/metabase/api/segment.ts b/frontend/src/metabase/api/segment.tsindex a61c5493f4f..343c1705258 100644--- a/frontend/src/metabase/api/segment.ts+++ b/frontend/src/metabase/api/segment.ts@@ -2,7 +2,6 @@ import { updateMetadata } from "metabase/lib/redux/metadata";import { SegmentSchema } from "metabase/schema";import type {CreateSegmentRequest,- DeleteSegmentRequest,Segment,SegmentId,UpdateSegmentRequest,@@ -65,19 +64,6 @@ export const segmentApi = Api.injectEndpoints({tag("table"),]),}),- deleteSegment: builder.mutation<Segment, DeleteSegmentRequest>({- query: ({ id, ...body }) => ({- method: "DELETE",- url: `/api/segment/${id}`,- body,- }),- invalidatesTags: (_, error, { id }) =>- invalidateTags(error, [- listTag("segment"),- idTag("segment", id),- tag("table"),- ]),- }),}),});@@ -86,5 +72,4 @@ export const {useGetSegmentQuery,useCreateSegmentMutation,useUpdateSegmentMutation,- useDeleteSegmentMutation,} = segmentApi;diff --git a/frontend/src/metabase/api/tags/constants.ts b/frontend/src/metabase/api/tags/constants.tsindex ba1f282edfb..d3d87871cd4 100644--- a/frontend/src/metabase/api/tags/constants.ts+++ b/frontend/src/metabase/api/tags/constants.ts@@ -24,6 +24,7 @@ export const TAG_TYPES = ["glossary","indexed-entity","logger-preset",+ "measure","model-index","notification","parameter-values",@@ -62,6 +63,7 @@ export const TAG_TYPE_MAPPING = {database: "database",document: "document","indexed-entity": "indexed-entity",+ measure: "measure",table: "table",dataset: "card",action: "action",diff --git a/frontend/src/metabase/api/tags/utils.ts b/frontend/src/metabase/api/tags/utils.tsindex 617f7b3ec30..8099c9df706 100644--- a/frontend/src/metabase/api/tags/utils.ts+++ b/frontend/src/metabase/api/tags/utils.ts@@ -25,6 +25,7 @@ import type {Group,GroupListQuery,LoggerPreset,+ Measure,ModelCacheRefreshStatus,ModelIndex,NativeQuerySnippet,@@ -544,6 +545,21 @@ export function provideSegmentTags(];}+export function provideMeasureListTags(+ measures: Measure[],+): TagDescription<TagType>[] {+ return [listTag("measure"), ...measures.flatMap(provideMeasureTags)];+}++export function provideMeasureTags(+ measure: Measure,+): TagDescription<TagType>[] {+ return [+ idTag("measure", measure.id),+ ...(measure.table ? provideTableTags(measure.table) : []),+ ];+}+export function provideSnippetListTags(snippets: NativeQuerySnippet[],): TagDescription<TagType>[] {@@ -588,6 +604,7 @@ export function provideTableTags(table: Table): TagDescription<TagType>[] {...(table.fields ? provideFieldListTags(table.fields) : []),...(table.fks ? provideForeignKeyListTags(table.fks) : []),...(table.segments ? provideSegmentListTags(table.segments) : []),+ ...(table.measures ? provideMeasureListTags(table.measures) : []),...(table.metrics ? provideCardListTags(table.metrics) : []),];}diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsxindex e8205612506..2d1da00b493 100644--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx@@ -43,6 +43,7 @@ export interface AggregationPickerProps {clauseIndex?: number;operators: Lib.AggregationOperator[];allowCustomExpressions?: boolean;+ allowMetrics?: boolean;onClose?: () => void;onQueryChange: (query: Lib.Query) => void;onBack?: () => void;@@ -62,13 +63,24 @@ type MetricListItem = Lib.MetricDisplayInfo & {selected: boolean;};+type MeasureListItem = Lib.MeasureDisplayInfo & {+ type: "measure";+ measure: Lib.MeasureMetadata;+ name: string;+ selected: boolean;+};+type ExpressionClauseListItem = {type: "expression-clause";clause: MBQLClauseFunctionConfig;displayName: string;};-type Item = OperatorListItem | MetricListItem | ExpressionClauseListItem;+type Item =+ | OperatorListItem+ | MetricListItem+ | MeasureListItem+ | ExpressionClauseListItem;type Section = BaseSection<Item>;export function AggregationPicker({@@ -79,6 +91,7 @@ export function AggregationPicker({clauseIndex,operators,allowCustomExpressions = false,+ allowMetrics = true,onClose,onQueryChange,onBack,@@ -137,10 +150,20 @@ export function AggregationPicker({[query, stageIndex, clause, clauseIndex, onQueryChange],);+ const availableColumns = useMemo(+ () => Lib.aggregableColumns(query, stageIndex, clauseIndex),+ [query, stageIndex, clauseIndex],+ );++ const availableMetrics = useMemo(+ () => (allowMetrics ? Lib.availableMetrics(query, stageIndex) : []),+ [query, stageIndex, allowMetrics],+ );+const sections = useMemo(() => {const sections: Section[] = [];- const metrics = Lib.availableMetrics(query, stageIndex);+ const measures = Lib.availableMeasures(query, stageIndex);const databaseId = Lib.databaseID(query);const database = metadata.database(databaseId);const supportsCustomExpressions = database?.hasFeature(@@ -160,11 +183,22 @@ export function AggregationPicker({});}- if (metrics.length > 0) {+ if (measures.length > 0) {+ sections.push({+ key: "measures",+ name: t`Measures`,+ items: measures.map((measure) =>+ getMeasureListItem(query, stageIndex, measure, clauseIndex),+ ),+ icon: "ruler",+ });+ }++ if (availableMetrics.length > 0) {sections.push({key: "metrics",name: t`Metrics`,- items: metrics.map((metric) =>+ items: availableMetrics.map((metric) =>getMetricListItem(query, stageIndex, metric, clauseIndex),),icon: "metric",@@ -200,13 +234,9 @@ export function AggregationPicker({operators,allowCustomExpressions,isSearching,+ availableMetrics,]);- const availableColumns = useMemo(- () => Lib.aggregableColumns(query, stageIndex, clauseIndex),- [query, stageIndex, clauseIndex],- );-const checkIsItemSelected = useCallback((item: Item) => "selected" in item && item.selected,[],@@ -275,17 +305,32 @@ export function AggregationPicker({[onSelect, onClose],);+ const handleMeasureSelect = useCallback(+ (item: MeasureListItem) => {+ onSelect(item.measure);+ onClose?.();+ },+ [onSelect, onClose],+ );+const handleChange = useCallback((item: Item) => {if (item.type === "operator") {handleOperatorSelect(item);} else if (item.type === "metric") {handleMetricSelect(item);+ } else if (item.type === "measure") {+ handleMeasureSelect(item);} else if (item.type === "expression-clause") {handleExpressionSelect(item.clause.name);}},- [handleOperatorSelect, handleMetricSelect, handleExpressionSelect],+ [+ handleOperatorSelect,+ handleMetricSelect,+ handleMeasureSelect,+ handleExpressionSelect,+ ],);const handleSectionChange = useCallback(@@ -312,6 +357,7 @@ export function AggregationPicker({query={query}stageIndex={stageIndex}availableColumns={availableColumns}+ availableMetrics={availableMetrics}name={displayInfo?.displayName}clause={clause}withName@@ -405,7 +451,7 @@ function renderItemWrapper(content: ReactNode) {}function renderItemIcon(item: Item) {- if (item.type !== "metric") {+ if (item.type !== "metric" && item.type !== "measure") {return null;}@@ -509,6 +555,28 @@ function getMetricListItem(};}+function getMeasureListItem(+ query: Lib.Query,+ stageIndex: number,+ measure: Lib.MeasureMetadata,+ clauseIndex?: number,+): MeasureListItem {+ const measureInfo = Lib.displayInfo(+ query,+ stageIndex,+ measure,+ ) as Lib.MeasureDisplayInfo;+ return {+ ...measureInfo,+ type: "measure",+ name: measureInfo.displayName,+ measure,+ selected:+ clauseIndex != null &&+ measureInfo.aggregationPositions?.includes(clauseIndex) === true,+ };+}+function getExpressionClauseListItem(clause: MBQLClauseFunctionConfig,): ExpressionClauseListItem {diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex 1326b51ff0f..f9a05fe32b1 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -15,6 +15,7 @@ export { Schemas as schemas } from "./schemas";export { Tables as tables } from "./tables";export { Fields as fields } from "./fields";export { Segments as segments } from "./segments";+export { Measures as measures } from "./measures";export { Groups as groups } from "./groups";diff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.jsnew file mode 100644index 00000000000..1368b04bff4--- /dev/null+++ b/frontend/src/metabase/entities/measures.js@@ -0,0 +1,76 @@+import {+ measureApi,+ useGetMeasureQuery,+ useListMeasuresQuery,+} from "metabase/api";+import { color } from "metabase/lib/colors";+import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";+import { MeasureSchema } from "metabase/schema";+import { getMetadata } from "metabase/selectors/metadata";++/**+ * @deprecated use "metabase/api" instead+ */+export const Measures = createEntity({+ name: "measures",+ nameOne: "measure",+ path: "/api/measure",+ schema: MeasureSchema,++ rtk: {+ getUseGetQuery: () => ({+ useGetQuery,+ }),+ useListQuery: useListMeasuresQuery,+ },++ api: {+ list: (entityQuery, dispatch) =>+ entityCompatibleQuery(+ entityQuery,+ dispatch,+ measureApi.endpoints.listMeasures,+ ),+ get: (entityQuery, options, dispatch) =>+ entityCompatibleQuery(+ entityQuery.id,+ dispatch,+ measureApi.endpoints.getMeasure,+ ),+ create: (entityQuery, dispatch) =>+ entityCompatibleQuery(+ entityQuery,+ dispatch,+ measureApi.endpoints.createMeasure,+ ),+ update: (entityQuery, dispatch) =>+ entityCompatibleQuery(+ entityQuery,+ dispatch,+ measureApi.endpoints.updateMeasure,+ ),+ },++ objectActions: {+ setArchived: (+ { id },+ archived,+ { revision_message = archived ? "(Archive)" : "(Unarchive)" } = {},+ ) => Measures.actions.update({ id }, { archived, revision_message }),++ delete: null,+ },++ selectors: {+ getObject: (state, { entityId }) => getMetadata(state).measure(entityId),+ },++ objectSelectors: {+ getName: (measure) => measure && measure.name,+ getColor: () => color("summarize"),+ },+});++const useGetQuery = ({ id }, options) => {+ return useGetMeasureQuery(id, options);+};diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.jsindex 3eb643db776..f88c4a97f93 100644--- a/frontend/src/metabase/entities/segments.js+++ b/frontend/src/metabase/entities/segments.js@@ -49,8 +49,6 @@ export const Segments = createEntity({dispatch,segmentApi.endpoints.updateSegment,),- delete: ({ id }, dispatch) =>- entityCompatibleQuery(id, dispatch, segmentApi.endpoints.deleteSegment),},objectActions: {diff --git a/frontend/src/metabase/lib/urls/data-studio.ts b/frontend/src/metabase/lib/urls/data-studio.tsindex 448e8566d14..2e84c3afe91 100644--- a/frontend/src/metabase/lib/urls/data-studio.ts+++ b/frontend/src/metabase/lib/urls/data-studio.ts@@ -3,6 +3,7 @@ import type {CollectionId,DatabaseId,FieldId,+ MeasureId,NativeQuerySnippetId,SchemaName,SegmentId,@@ -24,7 +25,11 @@ function getQueryString({ collectionId }: OptionalParams) {return queryString.length > 0 ? `?${queryString}` : "";}-export const DATA_STUDIO_TABLE_METADATA_TABS = ["field", "segments"] as const;+export const DATA_STUDIO_TABLE_METADATA_TABS = [+ "field",+ "segments",+ "measures",+] as const;export type DataStudioTableMetadataTab =(typeof DATA_STUDIO_TABLE_METADATA_TABS)[number];@@ -171,6 +176,71 @@ export function newDataStudioDataModelSegment({return `${dataStudioData({ databaseId, schemaName, tableId, tab: "segments" })}/new`;}+export function dataStudioTableMeasures(tableId: TableId) {+ return `${dataStudioTable(tableId)}/measures`;+}++export function dataStudioPublishedTableMeasureNew(tableId: TableId) {+ return `${dataStudioTableMeasures(tableId)}/new`;+}++export function dataStudioPublishedTableMeasure(+ tableId: TableId,+ measureId: MeasureId,+) {+ return `${dataStudioTableMeasures(tableId)}/${measureId}`;+}++export function dataStudioPublishedTableMeasureDependencies(+ tableId: TableId,+ measureId: MeasureId,+) {+ return `${dataStudioPublishedTableMeasure(tableId, measureId)}/dependencies`;+}++type DataModelMeasureParams = {+ databaseId: DatabaseId;+ schemaName: SchemaName;+ tableId: TableId;+ measureId: MeasureId;+};++export function dataStudioDataModelMeasure({+ databaseId,+ schemaName,+ tableId,+ measureId,+}: DataModelMeasureParams) {+ return `${dataStudioData({ databaseId, schemaName, tableId, tab: "measures" })}/${measureId}`;+}++export function dataStudioDataModelMeasureDependencies(+ params: DataModelMeasureParams,+) {+ return `${dataStudioDataModelMeasure(params)}/dependencies`;+}++export function dataStudioDataModelMeasureRevisions(+ params: DataModelMeasureParams,+) {+ return `${dataStudioDataModelMeasure(params)}/revisions`;+}++export function dataStudioPublishedTableMeasureRevisions(+ tableId: TableId,+ measureId: MeasureId,+) {+ return `${dataStudioPublishedTableMeasure(tableId, measureId)}/revisions`;+}++export function newDataStudioDataModelMeasure({+ databaseId,+ schemaName,+ tableId,+}: Omit<DataModelMeasureParams, "measureId">) {+ return `${dataStudioData({ databaseId, schemaName, tableId, tab: "measures" })}/new`;+}+export type NewDataStudioQueryModelParams = {collectionId?: CollectionId;};diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsx b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsxindex 2c1fc40635e..9333a06cbd5 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.tsx@@ -49,6 +49,7 @@ type EditorProps = {expressionMode: Lib.ExpressionMode;expressionIndex?: number;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];reportTimezone?: string;readOnly?: boolean;error?: ExpressionError | Error | null;@@ -74,6 +75,7 @@ export function Editor(props: EditorProps) {stageIndex,query,availableColumns,+ availableMetrics,readOnly,error,reportTimezone,@@ -125,6 +127,7 @@ export function Editor(props: EditorProps) {query,stageIndex,availableColumns,+ availableMetrics,metadata,extensions: [customTooltip],});@@ -253,6 +256,7 @@ function useExpression({expressionIndex,query,availableColumns,+ availableMetrics,metadata,onChange,initialClause,@@ -325,6 +329,7 @@ function useExpression({expressionIndex,metadata,availableColumns,+ availableMetrics,});if (immediate || errorRef.current) {debouncedOnChange.cancel();@@ -342,6 +347,7 @@ function useExpression({handleChange,debouncedOnChange,availableColumns,+ availableMetrics,],);diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/extensions.ts b/frontend/src/metabase/query_builder/components/expressions/Editor/extensions.tsindex 0571474abbc..fe31cf91b15 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/extensions.ts+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/extensions.ts@@ -15,6 +15,7 @@ type Options = {query: Lib.Query;stageIndex: number;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];metadata: Metadata;extensions?: Extension[];};@@ -38,6 +39,7 @@ export function useExtensions(options: Options): Extension[] {query,stageIndex,availableColumns,+ availableMetrics,metadata,extensions: extra = [],} = options;@@ -49,6 +51,7 @@ export function useExtensions(options: Options): Extension[] {query,stageIndex,availableColumns,+ availableMetrics,metadata,}),expander(),@@ -57,6 +60,7 @@ export function useExtensions(options: Options): Extension[] {stageIndex,expressionMode,availableColumns,+ availableMetrics,metadata,}),tooltips({diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/language.ts b/frontend/src/metabase/query_builder/components/expressions/Editor/language.tsindex 10269e0b04e..bff77a522b2 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/language.ts+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/language.ts@@ -23,6 +23,7 @@ type LintOptions = {query: Lib.Query;stageIndex: number;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];metadata: Metadata;};diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsxindex c14b0618cdb..fe4129bbe75 100644--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.tsx@@ -36,6 +36,7 @@ export type ExpressionWidgetProps = {header?: ReactNode;initialExpressionClause?: DefinedClauseName | null;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];readOnly?: boolean;onChangeClause?: (name: string, clause: Lib.ExpressionClause) => void;@@ -54,6 +55,7 @@ export const ExpressionWidget = (props: ExpressionWidgetProps) => {reportTimezone,header,availableColumns,+ availableMetrics,onChangeClause,onClose,initialExpressionClause,@@ -199,6 +201,7 @@ export const ExpressionWidget = (props: ExpressionWidgetProps) => {stageIndex={stageIndex}expressionIndex={expressionIndex}availableColumns={availableColumns}+ availableMetrics={availableMetrics}reportTimezone={reportTimezone}shortcuts={shortcuts}error={error}diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsxindex 3cbaf9f9505..9d0c6c00f06 100644--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidget.unit.spec.tsx@@ -128,7 +128,9 @@ describe("ExpressionWidget", () => {const doneButton = screen.getByRole("button", { name: "Done" });expect(doneButton).toBeDisabled();- await screen.findByText("Unknown Aggregation or Metric: Imaginary");+ await screen.findByText(+ "Unknown Aggregation, Measure or Metric: Imaginary",+ );});it("should show 'no aggregation found' error if the identifier is recognized as a dimension (metabase#50753)", async () => {diff --git a/frontend/src/metabase/querying/expressions/compile-expression.ts b/frontend/src/metabase/querying/expressions/compile-expression.tsindex c8345d63bcc..84d804abe8e 100644--- a/frontend/src/metabase/querying/expressions/compile-expression.ts+++ b/frontend/src/metabase/querying/expressions/compile-expression.ts@@ -23,11 +23,13 @@ export function compileExpression({query,stageIndex,availableColumns,+ availableMetrics,resolver = defaultResolver({query,stageIndex,expressionMode,availableColumns,+ availableMetrics,}),hooks = {error(error) {@@ -40,6 +42,7 @@ export function compileExpression({query: Lib.Query;stageIndex: number;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];resolver?: Resolver | null;hooks?: Hooks;}): CompileResult {diff --git a/frontend/src/metabase/querying/expressions/diagnostics/diagnostics.ts b/frontend/src/metabase/querying/expressions/diagnostics/diagnostics.tsindex f910fc160c1..fbeb8b7ed60 100644--- a/frontend/src/metabase/querying/expressions/diagnostics/diagnostics.ts+++ b/frontend/src/metabase/querying/expressions/diagnostics/diagnostics.ts@@ -15,6 +15,7 @@ type Options = {stageIndex: number;expressionIndex?: number;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];metadata?: Metadata;};diff --git a/frontend/src/metabase/querying/expressions/formatter/formatter.ts b/frontend/src/metabase/querying/expressions/formatter/formatter.tsindex fb4e6a5f63e..43a443a5e27 100644--- a/frontend/src/metabase/querying/expressions/formatter/formatter.ts+++ b/frontend/src/metabase/querying/expressions/formatter/formatter.ts@@ -136,6 +136,8 @@ function print(return formatColumn(path, options.extra);} else if (check.isMetricMetadata(path)) {return formatMetric(path, options.extra);+ } else if (check.isMeasureMetadata(path)) {+ return formatMeasure(path, options.extra);} else if (check.isSegmentMetadata(path)) {return formatSegment(path, options.extra);} else if (check.isExpressionOperator(path)) {@@ -211,6 +213,21 @@ function formatMetric(return formatMetricName(displayInfo.displayName);}+function formatMeasure(+ path: AstPath<Lib.MeasureMetadata>,+ options: FormatOptions,+): Doc {+ const metric = path.node;+ const { query, stageIndex } = options;++ assert(query !== undefined, "Expected query");+ assert(typeof stageIndex === "number", "Expected stageIndex");+ assert(Lib.isMeasureMetadata(metric), "Expected measure");++ const displayInfo = Lib.displayInfo(query, stageIndex, metric);+ return formatMetricName(displayInfo.displayName);+}+function formatSegment(path: AstPath<Lib.SegmentMetadata>,options: FormatOptions,diff --git a/frontend/src/metabase/querying/expressions/formatter/formatter.unit.spec.ts b/frontend/src/metabase/querying/expressions/formatter/formatter.unit.spec.tsindex b471abd49f9..0683ed91ff5 100644--- a/frontend/src/metabase/querying/expressions/formatter/formatter.unit.spec.ts+++ b/frontend/src/metabase/querying/expressions/formatter/formatter.unit.spec.ts@@ -9,6 +9,7 @@ import { compileExpression } from "../compile-expression";import {expressions,fields,+ measures,metrics,query,segments,@@ -287,6 +288,7 @@ describe("format", () => {{ result: "[Unknown Field]", parts: fields.orders.TOTAL },{ result: "[Unknown Segment]", parts: segments.EXPENSIVE_THINGS },{ result: "[Unknown Metric]", parts: metrics.FOO },+ { result: "[Unknown Measure]", parts: measures.BAR },])("should format an unknown %s as %s", async ({ result, parts }) => {const clause = Lib.expressionClause(parts);@@ -644,6 +646,12 @@ describe("if printWidth = Infinity, it should return the same results as the sin});});+ it("should format measures", async () => {+ await all({+ "[Bar Measure]": measures.BAR,+ });+ });+it("should format the mode options for datetime functions", async () => {await all({'datetime(55, "unixSeconds")': opt(diff --git a/frontend/src/metabase/querying/expressions/formatter/utils.ts b/frontend/src/metabase/querying/expressions/formatter/utils.tsindex cf0423a7c8f..c698b7fd46d 100644--- a/frontend/src/metabase/querying/expressions/formatter/utils.ts+++ b/frontend/src/metabase/querying/expressions/formatter/utils.ts@@ -50,6 +50,7 @@ export const pathMatchers = lift({isExpressionParts: Lib.isExpressionParts,isColumnMetadata: Lib.isColumnMetadata,isMetricMetadata: Lib.isMetricMetadata,+ isMeasureMetadata: Lib.isMeasureMetadata,isSegmentMetadata: Lib.isSegmentMetadata,isExpressionOperator,isDimensionOperator,diff --git a/frontend/src/metabase/querying/expressions/identifier.ts b/frontend/src/metabase/querying/expressions/identifier.tsindex 3cc928fe277..4ffa6dae21b 100644--- a/frontend/src/metabase/querying/expressions/identifier.ts+++ b/frontend/src/metabase/querying/expressions/identifier.ts@@ -20,6 +20,10 @@ export function formatMetricName(metricName: string) {return formatIdentifier(metricName);}+export function formatMeasureName(measureName: string) {+ return formatIdentifier(measureName);+}+export function formatSegmentName(segmentName: string) {return formatIdentifier(segmentName);}diff --git a/frontend/src/metabase/querying/expressions/pratt/compiler.ts b/frontend/src/metabase/querying/expressions/pratt/compiler.tsindex 6f29672d2f3..8fb2754b91c 100644--- a/frontend/src/metabase/querying/expressions/pratt/compiler.ts+++ b/frontend/src/metabase/querying/expressions/pratt/compiler.ts@@ -91,9 +91,10 @@ function compileRoot(ctx: Context,):| Lib.ExpressionParts- | Lib.SegmentMetadata+ | Lib.ColumnMetadata+ | Lib.MeasureMetadata| Lib.MetricMetadata- | Lib.ColumnMetadata {+ | Lib.SegmentMetadata {assert(node.type === ROOT, t`Must be root node`);assert(node.children.length === 1, t`Root must have one child`);diff --git a/frontend/src/metabase/querying/expressions/resolver.ts b/frontend/src/metabase/querying/expressions/resolver.tsindex c98ef5337f8..bf873e83ca4 100644--- a/frontend/src/metabase/querying/expressions/resolver.ts+++ b/frontend/src/metabase/querying/expressions/resolver.ts@@ -19,13 +19,24 @@ type Options = {stageIndex: number;expressionMode: Lib.ExpressionMode;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];};export function resolver(options: Options): Resolver {- const { query, stageIndex, expressionMode, availableColumns } = options;-- const metrics = _.memoize(() => Lib.availableMetrics(query, stageIndex));+ const {+ query,+ stageIndex,+ expressionMode,+ availableColumns,+ availableMetrics,+ } = options;++ const metrics = _.memoize(+ () => availableMetrics ?? Lib.availableMetrics(query, stageIndex),+ );const segments = _.memoize(() => Lib.availableSegments(query, stageIndex));+ const measures = _.memoize(() => Lib.availableMeasures(query, stageIndex));+const cache = infoCache(options);return function (type, name, node) {@@ -33,10 +44,21 @@ export function resolver(options: Options): Resolver {if (type === "aggregation") {// Return metrics- const dimension = findByName([...metrics(), ...availableColumns]);+ const dimension = findByName([+ ...metrics(),+ ...measures(),+ ...availableColumns,+ ]);+if (!dimension) {- throw new CompileError(t`Unknown Aggregation or Metric: ${name}`, node);- } else if (!Lib.isMetricMetadata(dimension)) {+ throw new CompileError(+ t`Unknown Aggregation, Measure or Metric: ${name}`,+ node,+ );+ } else if (+ !Lib.isMetricMetadata(dimension) &&+ !Lib.isMeasureMetadata(dimension)+ ) {// If no metric was found, but there is a matching column,// show a more sophisticated error messagethrow new CompileError(@@ -65,15 +87,17 @@ export function resolver(options: Options): Resolver {return dimension;}- // Return columns and, in the case of aggregation expressions, metrics+ // Return columns and, in the case of aggregation expressions, metrics and measuresconst dimension = findByName([...availableColumns,- ...(expressionMode === "aggregation" ? metrics() : []),+ ...(expressionMode === "aggregation"+ ? [...metrics(), ...measures()]+ : []),]);if (!dimension) {if (expressionMode === "aggregation") {throw new CompileError(- t`Unknown column, Aggregation or Metric: ${name}`,+ t`Unknown column, Aggregation, Measure or Metric: ${name}`,node,);}@@ -83,13 +107,21 @@ export function resolver(options: Options): Resolver {};}-type Dimension = Lib.SegmentMetadata | Lib.MetricMetadata | Lib.ColumnMetadata;+type Dimension =+ | Lib.ColumnMetadata+ | Lib.MeasureMetadata+ | Lib.MetricMetadata+ | Lib.SegmentMetadata;++type DimensionInfo =+ | Lib.ColumnDisplayInfo+ | Lib.MeasureDisplayInfo+ | Lib.MetricDisplayInfo+ | Lib.SegmentDisplayInfo;function nameMatcher(name: string,- info: (- dimension: Dimension,- ) => Lib.ColumnDisplayInfo | Lib.MetricDisplayInfo | Lib.SegmentDisplayInfo,+ info: (dimension: Dimension) => DimensionInfo,): (dimensions: Dimension[]) => Dimension | undefined {function byName({preserveSeparators,@@ -145,11 +177,8 @@ function equals(caseSensitive: boolean, a: string, b: string) {// The cache only lives for the duration of each compile phase,// so the query can not change in the meantime.function infoCache(options: Options) {- const cache = new Map<- Dimension,- Lib.ColumnDisplayInfo | Lib.MetricDisplayInfo | Lib.SegmentDisplayInfo- >();- return function (dimension: Dimension) {+ const cache = new Map<Dimension, DimensionInfo>();+ return function (dimension: Dimension): DimensionInfo {const cached = cache.get(dimension);if (cached) {return cached;diff --git a/frontend/src/metabase/querying/expressions/resolver.unit.spec.ts b/frontend/src/metabase/querying/expressions/resolver.unit.spec.tsindex 0567bd979cf..7c8101a7f02 100644--- a/frontend/src/metabase/querying/expressions/resolver.unit.spec.ts+++ b/frontend/src/metabase/querying/expressions/resolver.unit.spec.ts@@ -7,6 +7,7 @@ import {fields,findDimensions,findField,+ measures,metrics,query,queryWithAggregation,@@ -62,6 +63,12 @@ describe("resolver", () => {"Unknown Segment or boolean column: Foo Metric",);});++ it("should not resolve measures", () => {+ expect(() => boolean("Bar Measure")).toThrow(+ "Unknown Segment or boolean column: Bar Measure",+ );+ });});describe("type = string", () => {@@ -103,6 +110,12 @@ describe("resolver", () => {"Unknown column: Foo Metric",);});++ it("should not resolve measures", () => {+ expect(() => string("Bar Measure")).toThrow(+ "Unknown column: Bar Measure",+ );+ });});describe("type = number", () => {@@ -134,6 +147,12 @@ describe("resolver", () => {"Unknown column: Foo Metric",);});++ it("should not resolve measures", () => {+ expect(() => number("Bar Measure")).toThrow(+ "Unknown column: Bar Measure",+ );+ });});describe("type = datetime", () => {@@ -158,6 +177,12 @@ describe("resolver", () => {"Unknown column: Foo Metric",);});++ it("should resolve measures", () => {+ expect(() => datetime("Bar Measure")).toThrow(+ "Unknown column: Bar Measure",+ );+ });});describe("type = any", () => {@@ -183,6 +208,12 @@ describe("resolver", () => {it("should not resolve metrics", () => {expect(() => any("Foo Metric")).toThrow("Unknown column: Foo Metric");});++ it("should not resolve measures", () => {+ expect(() => any("Bar Measure")).toThrow(+ "Unknown column: Bar Measure",+ );+ });});describe("type = expression", () => {@@ -212,6 +243,12 @@ describe("resolver", () => {"Unknown column: Foo Metric",);});++ it("should not resolve measures", () => {+ expect(() => expression("Bar Measure")).toThrow(+ "Unknown column: Bar Measure",+ );+ });});describe("type = aggregation", () => {@@ -219,7 +256,7 @@ describe("resolver", () => {it("should not resolve fields", () => {expect(() => aggregation("Unknown")).toThrow(- "Unknown Aggregation or Metric: Unknown",+ "Unknown Aggregation, Measure or Metric: Unknown",);expect(() => aggregation("Created At")).toThrow("No aggregation found in: Created At. Use functions like Sum() or custom Metrics",@@ -234,13 +271,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => aggregation("Unknown")).toThrow(- "Unknown Aggregation or Metric: Unknown",+ "Unknown Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => aggregation("Expensive Things")).toThrow(- "Unknown Aggregation or Metric: Expensive Things",+ "Unknown Aggregation, Measure or Metric: Expensive Things",);});@@ -248,6 +285,11 @@ describe("resolver", () => {expect(aggregation("Foo Metric")).toEqual(metrics.FOO);expect(aggregation("foo metric")).toEqual(metrics.FOO);});++ it("should resolve measures", () => {+ expect(aggregation("Bar Measure")).toEqual(measures.BAR);+ expect(aggregation("bar measure")).toEqual(measures.BAR);+ });});it("should allow resolving field with exact case matches first", () => {@@ -331,6 +373,12 @@ describe("resolver", () => {);});+ it("should not resolve measures", () => {+ expect(() => boolean("Bar Measure")).toThrow(+ "Unknown Segment or boolean column: Bar Measure",+ );+ });+it("should not resolve aggregations", () => {expect(() => boolean("Bar Aggregation")).toThrow("Unknown Segment or boolean column: Bar Aggregation",@@ -355,13 +403,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => string("Unknown")).toThrow(- "Unknown column, Aggregation or Metric: Unknown",+ "Unknown column, Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => string("Expensive Things")).toThrow(- "Unknown column, Aggregation or Metric: Expensive Things",+ "Unknown column, Aggregation, Measure or Metric: Expensive Things",);});@@ -369,6 +417,10 @@ describe("resolver", () => {expect(string("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(string("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(string("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION);});@@ -387,13 +439,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => number("Unknown")).toThrow(- "Unknown column, Aggregation or Metric: Unknown",+ "Unknown column, Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => number("Expensive Things")).toThrow(- "Unknown column, Aggregation or Metric: Expensive Things",+ "Unknown column, Aggregation, Measure or Metric: Expensive Things",);});@@ -401,6 +453,10 @@ describe("resolver", () => {expect(number("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(number("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(number("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION);});@@ -415,13 +471,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => datetime("Unknown")).toThrow(- "Unknown column, Aggregation or Metric: Unknown",+ "Unknown column, Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => datetime("Expensive Things")).toThrow(- "Unknown column, Aggregation or Metric: Expensive Things",+ "Unknown column, Aggregation, Measure or Metric: Expensive Things",);});@@ -429,6 +485,10 @@ describe("resolver", () => {expect(datetime("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(datetime("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(datetime("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION,@@ -448,7 +508,7 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => any("Unknown")).toThrow(- "Unknown column, Aggregation or Metric: Unknown",+ "Unknown column, Aggregation, Measure or Metric: Unknown",);});@@ -456,7 +516,7 @@ describe("resolver", () => {// We do not resolve segments here since any is only used in offset// and offset only works in aggregations.expect(() => any("Expensive Things")).toThrow(- "Unknown column, Aggregation or Metric: Expensive Things",+ "Unknown column, Aggregation, Measure or Metric: Expensive Things",);});@@ -464,6 +524,10 @@ describe("resolver", () => {expect(any("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(any("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(any("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION);});@@ -481,13 +545,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => expression("Unknown")).toThrow(- "Unknown column, Aggregation or Metric: Unknown",+ "Unknown column, Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => expression("Expensive Things")).toThrow(- "Unknown column, Aggregation or Metric: Expensive Things",+ "Unknown column, Aggregation, Measure or Metric: Expensive Things",);});@@ -495,6 +559,10 @@ describe("resolver", () => {expect(expression("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(expression("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(expression("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION,@@ -507,7 +575,7 @@ describe("resolver", () => {it("should not resolve fields", () => {expect(() => aggregation("Unknown")).toThrow(- "Unknown Aggregation or Metric: Unknown",+ "Unknown Aggregation, Measure or Metric: Unknown",);expect(() => aggregation("Created At")).toThrow("No aggregation found in: Created At. Use functions like Sum() or custom Metrics",@@ -522,13 +590,13 @@ describe("resolver", () => {it("should not resolve unknown fields", () => {expect(() => aggregation("Unknown")).toThrow(- "Unknown Aggregation or Metric: Unknown",+ "Unknown Aggregation, Measure or Metric: Unknown",);});it("should not resolve segments", () => {expect(() => aggregation("Expensive Things")).toThrow(- "Unknown Aggregation or Metric: Expensive Things",+ "Unknown Aggregation, Measure or Metric: Expensive Things",);});@@ -536,6 +604,10 @@ describe("resolver", () => {expect(aggregation("Foo Metric")).toEqual(metrics.FOO);});+ it("should resolve measures", () => {+ expect(aggregation("Bar Measure")).toEqual(measures.BAR);+ });+it("should resolve aggregations", () => {expect(aggregation("Bar Aggregation")).toEqual(aggregations.BAR_AGGREGATION,diff --git a/frontend/src/metabase/querying/expressions/suggestions/measures.ts b/frontend/src/metabase/querying/expressions/suggestions/measures.tsnew file mode 100644index 00000000000..713f1dd2093--- /dev/null+++ b/frontend/src/metabase/querying/expressions/suggestions/measures.ts@@ -0,0 +1,61 @@+import type { CompletionContext } from "@codemirror/autocomplete";++import * as Lib from "metabase-lib";++import { formatIdentifier } from "../identifier";+import { tokenAtPos } from "../position";++import { fuzzyMatcher } from "./util";++export type Options = {+ expressionMode: Lib.ExpressionMode;+ query: Lib.Query;+ stageIndex: number;+};++export function suggestMeasures({+ expressionMode,+ query,+ stageIndex,+}: Options) {+ const measures = Lib.availableMeasures(query, stageIndex)?.map((metric) => {+ const displayInfo = Lib.displayInfo(query, stageIndex, metric);+ return {+ type: "measure",+ displayLabel: displayInfo.longDisplayName,+ label: formatIdentifier(displayInfo.longDisplayName),+ icon: "sum" as const,+ };+ });++ if (expressionMode !== "aggregation" || measures.length === 0) {+ return null;+ }++ const matcher = fuzzyMatcher(measures);++ return function (context: CompletionContext) {+ const source = context.state.doc.toString();+ const token = tokenAtPos(source, context.pos);++ if (!token) {+ return null;+ }++ const word = token.text.replace(/^\[/, "").replace(/\]$/, "");+ if (word === "") {+ return {+ from: token.start,+ to: token.end,+ options: measures,+ filter: false,+ };+ }++ return {+ from: token.start,+ to: token.end,+ options: matcher(token.text),+ };+ };+}diff --git a/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts b/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.tsnew file mode 100644index 00000000000..f57840831fb--- /dev/null+++ b/frontend/src/metabase/querying/expressions/suggestions/measures.unit.spec.ts@@ -0,0 +1,143 @@+import { createMockMetadata } from "__support__/metadata";+import { SAMPLE_DATABASE, createQuery } from "metabase-lib/test-helpers";+import {+ createMockField,+ createMockMeasure,+ createMockStructuredDatasetQuery,+ createMockTable,+} from "metabase-types/api/mocks";+import { createSampleDatabase } from "metabase-types/api/mocks/presets";++import { complete } from "./__support__";+import { type Options, suggestMeasures } from "./measures";++describe("suggestMeasures", () => {+ function setup({ expressionMode = "expression" }: Partial<Options>) {+ const DATABASE_ID = SAMPLE_DATABASE.id;+ const TABLE_ID = 1;++ const MEASURE_BAR = createMockMeasure({+ name: "BAR",+ table_id: TABLE_ID,+ definition: createMockStructuredDatasetQuery({+ database: DATABASE_ID,+ query: {+ "source-table": TABLE_ID,+ aggregation: [["sum", ["field", 11, {}]]],+ },+ }),+ });++ const TABLE = createMockTable({+ db_id: DATABASE_ID,+ id: TABLE_ID,+ fields: [+ createMockField({+ id: 10,+ table_id: TABLE_ID,+ display_name: "Toucan Sam",+ base_type: "type/Float",+ }),+ createMockField({+ id: 11,+ table_id: TABLE_ID,+ display_name: "Sum",+ base_type: "type/Float",+ }),+ createMockField({+ id: 12,+ table_id: TABLE_ID,+ display_name: "count",+ base_type: "type/Float",+ }),+ createMockField({+ id: 13,+ table_id: TABLE_ID,+ display_name: "text",+ base_type: "type/Text",+ }),+ createMockField({+ id: 14,+ table_id: TABLE_ID,+ display_name: "date",+ base_type: "type/DateTime",+ }),+ ],+ measures: [MEASURE_BAR],+ });++ const DATABASE = createSampleDatabase({+ id: DATABASE_ID,+ name: "Database",+ tables: [TABLE],+ });++ const metadata = createMockMetadata({+ databases: [DATABASE],+ tables: [TABLE],+ });++ const query = createQuery({+ metadata,+ query: {+ database: DATABASE.id,+ type: "query",+ query: {+ "source-table": TABLE.id,+ },+ },+ });++ const source = suggestMeasures({+ expressionMode,+ query,+ stageIndex: -1,+ });++ return function (doc: string) {+ return complete(source, doc);+ };+ }++ describe("expressionMode = expression", () => {+ const expressionMode = "expression";++ it("should not suggest measures", () => {+ const complete = setup({ expressionMode });+ const results = complete("Ba|");+ expect(results).toBe(null);+ });+ });++ describe("expressionMode = boolean", () => {+ const expressionMode = "filter";++ it("should not suggest measures", () => {+ const complete = setup({ expressionMode });+ const results = complete("Ba|");+ expect(results).toBe(null);+ });+ });++ describe("expressionMode = aggregations", () => {+ const expressionMode = "aggregation";++ it("should suggest measures", () => {+ const complete = setup({ expressionMode });+ const results = complete("BA|");+ expect(results).toEqual({+ from: 0,+ to: 2,+ options: [+ {+ displayLabel: "BAR",+ icon: "sum",+ label: "[BAR]",+ matches: [[0, 1]],+ type: "measure",+ },+ ],+ });+ });+ });+});diff --git a/frontend/src/metabase/querying/expressions/suggestions/metrics.ts b/frontend/src/metabase/querying/expressions/suggestions/metrics.tsindex 7cebddcc072..87a2906dbd8 100644--- a/frontend/src/metabase/querying/expressions/suggestions/metrics.ts+++ b/frontend/src/metabase/querying/expressions/suggestions/metrics.ts@@ -11,10 +11,18 @@ export type Options = {expressionMode: Lib.ExpressionMode;query: Lib.Query;stageIndex: number;+ availableMetrics?: Lib.MetricMetadata[];};-export function suggestMetrics({ expressionMode, query, stageIndex }: Options) {- const metrics = Lib.availableMetrics(query, stageIndex)?.map((metric) => {+export function suggestMetrics({+ expressionMode,+ query,+ stageIndex,+ availableMetrics,+}: Options) {+ const metrics = (+ availableMetrics ?? Lib.availableMetrics(query, stageIndex)+ )?.map((metric) => {const displayInfo = Lib.displayInfo(query, stageIndex, metric);return {type: "metric",diff --git a/frontend/src/metabase/querying/expressions/suggestions/suggest.ts b/frontend/src/metabase/querying/expressions/suggestions/suggest.tsindex 2c9bc9802c2..1968fbba593 100644--- a/frontend/src/metabase/querying/expressions/suggestions/suggest.ts+++ b/frontend/src/metabase/querying/expressions/suggestions/suggest.ts@@ -10,12 +10,14 @@ export type SuggestOptions = {metadata: Metadata;expressionMode: Lib.ExpressionMode;availableColumns: Lib.ColumnMetadata[];+ availableMetrics?: Lib.MetricMetadata[];};import { suggestAggregations } from "./aggregations";import { suggestFields } from "./fields";import { suggestFunctions } from "./functions";import { suggestLiterals } from "./literals";+import { suggestMeasures } from "./measures";import { suggestMetrics } from "./metrics";import { suggestSegments } from "./segments";@@ -30,6 +32,7 @@ export function suggestions(options: SuggestOptions) {suggestAggregations(options),suggestFields(options),suggestMetrics(options),+ suggestMeasures(options),suggestSegments(options),].filter(isNotNull),});diff --git a/frontend/src/metabase/querying/expressions/test/shared.ts b/frontend/src/metabase/querying/expressions/test/shared.tsindex 78f0b1421ce..23d76d6d6e2 100644--- a/frontend/src/metabase/querying/expressions/test/shared.ts+++ b/frontend/src/metabase/querying/expressions/test/shared.ts@@ -9,6 +9,7 @@ import {import {COMMON_DATABASE_FEATURES,createMockCard,+ createMockMeasure,createMockSegment,createMockStructuredDatasetQuery,createMockStructuredQuery,@@ -69,6 +70,20 @@ const metadata = createMockMetadata({}),}),],+ measures: [+ createMockMeasure({+ id: getNextId(),+ name: "Bar Measure",+ table_id: ORDERS_ID,+ definition: createMockStructuredDatasetQuery({+ database: SAMPLE_DB_ID,+ query: createMockStructuredQuery({+ "source-table": ORDERS_ID,+ aggregation: [["sum", ["field", ORDERS.TOTAL, {}]]],+ }),+ }),+ }),+ ],}),],}),@@ -199,6 +214,17 @@ function findMetric(query: Lib.Query, name: string) {throw new Error(`Could not find metric: ${name}`);}+function findMeasure(query: Lib.Query, name: string) {+ const measures = Lib.availableMeasures(query, stageIndex);+ for (const measure of measures) {+ const info = Lib.displayInfo(query, stageIndex, measure);+ if (info.displayName === name) {+ return measure;+ }+ }+ throw new Error(`Could not find measure: ${name}`);+}+function findAggregation(query: Lib.Query, name: string) {if (query !== queryWithAggregation) {return null;@@ -238,6 +264,10 @@ export function findDimensions(query: Lib.Query) {FOO: findMetric(query, "Foo Metric"),};+ const measures = {+ BAR: findMeasure(query, "Bar Measure"),+ };+const aggregations = {BAR_AGGREGATION: findAggregation(query, "Bar Aggregation"),};@@ -247,9 +277,11 @@ export function findDimensions(query: Lib.Query) {expressions,segments,metrics,+ measures,aggregations,};}-export const { fields, expressions, segments, metrics } = findDimensions(query);+export const { fields, expressions, segments, metrics, measures } =+ findDimensions(query);export const sharedMetadata = metadata;diff --git a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsxnew file mode 100644index 00000000000..5445a68e407--- /dev/null+++ b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/MeasureAggregationPicker.tsx@@ -0,0 +1,107 @@+import { useCallback, useMemo } from "react";+import { t } from "ttag";++import ErrorBoundary from "metabase/ErrorBoundary";+import { AggregationPicker } from "metabase/common/components/AggregationPicker";+import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";+import { color } from "metabase/ui/utils/colors";+import * as Lib from "metabase-lib";++const STAGE_INDEX = -1;++type MeasureAggregationPickerProps = {+ query: Lib.Query;+ onChange: (query: Lib.Query) => void;+ readOnly?: boolean;+};++export function MeasureAggregationPicker({+ query,+ onChange,+ readOnly = false,+}: MeasureAggregationPickerProps) {+ const aggregations = useMemo(+ () => Lib.aggregations(query, STAGE_INDEX),+ [query],+ );++ const operators = useMemo(() => {+ const baseOperators = Lib.availableAggregationOperators(query, STAGE_INDEX);+ if (aggregations.length > 0) {+ return Lib.selectedAggregationOperators(baseOperators, aggregations[0]);+ }+ return baseOperators;+ }, [query, aggregations]);++ const renderAggregationName = useCallback(+ (aggregation: Lib.AggregationClause) =>+ Lib.displayInfo(query, STAGE_INDEX, aggregation).longDisplayName,+ [query],+ );++ const handleQueryChange = useCallback(+ (newQuery: Lib.Query) => {+ onChange(newQuery);+ },+ [onChange],+ );++ const handleReorderAggregation = useCallback(+ (+ sourceClause: Lib.AggregationClause,+ targetClause: Lib.AggregationClause,+ ) => {+ const nextQuery = Lib.swapClauses(+ query,+ STAGE_INDEX,+ sourceClause,+ targetClause,+ );+ onChange(nextQuery);+ },+ [query, onChange],+ );++ const handleRemoveAggregation = useCallback(+ (clause: Lib.AggregationClause) => {+ const nextQuery = Lib.removeClause(query, STAGE_INDEX, clause);+ onChange(nextQuery);+ },+ [query, onChange],+ );++ const hasAddButton = !readOnly && aggregations.length === 0;+ const hasRemoveButton = !readOnly;++ return (+ <ErrorBoundary>+ <ClauseStep+ items={aggregations}+ initialAddText={t`Pick an aggregation function`}+ readOnly={readOnly}+ color={color("summarize")}+ isLastOpened={false}+ hasAddButton={hasAddButton}+ hasRemoveButton={hasRemoveButton}+ renderName={renderAggregationName}+ renderPopover={({ item: aggregation, index, onClose }) => (+ <AggregationPicker+ query={query}+ stageIndex={STAGE_INDEX}+ clause={aggregation}+ clauseIndex={index}+ operators={operators}+ allowCustomExpressions+ allowMetrics={false}+ onQueryChange={handleQueryChange}+ onClose={onClose}+ readOnly={readOnly}+ />+ )}+ onReorder={handleReorderAggregation}+ onRemove={handleRemoveAggregation}+ data-testid="measure-editor"+ />+ </ErrorBoundary>+ );+}diff --git a/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/index.ts b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/index.tsnew file mode 100644index 00000000000..18e37239d1d--- /dev/null+++ b/frontend/src/metabase/querying/measures/components/MeasureAggregationPicker/index.ts@@ -0,0 +1 @@+export { MeasureAggregationPicker } from "./MeasureAggregationPicker";diff --git a/frontend/src/metabase/querying/measures/index.ts b/frontend/src/metabase/querying/measures/index.tsnew file mode 100644index 00000000000..08681534397--- /dev/null+++ b/frontend/src/metabase/querying/measures/index.ts@@ -0,0 +1 @@+export { MeasureAggregationPicker } from "./components/MeasureAggregationPicker";diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.jsindex 77c8f645dfa..3ac6c38a99d 100644--- a/frontend/src/metabase/schema.js+++ b/frontend/src/metabase/schema.js@@ -70,6 +70,7 @@ export const FieldSchema = new schema.Entity("fields", undefined, {export const ForeignKeySchema = new schema.Entity("foreignKeys");export const SegmentSchema = new schema.Entity("segments");+export const MeasureSchema = new schema.Entity("measures");export const PersistedModelSchema = new schema.Entity("persistedModels");export const SnippetSchema = new schema.Entity("snippets");export const SnippetCollectionSchema = new schema.Entity("snippetCollections");@@ -93,6 +94,7 @@ TableSchema.define({fks: [{ origin: FieldSchema, destination: FieldSchema }],metrics: [QuestionSchema],segments: [SegmentSchema],+ measures: [MeasureSchema],schema: SchemaSchema,collection: CollectionSchema,});@@ -113,6 +115,10 @@ SegmentSchema.define({table: TableSchema,});+MeasureSchema.define({+ table: TableSchema,+});+TimelineSchema.define({collection: CollectionSchema,events: [TimelineEventSchema],@@ -130,6 +136,7 @@ export const ENTITIES_SCHEMA_MAP = {pulses: PulseSchema,collections: CollectionSchema,segments: SegmentSchema,+ measures: MeasureSchema,snippets: SnippetSchema,snippetCollections: SnippetCollectionSchema,documents: DocumentSchema,diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.tsindex 8a20358650a..3484aee93ad 100644--- a/frontend/src/metabase/selectors/metadata.ts+++ b/frontend/src/metabase/selectors/metadata.ts@@ -6,6 +6,7 @@ import Question from "metabase-lib/v1/Question";import Database from "metabase-lib/v1/metadata/Database";import Field from "metabase-lib/v1/metadata/Field";import ForeignKey from "metabase-lib/v1/metadata/ForeignKey";+import Measure from "metabase-lib/v1/metadata/Measure";import Metadata from "metabase-lib/v1/metadata/Metadata";import Schema from "metabase-lib/v1/metadata/Schema";import Segment from "metabase-lib/v1/metadata/Segment";@@ -20,6 +21,7 @@ import type {NormalizedDatabase,NormalizedField,NormalizedForeignKey,+ NormalizedMeasure,NormalizedSchema,NormalizedSegment,NormalizedTable,@@ -86,6 +88,7 @@ const getNormalizedFields = createSelector();const getNormalizedSegments = (state: State) => state.entities.segments;+const getNormalizedMeasures = (state: State) => state.entities.measures ?? {};const getNormalizedQuestions = (state: State) => state.entities.questions;const getNormalizedSnippets = (state: State) => state.entities.snippets;@@ -93,6 +96,7 @@ export const getShallowDatabases = getNormalizedDatabases;export const getShallowTables = getNormalizedTables;export const getShallowFields = getNormalizedFields;export const getShallowSegments = getNormalizedSegments;+export const getShallowMeasures = getNormalizedMeasures;export const getMetadata: (state: State,@@ -104,6 +108,7 @@ export const getMetadata: (getNormalizedTables,getNormalizedFields,getNormalizedSegments,+ getNormalizedMeasures,getNormalizedQuestions,getNormalizedSnippets,getSettings,@@ -114,6 +119,7 @@ export const getMetadata: (tables,fields,segments,+ measures,questions,snippets,settings,@@ -137,6 +143,9 @@ export const getMetadata: (metadata.segments = Object.fromEntries(Object.values(segments).map((s) => [s.id, createSegment(s, metadata)]),);+ metadata.measures = Object.fromEntries(+ Object.values(measures).map((m) => [m.id, createMeasure(m, metadata)]),+ );metadata.questions = Object.fromEntries(Object.values(questions).map((c) => [c.id, createQuestion(c, metadata)]),);@@ -156,6 +165,7 @@ export const getMetadata: (table.fields = hydrateTableFields(table, metadata);table.fks = hydrateTableForeignKeys(table, metadata);table.segments = hydrateTableSegments(table, metadata);+ table.measures = hydrateTableMeasures(table, metadata);table.metrics = hydrateTableMetrics(table, metadata);});Object.values(metadata.databases).forEach((database) => {@@ -167,6 +177,9 @@ export const getMetadata: (Object.values(metadata.segments).forEach((segment) => {segment.table = hydrateSegmentTable(segment, metadata);});+ Object.values(metadata.measures).forEach((measure) => {+ measure.table = hydrateMeasureTable(measure, metadata);+ });Object.values(metadata.fields).forEach((field) => {hydrateField(field, metadata);});@@ -248,6 +261,15 @@ function createSegment(return instance;}+function createMeasure(+ measure: NormalizedMeasure,+ metadata: Metadata,+): Measure {+ const instance = new Measure(measure);+ instance.metadata = metadata;+ return instance;+}+function createQuestion(card: Card, metadata: Metadata): Question {return new Question(card, metadata);}@@ -360,6 +382,11 @@ function hydrateTableSegments(table: Table, metadata: Metadata): Segment[] {return segmentIds.map((id) => metadata.segment(id)).filter(isNotNull);}+function hydrateTableMeasures(table: Table, metadata: Metadata): Measure[] {+ const measureIds = table.getPlainObject().measures ?? [];+ return measureIds.map((id) => metadata.measure(id)).filter(isNotNull);+}+function hydrateTableMetrics(table: Table, metadata: Metadata): Question[] {const metricIds = table.getPlainObject().metrics ?? [];return metricIds.map((id) => metadata.question(id)).filter(isNotNull);@@ -392,3 +419,10 @@ function hydrateSegmentTable(): Table | undefined {return metadata.table(segment.table_id) ?? undefined;}++function hydrateMeasureTable(+ measure: Measure,+ metadata: Metadata,+): Table | undefined {+ return metadata.table(measure.table_id) ?? undefined;+}diff --git a/frontend/test/__support__/server-mocks/index.ts b/frontend/test/__support__/server-mocks/index.tsindex d8c2ee34090..47d79fa0112 100644--- a/frontend/test/__support__/server-mocks/index.ts+++ b/frontend/test/__support__/server-mocks/index.ts@@ -27,6 +27,7 @@ export * from "./group";export * from "./impersonation";export * from "./library";export * from "./logger";+export * from "./measure";export * from "./model-indexes";export * from "./native-query-snippet";export * from "./performance";diff --git a/frontend/test/__support__/server-mocks/measure.ts b/frontend/test/__support__/server-mocks/measure.tsnew file mode 100644index 00000000000..235e4e3fe03--- /dev/null+++ b/frontend/test/__support__/server-mocks/measure.ts@@ -0,0 +1,19 @@+import fetchMock from "fetch-mock";++import type { Measure } from "metabase-types/api";+import { createMockMeasure } from "metabase-types/api/mocks";++export function setupMeasureEndpoint(measure: Measure) {+ fetchMock.get(`path:/api/measure/${measure.id}`, measure);+}++export function setupMeasuresEndpoints(measures: Measure[]) {+ fetchMock.post("path:/api/measure", async (call) => {+ const measure = await fetchMock.callHistory+ .lastCall(call.url)+ ?.request?.json();+ return createMockMeasure(measure);+ });+ fetchMock.get("path:/api/measure", measures);+ measures.forEach((measure) => setupMeasureEndpoint(measure));+}diff --git a/frontend/test/__support__/server-mocks/revision.ts b/frontend/test/__support__/server-mocks/revision.tsindex 7412c6d826e..e9115db4f37 100644--- a/frontend/test/__support__/server-mocks/revision.ts+++ b/frontend/test/__support__/server-mocks/revision.ts@@ -13,6 +13,13 @@ export function setupSegmentRevisionsEndpoint(fetchMock.get(`path:/api/revision?entity=segment&id=${segmentId}`, revisions);}+export function setupMeasureRevisionsEndpoint(+ measureId: number,+ revisions: Revision[],+) {+ fetchMock.get(`path:/api/revision?entity=measure&id=${measureId}`, revisions);+}+export function setupDocumentRevisionsEndpoint(documentId: number,revisions: Revision[],diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.tsindex 3a314f76d4e..849bce2f7e2 100644--- a/frontend/test/__support__/store.ts+++ b/frontend/test/__support__/store.ts@@ -9,6 +9,7 @@ import {DocumentSchema,FieldSchema,IndexedEntitySchema,+ MeasureSchema,QuestionSchema,SchemaSchema,SegmentSchema,@@ -56,6 +57,7 @@ const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {tables: [TableSchema],fields: [FieldSchema],segments: [SegmentSchema],+ measures: [MeasureSchema],snippets: [SnippetSchema],indexedEntities: [IndexedEntitySchema],questions: [QuestionSchema],diff --git a/resources/migrations/059_update_migrations.yaml b/resources/migrations/059_update_migrations.yamlnew file mode 100644index 00000000000..9fe0983dd15--- /dev/null+++ b/resources/migrations/059_update_migrations.yaml@@ -0,0 +1,150 @@+databaseChangeLog:+ - objectQuotingStrategy: QUOTE_ALL_OBJECTS+ - changeSet:+ id: v59.2025-12-04T12:00:00+ author: metabase+ comment: Create measure table for saved aggregation expressions+ changes:+ - createTable:+ tableName: measure+ remarks: Stores saved aggregation expressions tied to tables+ columns:+ - column:+ name: id+ type: int+ autoIncrement: true+ constraints:+ primaryKey: true+ nullable: false+ - column:+ name: table_id+ type: int+ remarks: Foreign key to metabase_table+ constraints:+ nullable: false+ - column:+ name: creator_id+ type: int+ remarks: Foreign key to core_user who created this measure+ constraints:+ nullable: false+ - column:+ name: name+ type: varchar(254)+ remarks: Name of the measure+ constraints:+ nullable: false+ - column:+ name: description+ type: ${text.type}+ remarks: Optional description of the measure+ constraints:+ nullable: true+ - column:+ name: archived+ type: ${boolean.type}+ defaultValueBoolean: false+ remarks: Whether the measure has been archived+ constraints:+ nullable: false+ - column:+ name: definition+ type: ${text.type}+ remarks: JSON MBQL query containing the aggregation definition+ constraints:+ nullable: false+ - column:+ name: created_at+ type: ${timestamp_type}+ remarks: Timestamp when this measure was created+ constraints:+ nullable: false+ - column:+ name: updated_at+ type: ${timestamp_type}+ remarks: Timestamp when this measure was last updated+ constraints:+ nullable: false+ - column:+ name: entity_id+ type: char(21)+ remarks: Random NanoID tag for unique identity+ constraints:+ nullable: true+ unique: true+ - column:+ name: dependency_analysis_version+ type: integer+ defaultValueNumeric: 0+ remarks: Version number for dependency analysis to track when dependencies need recalculation+ constraints:+ nullable: false+ rollback:+ - dropTable:+ tableName: measure++ - changeSet:+ id: v59.2025-12-04T12:00:01+ author: metabase+ comment: Add index on measure.table_id+ changes:+ - createIndex:+ tableName: measure+ indexName: idx_measure_table_id+ columns:+ - column:+ name: table_id+ rollback:+ - dropIndex:+ tableName: measure+ indexName: idx_measure_table_id++ - changeSet:+ id: v59.2025-12-04T12:00:02+ author: metabase+ comment: Add foreign key from measure to metabase_table+ changes:+ - addForeignKeyConstraint:+ baseTableName: measure+ baseColumnNames: table_id+ referencedTableName: metabase_table+ referencedColumnNames: id+ constraintName: fk_measure_ref_table_id+ onDelete: CASCADE+ rollback:+ - dropForeignKeyConstraint:+ baseTableName: measure+ constraintName: fk_measure_ref_table_id++ - changeSet:+ id: v59.2025-12-04T12:00:03+ author: metabase+ comment: Add index on measure.creator_id+ changes:+ - createIndex:+ tableName: measure+ indexName: idx_measure_creator_id+ columns:+ - column:+ name: creator_id+ rollback:+ - dropIndex:+ tableName: measure+ indexName: idx_measure_creator_id++ - changeSet:+ id: v59.2025-12-04T12:00:04+ author: metabase+ comment: Add foreign key from measure to core_user+ changes:+ - addForeignKeyConstraint:+ baseTableName: measure+ baseColumnNames: creator_id+ referencedTableName: core_user+ referencedColumnNames: id+ constraintName: fk_measure_ref_creator_id+ onDelete: CASCADE+ rollback:+ - dropForeignKeyConstraint:+ baseTableName: measure+ constraintName: fk_measure_ref_creator_iddiff --git a/src/metabase/api/common.clj b/src/metabase/api/common.cljindex b7382e9edbc..f7a0d840875 100644--- a/src/metabase/api/common.clj+++ b/src/metabase/api/common.clj@@ -579,6 +579,7 @@"indexed-entity" {:db-model :model/ModelIndexValue :alias :model-index-value}"metric" {:db-model :model/Card :alias :card}"segment" {:db-model :model/Segment :alias :segment}+ "measure" {:db-model :model/Measure :alias :measure}"snippet" {:db-model :model/NativeQuerySnippet :alias :snippet}"table" {:db-model :model/Table :alias :table}"dashboard-card" {:db-model :model/DashboardCard :alias :dashboard-card}diff --git a/src/metabase/api_routes/routes.clj b/src/metabase/api_routes/routes.cljindex 46589ba15c8..66f7fa09005 100644--- a/src/metabase/api_routes/routes.clj+++ b/src/metabase/api_routes/routes.clj@@ -28,6 +28,7 @@[metabase.indexed-entities.api][metabase.logger.api][metabase.login-history.api]+ [metabase.measures.api][metabase.model-persistence.api][metabase.native-query-snippets.api][metabase.notification.api]@@ -78,6 +79,7 @@metabase.indexed-entities.api/keep-memetabase.logger.api/keep-memetabase.login-history.api/keep-me+ metabase.measures.api/keep-memetabase.model-persistence.api/keep-memetabase.native-query-snippets.api/keep-memetabase.permissions-rest.api/keep-me@@ -162,6 +164,7 @@"/ldap" (+auth metabase.sso.api/ldap-routes)"/logger" (+auth 'metabase.logger.api)"/login-history" (+auth 'metabase.login-history.api)+ "/measure" (+auth 'metabase.measures.api)"/model-index" (+auth 'metabase.indexed-entities.api)"/native-query-snippet" (+auth 'metabase.native-query-snippets.api)"/notification" metabase.notification.api/notification-routesdiff --git a/src/metabase/audit_app/events/audit_log.clj b/src/metabase/audit_app/events/audit_log.cljindex 5942f5b94c6..f9568389d8f 100644--- a/src/metabase/audit_app/events/audit_log.clj+++ b/src/metabase/audit_app/events/audit_log.clj@@ -163,6 +163,17 @@:user-id user-id:details (when revision-message {:revision-message revision-message})}))+(derive ::measure-event ::event)+(derive :event/measure-create ::measure-event)+(derive :event/measure-update ::measure-event)+(derive :event/measure-delete ::measure-event)++(methodical/defmethod events/publish-event! ::measure-event+ [topic {:keys [object user-id revision-message] :as _event}]+ (audit-log/record-event! topic {:object object+ :user-id user-id+ :details (when revision-message {:revision-message revision-message})}))+(derive ::user-event ::event)(derive :event/user-invited ::user-event)(derive :event/user-deactivated ::user-event)diff --git a/src/metabase/cmd/copy.clj b/src/metabase/cmd/copy.cljindex fe6f14ebad6..29cde5300b1 100644--- a/src/metabase/cmd/copy.clj+++ b/src/metabase/cmd/copy.clj@@ -120,7 +120,9 @@:model/Document:model/DocumentBookmark:model/Comment- :model/CommentReaction]+ :model/CommentReaction+ ;; 59++ :model/Measure](when config/ee-available?[:model/Sandbox:model/Tenantdiff --git a/src/metabase/eid_translation/util.clj b/src/metabase/eid_translation/util.cljindex 827515b575d..5d9fe713f8e 100644--- a/src/metabase/eid_translation/util.clj+++ b/src/metabase/eid_translation/util.clj@@ -28,6 +28,7 @@:dataset :model/Card:dimension :model/Dimension:document :model/Document+ :measure :model/Measure:metric :model/Card:permissions-group :model/PermissionsGroup:pulse :model/Pulsediff --git a/src/metabase/events/schema.clj b/src/metabase/events/schema.cljindex 3d420a0c879..273545f6081 100644--- a/src/metabase/events/schema.clj+++ b/src/metabase/events/schema.clj@@ -128,6 +128,24 @@(mr/def :event/segment-update ::segment-with-message)(mr/def :event/segment-delete ::segment-with-message)+;; measure events++(mr/def ::measure+ [:map {:closed true}+ [:user-id pos-int?]+ [:object [:fn #(t2/instance-of? :model/Measure %)]]])++(mr/def :event/measure-create ::measure)++(mr/def ::measure-with-message+ [:merge+ ::measure+ [:map {:closed true}+ [:revision-message {:optional true} :string]]])++(mr/def :event/measure-update ::measure-with-message)+(mr/def :event/measure-delete ::measure-with-message)+;; database events(mr/def ::databasediff --git a/src/metabase/legacy_mbql/schema.cljc b/src/metabase/legacy_mbql/schema.cljcindex 82b5d00d41e..9f148b4b801 100644--- a/src/metabase/legacy_mbql/schema.cljc+++ b/src/metabase/legacy_mbql/schema.cljc@@ -507,9 +507,10 @@#{:and :or :not :< :<= :> :>= := :!= :in :not-in :between :starts-with :ends-with :contains:does-not-contain :inside :is-empty :not-empty :is-null :not-null :relative-time-interval :time-interval :during})+;; TODO (Tamas 2026-01-05): Remove :measure from this set once FE tests switch to using MBQL5(def ^:private aggregations#{:sum :avg :stddev :var :median :percentile :min :max :cum-count :cum-sum :count-where :sum-where :share :distinct- :distinct-where :metric :aggregation-options :count :offset})+ :distinct-where :metric :measure :aggregation-options :count :offset})(def ^:private datetime-functions"Functions that return Date or DateTime values. Should match `::DatetimeExpression`."@@ -1324,6 +1325,10 @@(defclause metricmetric-id ::lib.schema.id/card)+;; TODO (Tamas 2026-01-05): Remove this defclause once FE tests switch to using MBQL5+(defclause measure+ measure-id ::lib.schema.id/measure)+;; the following are definitions for expression aggregations, e.g.;;;; [:+ [:sum [:field 10 nil]] [:sum [:field 20 nil]]]diff --git a/src/metabase/lib/aggregation.cljc b/src/metabase/lib/aggregation.cljcindex 7997a9d5fca..e00511b05ed 100644--- a/src/metabase/lib/aggregation.cljc+++ b/src/metabase/lib/aggregation.cljc@@ -298,7 +298,8 @@[:or[:ref ::lib.schema.aggregation/aggregation][:ref ::lib.schema.common/external-op]- [:ref ::lib.schema.metadata/metric]])+ [:ref ::lib.schema.metadata/metric]+ [:ref ::lib.schema.metadata/measure]])(mu/defn aggregate :- ::lib.schema/query"Adds an aggregation to query."@@ -308,8 +309,8 @@([query :- ::lib.schema/querystage-number :- :intaggregable :- ::aggregable]- ;; if this is a Metric metadata, convert it to `:metric` MBQL clause before adding.- (if (= (lib.dispatch/dispatch-value aggregable) :metadata/metric)+ ;; if this is a Metric or Measure metadata, convert it to `:metric` or `:measure` MBQL clause before adding.+ (if (#{:metadata/metric :metadata/measure} (lib.dispatch/dispatch-value aggregable))(recur query stage-number (lib.ref/ref aggregable))(lib.util/add-summary-clause query stage-number :aggregation aggregable))))diff --git a/src/metabase/lib/common.cljc b/src/metabase/lib/common.cljcindex 300a1de6354..bd1e164a772 100644--- a/src/metabase/lib/common.cljc+++ b/src/metabase/lib/common.cljc@@ -59,6 +59,10 @@[segment-def](lib.ref/ref segment-def))+(defmethod ->op-arg :metadata/measure+ [measure-def]+ (lib.ref/ref measure-def))+(defmethod ->op-arg :lib/external-op[{:keys [operator options args] :or {options {}}}](->op-arg (-> (lib.options/ensure-uuid (into [(keyword operator) options]diff --git a/src/metabase/lib/core.cljc b/src/metabase/lib/core.cljcindex 438f889b19d..c6e21facf28 100644--- a/src/metabase/lib/core.cljc+++ b/src/metabase/lib/core.cljc@@ -31,6 +31,7 @@[metabase.lib.join :as lib.join][metabase.lib.join.util][metabase.lib.limit :as lib.limit]+ [metabase.lib.measure :as lib.measure][metabase.lib.metadata][metabase.lib.metadata.calculation :as lib.metadata.calculation][metabase.lib.metadata.column]@@ -107,6 +108,7 @@metabase.lib.schema/keep-memetabase.lib.schema.util/keep-melib.segment/keep-me+ lib.measure/keep-memetabase.lib.serialize/keep-melib.stage/keep-melib.swap/keep-me@@ -449,7 +451,12 @@[metabase.lib.schema.utilremove-lib-uuids][lib.segment- available-segments]+ available-segments+ check-segment-overwrite]+ [lib.measure+ available-measures+ check-measure-cycles+ check-measure-overwrite][metabase.lib.serializeprepare-for-serialization][lib.stage@@ -497,6 +504,7 @@all-field-idsall-implicitly-joined-field-idsall-implicitly-joined-table-ids+ all-measure-idsall-segment-idsall-source-card-idsall-source-table-idsdiff --git a/src/metabase/lib/fe_util.cljc b/src/metabase/lib/fe_util.cljcindex ecbc7322d5f..ed31b160296 100644--- a/src/metabase/lib/fe_util.cljc+++ b/src/metabase/lib/fe_util.cljc@@ -129,6 +129,7 @@:dispatch-type/keyword:dispatch-type/nil:metadata/column+ :metadata/measure:metadata/segment:metadata/metric]](defmethod expression-parts-method dispatch-value@@ -154,6 +155,14 @@:id (last segment-ref):display-name (i18n/tru "Unknown Segment")}))+(defmethod expression-parts-method :measure+ [query _stage-number measure-ref]+ (or+ (lib.metadata/measure query (last measure-ref))+ {:lib/type :metadata/measure+ :id (last measure-ref)+ :display-name (i18n/tru "Unknown Measure")}))+(defmethod expression-parts-method :metric[query _stage-number metric-ref](let [metric-id (last metric-ref)]@@ -226,6 +235,7 @@value)(doseq [dispatch-value [:metadata/column+ :metadata/measure:metadata/segment:metadata/metric]](defmethod expression-clause-method dispatch-valuediff --git a/src/metabase/lib/js.cljs b/src/metabase/lib/js.cljsindex 79c3311cdc6..520ddbaee2c 100644--- a/src/metabase/lib/js.cljs+++ b/src/metabase/lib/js.cljs@@ -595,6 +595,13 @@;; will also remove anything that depended on it, recursively. Moving or replacing a clause will update any references;; to it in other places (eg. an aggregation based on a custom expression that was just renamed).+(defn- ->clj+ "Convert JS objects to CLJS, but pass through CLJS data structures unchanged."+ [x]+ (if (or (map? x) (vector? x))+ x+ (js->clj x :keywordize-keys true)))+(defn ^:export remove-clause"Removes the `target-clause` from the given stage of `a-query`.@@ -609,7 +616,7 @@[a-query stage-number clause](lib.core/remove-clausea-query stage-number- (lib.core/normalize (js->clj clause :keywordize-keys true))))+ (lib.core/normalize (->clj clause))))(defn ^:export replace-clause"Replaces the `target-clause` with `new-clause` in the `query` stage.@@ -620,8 +627,8 @@[a-query stage-number target-clause new-clause](lib.core/replace-clausea-query stage-number- (lib.core/normalize (js->clj target-clause :keywordize-keys true))- (lib.core/normalize (js->clj new-clause :keywordize-keys true))))+ (lib.core/normalize (->clj target-clause))+ (lib.core/normalize (->clj new-clause))))(defn ^:export swap-clauses"Exchanges the positions of two clauses of the same kind. Can be used for filters, aggregations, breakouts, and@@ -634,8 +641,8 @@[a-query stage-number source-clause target-clause](lib.core/swap-clausesa-query stage-number- (lib.core/normalize (js->clj source-clause :keywordize-keys true))- (lib.core/normalize (js->clj target-clause :keywordize-keys true))))+ (lib.core/normalize (->clj source-clause))+ (lib.core/normalize (->clj target-clause))))(defn- -unwrap"Sometimes JS queries are passed in with a `Join` or `Aggregation` clause object instead of a simple Array.@@ -860,7 +867,7 @@> **Code health:** Healthy"[a-query stage-number an-aggregate-clause]- (lib.core/aggregate a-query stage-number (js->clj an-aggregate-clause :keywordize-keys true)))+ (lib.core/aggregate a-query stage-number (->clj an-aggregate-clause)))(defn ^:export aggregations"Return a JS array of aggregations on a given stage of `a-query`.@@ -968,7 +975,7 @@(defn ^:export filter"Adds `a-filter-clause` as a filter on `a-query`."[a-query stage-number a-filter-clause]- (lib.core/filter a-query stage-number (js->clj a-filter-clause :keywordize-keys true)))+ (lib.core/filter a-query stage-number (->clj a-filter-clause)))(defn ^:export filters"Returns a JS array of all the filters on stage `stage-number` of `a-query`.@@ -1297,6 +1304,14 @@[arg](and (map? arg) (= :metadata/segment (:lib/type arg))))+(defn ^:export measure-metadata?+ "Returns true if arg is an MLv2 measure, ie. has `:lib/type :metadata/measure`.++ > **Code health:** Healthy. This is used in the expression editor to parse and+ format expression clauses."+ [arg]+ (and (map? arg) (= :metadata/measure (:lib/type arg))))+;; # Field selection;; Queries can specify a subset of fields to return from their source table or previous stage. There are several;; functions provided to inspect and manage that list of fields.@@ -2075,6 +2090,23 @@[a-query stage-number](to-array (lib.core/available-segments a-query stage-number)))+(defn ^:export measure-metadata+ "Get metadata for the Measure with `measure-id`, if it can be found.++ `metadata-providerable` is anything that can provide metadata - it can be JS `Metadata` itself, but more commonly it+ will be a query.++ > **Code health:** Healthy."+ [metadata-providerable measure-id]+ (lib.metadata/measure metadata-providerable measure-id))++(defn ^:export available-measures+ "Returns a JS array of opaque Measures metadata objects, that could be used as aggregations for `a-query`.++ > **Code health:** Healthy."+ [a-query stage-number]+ (to-array (lib.core/available-measures a-query stage-number)))+(defn ^:export available-metrics"Returns a JS array of opaque metadata values for those Metrics that could be used as aggregations on`a-query`.diff --git a/src/metabase/lib/js/metadata.cljs b/src/metabase/lib/js/metadata.cljsindex 31c6f2a149e..973b9541098 100644--- a/src/metabase/lib/js/metadata.cljs+++ b/src/metabase/lib/js/metadata.cljs@@ -473,6 +473,23 @@[_object-type]"segments")+(defmethod lib-type :measure+ [_object-type]+ :metadata/measure)++(defmethod excluded-keys :measure+ [_object-type]+ #{:database :table})++(defmethod parse-field-fn :measure+ [_object-type]+ (fn [_k v]+ v))++(defmethod parse-objects-default-key :measure+ [_object-type]+ "measures")+(defmethod lib-type :snippet[_object-type]:metadata/native-query-snippet)@@ -517,6 +534,7 @@:metadata/table :tables:metadata/column :fields:metadata/card :cards+ :metadata/measure :measures:metadata/metric :metrics:metadata/segment :segments:metadata/native-query-snippet :snippets))@@ -528,6 +546,7 @@:fields (parse-objects-delay :field metadata):snippets (parse-objects-delay :snippet metadata):cards delayed-cards+ :measures (parse-objects-delay :measure metadata):metrics (delay (metric-cards delayed-cards)):segments (parse-objects-delay :segment metadata)}))diff --git a/src/metabase/lib/measure.cljc b/src/metabase/lib/measure.cljcnew file mode 100644index 00000000000..685de7e54bb--- /dev/null+++ b/src/metabase/lib/measure.cljc@@ -0,0 +1,181 @@+(ns metabase.lib.measure+ "A Measure is a saved MBQL query stage snippet with `:aggregation`. Measures are numeric expressions."+ (:refer-clojure :exclude [mapv empty? some])+ (:require+ [clojure.string :as str]+ [metabase.lib.aggregation :as lib.aggregation]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.lib.metadata.calculation :as lib.metadata.calculation]+ [metabase.lib.metadata.protocols :as lib.metadata.protocols]+ [metabase.lib.normalize :as lib.normalize]+ [metabase.lib.options :as lib.options]+ [metabase.lib.query :as lib.query]+ [metabase.lib.ref :as lib.ref]+ [metabase.lib.schema :as lib.schema]+ [metabase.lib.schema.expression :as lib.schema.expression]+ [metabase.lib.schema.id :as lib.schema.id]+ [metabase.lib.schema.metadata :as lib.schema.metadata]+ [metabase.lib.util :as lib.util]+ [metabase.lib.walk.util :as lib.walk.util]+ [metabase.util :as u]+ [metabase.util.i18n :as i18n]+ [metabase.util.malli :as mu]+ [metabase.util.performance :refer [mapv empty? some]]))++(defn- resolve-measure [query measure-id]+ (when (integer? measure-id)+ (lib.metadata/measure query measure-id)))++(defmethod lib.ref/ref-method :metadata/measure+ [{:keys [id], measure-name :name}]+ (lib.options/ensure-uuid [:measure {:display-name measure-name} id]))++(defn- measure-aggregation+ "Get the aggregation clause from a measure's definition."+ [{:keys [definition]}]+ (when definition+ (let [normalized (lib.normalize/normalize ::lib.schema/query definition)]+ (first (:aggregation (lib.util/query-stage normalized -1))))))++(defmethod lib.metadata.calculation/type-of-method :metadata/measure+ [_query _stage-number measure-metadata]+ (or (when-let [aggregation (measure-aggregation measure-metadata)]+ (lib.schema.expression/type-of aggregation))+ :type/*))++(defmethod lib.metadata.calculation/type-of-method :measure+ [query stage-number [_tag _opts measure-id]]+ (or (when-let [measure-metadata (resolve-measure query measure-id)]+ (lib.metadata.calculation/type-of query stage-number measure-metadata))+ :type/*))++(defn- fallback-display-name []+ "[Unknown Measure]")++(defmethod lib.metadata.calculation/display-name-method :metadata/measure+ [_query _stage-number measure-metadata _style]+ (or (:display-name measure-metadata)+ (:name measure-metadata)+ (fallback-display-name)))++(defmethod lib.metadata.calculation/display-name-method :measure+ [query stage-number [_tag opts measure-id-or-name] style]+ (or (:display-name opts)+ (when-let [measure-metadata (resolve-measure query measure-id-or-name)]+ (lib.metadata.calculation/display-name query stage-number measure-metadata style))+ (fallback-display-name)))++(defmethod lib.metadata.calculation/display-info-method :metadata/measure+ [query stage-number {:keys [description aggregation-positions], :as measure-metadata}]+ (let [default-display-info-method (get-method lib.metadata.calculation/display-info-method :default)+ default-display-info (default-display-info-method query stage-number measure-metadata)]+ (cond-> default-display-info+ description (assoc :description description)+ aggregation-positions (assoc :aggregation-positions aggregation-positions))))++(defmethod lib.metadata.calculation/display-info-method :measure+ [query stage-number [_tag opts measure-id-or-name]]+ (let [display-name (:display-name opts)+ opts-to-merge (cond-> {}+ display-name+ (assoc :display-name display-name+ :long-display-name display-name))]+ (merge+ (if-let [measure-metadata (resolve-measure query measure-id-or-name)]+ (lib.metadata.calculation/display-info query stage-number measure-metadata)+ {:effective-type :type/Number+ :display-name (fallback-display-name)+ :long-display-name (fallback-display-name)})+ opts-to-merge)))++(defmethod lib.metadata.calculation/column-name-method :measure+ [query stage-number [_tag _opts measure-id-or-name]]+ (or (when-let [measure-metadata (resolve-measure query measure-id-or-name)]+ (lib.metadata.calculation/column-name query stage-number measure-metadata))+ "measure"))++(defmethod lib.metadata.calculation/metadata-method :measure+ [query _stage-number [_ opts measure-id]]+ (if-let [measure-meta (lib.metadata/measure query measure-id)]+ ;; Get the inner aggregation from the measure definition to extract the operator name (e.g., "sum", "count")+ ;; This is similar to how metrics work - the :name should be the operator name, not the measure's display name+ (let [measure-query (lib.query/query query (lib.normalize/normalize ::lib.schema/query (:definition measure-meta)))+ inner-aggregation (first (lib.aggregation/aggregations measure-query))+ inner-meta (when inner-aggregation+ (lib.metadata.calculation/metadata measure-query -1 inner-aggregation))]+ {:lib/type :metadata/column+ :base-type :type/Number+ :name (or (:name opts) (:name inner-meta) "measure")+ :display-name (or (:display-name opts) (:name measure-meta) (fallback-display-name))})+ {:lib/type :metadata/column+ :base-type :type/Number+ :name "measure"+ :display-name (fallback-display-name)}))++(mu/defn available-measures :- [:maybe [:sequential {:min 1} ::lib.schema.metadata/measure]]+ "Get a list of Measures that you may consider using as aggregation for a query. Only Measures that have the same+ `table-id` as the `source-table` for this query will be suggested."+ ([query]+ (available-measures query -1))+ ([query :- ::lib.schema/query+ stage-number :- :int]+ (when (zero? (lib.util/canonical-stage-index query stage-number))+ (when-let [source-table-id (lib.util/source-table-id query)]+ (let [measures (lib.metadata.protocols/measures (lib.metadata/->metadata-provider query) source-table-id)+ measure-aggregations (into {}+ (keep-indexed (fn [index aggregation-clause]+ (when (lib.util/clause-of-type? aggregation-clause :measure)+ [(get aggregation-clause 2) index])))+ (lib.aggregation/aggregations query 0))]+ (cond+ (empty? measures) nil+ (empty? measure-aggregations) (vec measures)+ :else (mapv (fn [measure-metadata]+ (let [aggregation-pos (-> measure-metadata :id measure-aggregations)]+ (cond-> measure-metadata+ aggregation-pos (assoc :aggregation-positions [aggregation-pos]))))+ measures)))))))++(defn check-measure-cycles+ "DFS to detect cycles starting from `measure-id` with `definition`.+ `metadata-provider` is used for looking up referenced measures.+ `path` is a vector of measure IDs representing the current DFS path (for cycle detection and reporting).+ `visited` is the set of measure IDs we've fully processed (for avoiding redundant work).+ Returns updated `visited` set. Throws if a cycle is detected or if a referenced measure doesn't exist."+ ([metadata-provider definition measure-id]+ (check-measure-cycles metadata-provider definition measure-id [] #{}))+ ([metadata-provider definition measure-id path visited]+ (cond+ (some #{measure-id} path)+ (let [cycle-start-idx (u/index-of #{measure-id} path)+ cycle-path (conj (subvec path cycle-start-idx) measure-id)]+ (throw (ex-info (i18n/tru "Measure cycle detected: {0}" (str/join " → " cycle-path))+ {:measure-id measure-id+ :cycle-path cycle-path+ :path path})))++ (contains? visited measure-id)+ visited++ :else+ (let [referenced-ids (lib.walk.util/all-measure-ids definition)+ path' (conj path measure-id)]+ (reduce (fn [visited' ref-id]+ (if-let [measure (lib.metadata/measure metadata-provider ref-id)]+ (check-measure-cycles metadata-provider (:definition measure) ref-id path' visited')+ (throw (ex-info (i18n/tru "Measure {0} does not exist." ref-id)+ {:measure-id ref-id}))))+ (conj visited measure-id)+ referenced-ids)))))++(mu/defn check-measure-overwrite+ "Check if saving a measure with `measure-id` and `definition` would create a cycle.+ Returns nil if safe to save, throws an exception if it would create a cycle.++ `measure-id` can be nil for new measures that don't have an ID yet.+ `definition` is the measure's MBQL5 query which also serves as the metadata provider+ for looking up referenced measures."+ [measure-id :- [:maybe ::lib.schema.id/measure]+ definition :- ::lib.schema/query]+ (check-measure-cycles definition definition measure-id)+ nil)diff --git a/src/metabase/lib/metadata.cljc b/src/metabase/lib/metadata.cljcindex b18997b50d3..b14d1ccbec1 100644--- a/src/metabase/lib/metadata.cljc+++ b/src/metabase/lib/metadata.cljc@@ -72,12 +72,13 @@(mu/defn metadatas-for-table :- [:maybe [:sequential [:or::lib.schema.metadata/column+ ::lib.schema.metadata/measure::lib.schema.metadata/metric::lib.schema.metadata/segment]]]- "Return active (non-archived) metadatas associated with a particular Table, either Fields, Metrics, or- Segments -- `metadata-type` must be one of either `:metadata/column`, `:metadata/metric`, `:metadata/segment`."+ "Return active (non-archived) metadatas associated with a particular Table, either Fields, Metrics, Measures, or+ Segments -- `metadata-type` must be one of `:metadata/column`, `:metadata/measure`, `:metadata/metric`, `:metadata/segment`."[metadata-providerable :- ::lib.schema.metadata/metadata-providerable- metadata-type :- [:enum :metadata/column :metadata/metric :metadata/segment]+ metadata-type :- [:enum :metadata/column :metadata/measure :metadata/metric :metadata/segment]table-id :- ::lib.schema.id/table](case metadata-type:metadata/column (fields metadata-providerable table-id)@@ -158,6 +159,12 @@segment-id :- ::lib.schema.id/segment](lib.metadata.protocols/segment (->metadata-provider metadata-providerable) segment-id))+(mu/defn measure :- [:maybe ::lib.schema.metadata/measure]+ "Get metadata for the Measure with `measure-id`, if it can be found."+ [metadata-providerable :- ::lib.schema.metadata/metadata-providerable+ measure-id :- ::lib.schema.id/measure]+ (lib.metadata.protocols/measure (->metadata-provider metadata-providerable) measure-id))+(mu/defn metric :- [:maybe ::lib.schema.metadata/metric]"Get metadata for the Metric with `card-id`, if it can be found."[metadata-providerable :- ::lib.schema.metadata/metadata-providerablediff --git a/src/metabase/lib/metadata/cached_provider.cljc b/src/metabase/lib/metadata/cached_provider.cljcindex 6aa3a90cda7..2b5fa992740 100644--- a/src/metabase/lib/metadata/cached_provider.cljc+++ b/src/metabase/lib/metadata/cached_provider.cljc@@ -34,6 +34,7 @@[:metadata/table ::lib.schema.metadata/table][:metadata/column ::lib.schema.metadata/column][:metadata/card ::lib.schema.metadata/card]+ [:metadata/measure ::lib.schema.metadata/measure][:metadata/metric ::lib.schema.metadata/metric][:metadata/segment ::lib.schema.metadata/segment][:metadata/native-query-snippet ::lib.schema.metadata/native-query-snippet]]]diff --git a/src/metabase/lib/metadata/invocation_tracker.cljc b/src/metabase/lib/metadata/invocation_tracker.cljcindex e53ff859e93..dc356e92be9 100644--- a/src/metabase/lib/metadata/invocation_tracker.cljc+++ b/src/metabase/lib/metadata/invocation_tracker.cljc@@ -30,6 +30,7 @@table-id(let [tracking-type (case metadata-type:metadata/column ::table-fields+ :metadata/measure ::table-measures:metadata/metric ::table-metrics:metadata/segment ::table-segments)](track-ids! tracker tracking-type [table-id]))diff --git a/src/metabase/lib/metadata/protocols.cljc b/src/metabase/lib/metadata/protocols.cljcindex 3cc42e5e128..40a29f26d41 100644--- a/src/metabase/lib/metadata/protocols.cljc+++ b/src/metabase/lib/metadata/protocols.cljc@@ -10,7 +10,7 @@(mr/def ::metadata-type-excluding-database"Database metadata is stored separately/in a special way. These are the types of metadata that are stored with theother non-Database methods."- [:enum :metadata/table :metadata/column :metadata/card :metadata/metric :metadata/segment :metadata/native-query-snippet :metadata/transform])+ [:enum :metadata/table :metadata/column :metadata/card :metadata/measure :metadata/metric :metadata/segment :metadata/native-query-snippet :metadata/transform])(mr/def ::metadata-spec"Spec for fetching objects from a metadata provider. `:lib/type` is the type of the object to fetch, and the other@@ -32,10 +32,10 @@{:error/message ":id and :name cannot be used at the same time."}(complement (every-pred :id :name))][:fn- {:error/message ":table-id is currently only supported for Fields, Metrics, and Segments."}+ {:error/message ":table-id is currently only supported for Fields, Measures, Metrics, and Segments."}(fn [spec](or (not (:table-id spec))- (#{:metadata/column :metadata/metric :metadata/segment} (:lib/type spec))))]+ (#{:metadata/column :metadata/measure :metadata/metric :metadata/segment} (:lib/type spec))))][:fn{:error/message ":card-id is currently only supported for Metrics."}(fn [spec]@@ -80,7 +80,7 @@(not (false? (:active %)))(not (#{:sensitive :retired} (:visibility-type %))))- (:metadata/card :metadata/metric :metadata/segment)+ (:metadata/card :metadata/measure :metadata/metric :metadata/segment)#(not (:archived %))#_else@@ -204,10 +204,10 @@(metadatas metadata-provider {:lib/type :metadata/table}))(mu/defn metadatas-for-table :- [:maybe [:sequential ::metadata]]- "Return active (non-archived) metadatas associated with a particular Table, either Fields, Metrics, or- Segments -- `metadata-type` must be one of either `:metadata/column`, `:metadata/metric`, or `:metadata/segment`."+ "Return active (non-archived) metadatas associated with a particular Table, either Fields, Measures, Metrics, or+ Segments -- `metadata-type` must be one of `:metadata/column`, `:metadata/measure`, `:metadata/metric`, or `:metadata/segment`."[metadata-provider :- ::metadata-provider- metadata-type :- [:enum :metadata/column :metadata/metric :metadata/segment]+ metadata-type :- [:enum :metadata/column :metadata/measure :metadata/metric :metadata/segment]table-id :- ::lib.schema.id/table](metadatas metadata-provider {:lib/type metadata-type, :table-id table-id}))@@ -270,6 +270,13 @@segment-id :- ::lib.schema.id/segment](metadata-by-id metadata-provider :metadata/segment segment-id))+(mu/defn measure :- [:maybe ::lib.schema.metadata/measure]+ "Return metadata for a particular Measure, i.e. something from the `measure` table in the application+ database. Metadata should match `:metabase.lib.schema.metadata/measure`."+ [metadata-provider :- ::metadata-provider+ measure-id :- ::lib.schema.id/measure]+ (metadata-by-id metadata-provider :metadata/measure measure-id))+(mu/defn fields :- [:maybe [:sequential ::lib.schema.metadata/column]]"Return a sequence of Fields associated with a Table with the given `table-id`. Fields should satisfythe `:metabase.lib.schema.metadata/column` schema. If no such Table exists, this should error."@@ -284,6 +291,13 @@table-id :- ::lib.schema.id/table](metadatas metadata-provider {:lib/type :metadata/segment, :table-id table-id}))+(mu/defn measures :- [:maybe [:sequential ::lib.schema.metadata/measure]]+ "Return a sequence of Measures associated with a Table with the given `table-id`. Measures should satisfy+ the `:metabase.lib.schema.metadata/measure` schema. If no Table with ID `table-id` exists, this should error."+ [metadata-provider :- ::metadata-provider+ table-id :- ::lib.schema.id/table]+ (metadatas metadata-provider {:lib/type :metadata/measure, :table-id table-id}))+(#?(:clj p/defprotocol+ :cljs defprotocol) CachedMetadataProvider"Optional. A protocol for a MetadataProvider that some sort of internal cache. This is mostly useful forMetadataProviders that can hit some sort of relatively expensive external service,diff --git a/src/metabase/lib/normalize.cljc b/src/metabase/lib/normalize.cljcindex d7d5a83ef02..000bc785aad 100644--- a/src/metabase/lib/normalize.cljc+++ b/src/metabase/lib/normalize.cljc@@ -28,6 +28,7 @@:metadata/table ::lib.schema.metadata/table:metadata/column ::lib.schema.metadata/column:metadata/card ::lib.schema.metadata/card+ :metadata/measure ::lib.schema.metadata/measure:metadata/segment ::lib.schema.metadata/segment:metadata/metric ::lib.schema.metadata/metric})diff --git a/src/metabase/lib/schema/aggregation.cljc b/src/metabase/lib/schema/aggregation.cljcindex 4c5790e27e6..4d31d7917cf 100644--- a/src/metabase/lib/schema/aggregation.cljc+++ b/src/metabase/lib/schema/aggregation.cljc@@ -123,7 +123,8 @@:cum-sum:sum-where:var- :metric]]+ :metric+ :measure]](lib.hierarchy/derive tag ::aggregation-clause-tag))(defn- aggregation-expression?diff --git a/src/metabase/lib/schema/id.cljc b/src/metabase/lib/schema/id.cljcindex 91148677dca..a5710ba3de5 100644--- a/src/metabase/lib/schema/id.cljc+++ b/src/metabase/lib/schema/id.cljc@@ -50,6 +50,10 @@"Valid legacy Segment ID"pos-int?)+(mr/def ::measure+ "Valid Measure ID"+ pos-int?)+(mr/def ::snippet"Valid Snippet ID"pos-int?)diff --git a/src/metabase/lib/schema/measure.cljc b/src/metabase/lib/schema/measure.cljcnew file mode 100644index 00000000000..d65f30fb42b--- /dev/null+++ b/src/metabase/lib/schema/measure.cljc@@ -0,0 +1,55 @@+(ns metabase.lib.schema.measure+ "Schema definitions for Measure definitions. A Measure is a saved MBQL aggregation expression tied to a table."+ (:require+ [metabase.lib.schema :as lib.schema]+ [metabase.lib.schema.common :as lib.schema.common]+ [metabase.lib.schema.id :as lib.schema.id]+ [metabase.lib.util :as lib.util]+ [metabase.util.malli.registry :as mr]+ [metabase.util.performance :refer [prewalk]]))++(defn- contains-metric-reference?+ "Walk a clause and return true if it contains any `:metric` reference."+ [clause]+ (let [found? (volatile! false)]+ (prewalk+ (fn [x]+ (when (lib.util/clause-of-type? x :metric)+ (vreset! found? true))+ x)+ clause)+ @found?))++(mr/def ::stage+ "Schema for a single stage in a measure definition.+ A measure stage must have exactly one aggregation and no other query clauses."+ [:and+ ::lib.schema/stage.mbql+ [:map [:source-table ::lib.schema.id/table]]+ [:fn+ {:error/message "A measure stage must have exactly one aggregation"}+ #(= (count (:aggregation %)) 1)]+ [:fn+ {:error/message "Measures cannot reference metrics"}+ #(not (contains-metric-reference? (:aggregation %)))]+ (lib.schema.common/disallowed-keys+ {:source-card "Measures cannot use :source-card"+ :joins "Measures cannot use :joins"+ :expressions "Measures cannot use :expressions"+ :breakout "Measures cannot use :breakout"+ :filters "Measures cannot use :filters"+ :fields "Measures cannot use :fields"+ :order-by "Measures cannot use :order-by"+ :page "Measures cannot use :page"+ :limit "Measures cannot use :limit"})])++(mr/def ::definition+ "Schema for a complete measure definition.+ A measure is a single-stage MBQL query with exactly one aggregation."+ [:and+ ::lib.schema/query+ [:fn+ {:error/message "A measure must have exactly one stage"}+ #(= (-> % :stages count) 1)]+ [:map+ [:stages [:sequential [:ref ::stage]]]]])diff --git a/src/metabase/lib/schema/metadata.cljc b/src/metabase/lib/schema/metadata.cljcindex 3bbaed49319..616c440e61c 100644--- a/src/metabase/lib/schema/metadata.cljc+++ b/src/metabase/lib/schema/metadata.cljc@@ -561,7 +561,7 @@"TODO -- not convinced we need a separate `:metadata/metric` anymore, it made sense back when Legacy/V1 Metrics were aseparate table in the app DB, but now that they're a subtype of Card it's probably not important anymore, we canprobably just use `:metadata/card` here."- [:enum :metadata/database :metadata/table :metadata/column :metadata/card :metadata/metric+ [:enum :metadata/database :metadata/table :metadata/column :metadata/card :metadata/metric :metadata/measure:metadata/segment :metadata/native-query-snippet])(mr/def ::lib-or-legacy-column@@ -670,6 +670,36 @@[:definition [:maybe :map]][:description {:optional true} [:maybe ::lib.schema.common/non-blank-string]]])+(defn- normalize-measure-definition [definition]+ (when definition+ (lib.schema.common/normalize-map definition)))++(mr/def ::measure.definition+ "Measure definition query. This should be an MBQL5 query with a single stage and one aggregation.+ Strict validation via :metabase.lib.schema.measure/definition happens in metabase.measures.models.measure."+ [:map+ {:decode/normalize normalize-measure-definition}])++(defn- mock-measure [measure]+ (cond-> measure+ (and (not (:name measure))+ (:id measure))+ (assoc :name (str "Measure " (:id measure)))))++(mr/def ::measure+ "More or less the same as a [[metabase.measures.models.measure]], but with kebab-case keys."+ [:map+ {:error/message "Valid Measure metadata"+ :decode/mock mock-measure}+ [:lib/type [:= :metadata/measure]]+ [:id ::lib.schema.id/measure]+ [:name ::lib.schema.common/non-blank-string]+ [:table-id ::lib.schema.id/table]+ ;; the MBQL snippet defining this Measure, contains an aggregation expression.+ ;; Strict validation via ::lib.schema.measure/definition happens in metabase.measures.models.measure+ [:definition [:maybe [:ref ::measure.definition]]]+ [:description {:optional true} [:maybe ::lib.schema.common/non-blank-string]]])+(mr/def ::metric"A V2 Metric! This a special subtype of a Card. Not convinced we really need this as opposed to just using `::card` --see my notes on `::type`."diff --git a/src/metabase/lib/schema/ref.cljc b/src/metabase/lib/schema/ref.cljcindex 620fbd64efe..ae832ab4d89 100644--- a/src/metabase/lib/schema/ref.cljc+++ b/src/metabase/lib/schema/ref.cljc@@ -237,6 +237,11 @@(lib.hierarchy/derive :segment ::ref)+(mbql-clause/define-tuple-mbql-clause :measure :- ::expression/type.unknown+ #_measure-id [:schema [:ref ::id/measure]])++(lib.hierarchy/derive :measure ::ref)+(mbql-clause/define-tuple-mbql-clause :metric :- ::expression/type.unknown#_metric-id [:schema [:ref ::id/card]])diff --git a/src/metabase/lib/segment.cljc b/src/metabase/lib/segment.cljcindex 2a9b69e13ac..24ef166af8f 100644--- a/src/metabase/lib/segment.cljc+++ b/src/metabase/lib/segment.cljc@@ -9,8 +9,10 @@[metabase.lib.options :as lib.options][metabase.lib.ref :as lib.ref][metabase.lib.schema :as lib.schema]+ [metabase.lib.schema.id :as lib.schema.id][metabase.lib.schema.metadata :as lib.schema.metadata][metabase.lib.util :as lib.util]+ [metabase.lib.walk.util :as lib.walk.util][metabase.util.i18n :as i18n][metabase.util.malli :as mu][metabase.util.performance :refer [mapv empty?]]))@@ -89,3 +91,43 @@;; plain filters referencing columnsfilter-pos (assoc :filter-positions [filter-pos]))))segments)))))))++(defn- check-segment-cycles+ "DFS to detect cycles starting from `segment-id` with `definition`.+ `metadata-provider` is used for looking up referenced segments.+ `path-nodes` is the set of segment IDs currently in the DFS path (for cycle detection).+ `visited` is the set of segment IDs we've fully processed (for avoiding redundant work).+ Returns updated `visited` set. Throws if a cycle is detected or if a referenced segment doesn't exist."+ ([metadata-provider definition segment-id]+ (check-segment-cycles metadata-provider definition segment-id #{} #{}))+ ([metadata-provider definition segment-id path-nodes visited]+ (cond+ (contains? path-nodes segment-id)+ (throw (ex-info (i18n/tru "Segment cycle detected.")+ {:segment-id segment-id}))++ (contains? visited segment-id)+ visited++ :else+ (let [referenced-ids (lib.walk.util/all-segment-ids definition)+ path-nodes' (conj path-nodes segment-id)]+ (reduce (fn [visited' ref-id]+ (if-let [segment (lib.metadata/segment metadata-provider ref-id)]+ (check-segment-cycles metadata-provider (:definition segment) ref-id path-nodes' visited')+ (throw (ex-info (i18n/tru "Segment {0} does not exist." ref-id)+ {:segment-id ref-id}))))+ (conj visited segment-id)+ referenced-ids)))))++(mu/defn check-segment-overwrite+ "Check if saving a segment with `segment-id` and `definition` would create a cycle.+ Returns nil if safe to save, throws an exception if it would create a cycle.++ `segment-id` can be nil for new segments that don't have an ID yet.+ `definition` is the segment's MBQL5 query which also serves as the metadata provider+ for looking up referenced segments."+ [segment-id :- [:maybe ::lib.schema.id/segment]+ definition :- ::lib.schema/query]+ (check-segment-cycles definition definition segment-id)+ nil)diff --git a/src/metabase/lib/walk/util.cljc b/src/metabase/lib/walk/util.cljcindex b7cdb27e929..f8db7234920 100644--- a/src/metabase/lib/walk/util.cljc+++ b/src/metabase/lib/walk/util.cljc@@ -92,6 +92,20 @@nil))))(not-empty (persistent! @segment-ids))))+(mu/defn all-measure-ids :- [:maybe [:set {:min 1} ::lib.schema.id/measure]]+ "Return a set of all measure IDs anywhere in the query."+ [query]+ (let [measure-ids (volatile! (transient #{}))]+ (lib.walk/walk-clauses+ query+ (fn [_query _path-type _stage-or-join-path clause]+ (lib.util.match/match-lite clause+ [:measure _opts (id :guard pos-int?)]+ (do+ (vswap! measure-ids conj! id)+ nil))))+ (not-empty (persistent! @measure-ids))))+(defn- all-template-tag-card-ids [query](not-empty(into #{}diff --git a/src/metabase/lib_be/metadata/jvm.clj b/src/metabase/lib_be/metadata/jvm.cljindex 8e74d4a1bc5..974fbe47974 100644--- a/src/metabase/lib_be/metadata/jvm.clj+++ b/src/metabase/lib_be/metadata/jvm.clj@@ -329,6 +329,47 @@[segment](instance->metadata segment :metadata/segment))+;;;+;;; Measure+;;;++(derive :metadata/measure :model/Measure)++(methodical/defmethod t2.model/resolve-model :metadata/measure+ [model]+ (t2.model/resolve-model :model/Measure)+ (t2.model/resolve-model :model/Table)+ model)++(methodical/defmethod t2.query/apply-kv-arg [#_model :metadata/measure+ #_resolved-query clojure.lang.IPersistentMap+ #_k :default]+ [model honeysql k v]+ (let [k (if (not (qualified-key? k))+ (keyword "measure" (name k))+ k)]+ (next-method model honeysql k v)))++(methodical/defmethod t2.pipeline/build [#_query-type :toucan.query-type/select.*+ #_model :metadata/measure+ #_resolved-query clojure.lang.IPersistentMap]+ [query-type model parsed-args honeysql]+ (merge+ (next-method query-type model parsed-args honeysql)+ {:select [:measure/id+ :measure/table_id+ :measure/name+ :measure/description+ :measure/archived+ :measure/definition]+ :from [[(t2/table-name :model/Measure) :measure]]+ :left-join [[(t2/table-name :model/Table) :table]+ [:= :measure/table_id :table/id]]}))++(t2/define-after-select :metadata/measure+ [measure]+ (instance->metadata measure :metadata/measure))+;;;;;; Native Query Snippet;;;@@ -392,6 +433,7 @@:metadata/card :card/database_id:metadata/metric :database_id:metadata/segment :table/db_id+ :metadata/measure :table/db_id:metadata/native-query-snippet nil:metadata/transform nil))@@ -402,6 +444,7 @@:metadata/card :card/id:metadata/metric :id:metadata/segment :segment/id+ :metadata/measure :measure/id:metadata/native-query-snippet :id:metadata/transform :id))@@ -412,6 +455,7 @@:metadata/card :card/name:metadata/metric :name:metadata/segment :segment/name+ :metadata/measure :measure/name:metadata/native-query-snippet :name:metadata/transform :name))@@ -420,7 +464,8 @@(case metadata-type:metadata/column :field/table_id:metadata/metric :table_id- :metadata/segment :segment/table_id))+ :metadata/segment :segment/table_id+ :metadata/measure :measure/table_id))(defn- card-id-key [metadata-type];; types not in the case statement do not support Card ID@@ -452,6 +497,9 @@:metadata/segment[:= :segment/archived false]+ :metadata/measure+ [:= :measure/archived false]+#_elsenil))diff --git a/src/metabase/measures/api.clj b/src/metabase/measures/api.cljnew file mode 100644index 00000000000..25329647232--- /dev/null+++ b/src/metabase/measures/api.clj@@ -0,0 +1,103 @@+(ns metabase.measures.api+ "/api/measure endpoints."+ (:require+ [metabase.api.common :as api]+ [metabase.api.macros :as api.macros]+ [metabase.events.core :as events]+ ^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.normalize :as mbql.normalize]+ ^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.schema :as mbql.s]+ [metabase.lib.core :as lib]+ [metabase.models.interface :as mi]+ [metabase.util :as u]+ [metabase.util.malli :as mu]+ [metabase.util.malli.registry :as mr]+ [metabase.util.malli.schema :as ms]+ [toucan2.core :as t2]))++(mr/def ::measure+ "Schema for a Measure entity as returned from the API."+ [:map+ [:id ms/PositiveInt]+ [:name ms/NonBlankString]+ [:table_id ms/PositiveInt]+ [:definition :map]+ [:description {:optional true} [:maybe :string]]+ [:archived :boolean]+ [:creator_id ms/PositiveInt]+ [:created_at :any]+ [:updated_at :any]+ [:entity_id {:optional true} [:maybe :string]]+ [:creator {:optional true} [:maybe :map]]])++(api.macros/defendpoint :post "/" :- ::measure+ "Create a new `Measure`."+ [_route-params+ _query-params+ {:keys [name description table_id definition], :as body} :- [:map+ [:name ms/NonBlankString]+ [:table_id ms/PositiveInt]+ [:definition ms/Map]+ [:description {:optional true} [:maybe :string]]]]+ (api/create-check :model/Measure body)+ (let [measure (api/check-500+ (first (t2/insert-returning-instances! :model/Measure+ :table_id table_id+ :creator_id api/*current-user-id*+ :name name+ :description description+ :definition definition)))]+ (events/publish-event! :event/measure-create {:object measure :user-id api/*current-user-id*})+ (t2/hydrate measure :creator)))++(mu/defn- hydrated-measure [id :- ms/PositiveInt]+ (-> (api/read-check (t2/select-one :model/Measure :id id))+ (t2/hydrate :creator)))++(api.macros/defendpoint :get "/:id" :- ::measure+ "Fetch `Measure` with ID."+ [{:keys [id]} :- [:map+ [:id ms/PositiveInt]]]+ (hydrated-measure id))++(api.macros/defendpoint :get "/" :- [:sequential ::measure]+ "Fetch *all* `Measures`."+ []+ (as-> (t2/select :model/Measure, :archived false, {:order-by [[:%lower.name :asc]]}) measures+ (filter mi/can-read? measures)+ (t2/hydrate measures :creator :definition_description)))++(defn- write-check-and-update-measure!+ "Check whether current user has write permissions, then update Measure with values in `body`. Publishes appropriate+ event and returns updated/hydrated Measure."+ [id {:keys [revision_message], :as body}]+ (let [existing (api/write-check :model/Measure id)+ clean-body (u/select-keys-when body+ :present #{:description}+ :non-nil #{:archived :definition :name})+ new-def (when-let [def (:definition clean-body)]+ (cond->> def+ (not= :mbql-version/mbql5 (lib/normalized-mbql-version def))+ (mbql.normalize/normalize ::mbql.s/MBQLQuery)))+ new-body (merge+ (dissoc clean-body :revision_message)+ (when new-def {:definition new-def}))+ changes (when-not (= new-body existing)+ new-body)]+ (when changes+ (t2/update! :model/Measure id changes))+ (u/prog1 (hydrated-measure id)+ (events/publish-event! :event/measure-update+ {:object <> :user-id api/*current-user-id* :revision-message revision_message}))))++(api.macros/defendpoint :put "/:id" :- ::measure+ "Update a `Measure` with ID."+ [{:keys [id]} :- [:map+ [:id ms/PositiveInt]]+ _query-params+ body :- [:map+ [:name {:optional true} [:maybe ms/NonBlankString]]+ [:definition {:optional true} [:maybe :map]]+ [:revision_message ms/NonBlankString]+ [:archived {:optional true} [:maybe :boolean]]+ [:description {:optional true} [:maybe :string]]]]+ (write-check-and-update-measure! id body))diff --git a/src/metabase/measures/models/measure.clj b/src/metabase/measures/models/measure.cljnew file mode 100644index 00000000000..dbc0b0ac89f--- /dev/null+++ b/src/metabase/measures/models/measure.clj@@ -0,0 +1,179 @@+(ns metabase.measures.models.measure+ "A Measure is a saved MBQL 'macro', expanding to an `:aggregation` clause. It is tied to a table and contains+ exactly one aggregation expression."+ (:require+ [clojure.set :as set]+ [metabase.api.common :as api]+ [metabase.lib-be.core :as lib-be]+ [metabase.lib.core :as lib]+ [metabase.lib.schema.common :as lib.schema.common]+ [metabase.lib.schema.measure :as lib.schema.measure]+ [metabase.models.interface :as mi]+ [metabase.models.serialization :as serdes]+ [metabase.permissions.core :as perms]+ [metabase.search.core :as search]+ [metabase.util :as u]+ [metabase.util.i18n :refer [tru]]+ [metabase.util.log :as log]+ [metabase.util.malli :as mu]+ [metabase.util.malli.schema :as ms]+ [methodical.core :as methodical]+ [toucan2.core :as t2]+ [toucan2.tools.hydrate :as t2.hydrate]))++(methodical/defmethod t2/table-name :model/Measure [_model] :measure)+(methodical/defmethod t2/model-for-automagic-hydration [:default :measure] [_original-model _k] :model/Measure)++(defn- validate-mbql5-definition+ "Validate that an MBQL 5 measure definition has the correct structure."+ [definition]+ (when (seq definition)+ (mu/validate-throw ::lib.schema.measure/definition definition)+ definition))++(defn- normalize-measure-definition+ "Normalize measure definition.+ Accepts:+ - MBQL 5 full queries (passed through)+ - MBQL 4 full queries (from serialization - converted to MBQL 5)+ Empty seqs are normalized to `{}`."+ [definition table-id database-id]+ (if (seq definition)+ (u/prog1 (-> (case (lib/normalized-mbql-version definition)+ (:mbql-version/mbql5 :mbql-version/legacy)+ definition+ ;; default MBQL4 fragment - wrap it in a full query+ {:database database-id+ :type :query+ :query (merge {:source-table table-id} definition)})+ lib-be/normalize-query)+ (validate-mbql5-definition <>))+ {}))++(def ^:private transform-measure-definition+ "Transform for measure definitions. Only handles JSON serialization/deserialization.+ Normalization and validation happen in before-insert and after-select hooks."+ {:in mi/json-in+ :out mi/json-out-with-keywordization})++(t2/deftransforms :model/Measure+ {:definition transform-measure-definition})++(doto :model/Measure+ (derive :metabase/model)+ (derive :hook/timestamped?)+ (derive :hook/entity-id)+ (derive ::mi/write-policy.superuser)+ (derive ::mi/create-policy.superuser))++(defmethod mi/can-read? :model/Measure+ ([instance]+ (let [table (:table (t2/hydrate instance :table))]+ (perms/user-has-permission-for-table?+ api/*current-user-id*+ :perms/manage-table-metadata+ :yes+ (:db_id table)+ (u/the-id table))))+ ([model pk]+ (mi/can-read? (t2/select-one model pk))))++(defn- migrated-measure-definition+ [{:keys [definition], table-id :table_id}]+ (let [database-id (t2/select-one-fn :db_id :model/Table :id table-id)]+ (normalize-measure-definition definition table-id database-id)))++(t2/define-before-insert :model/Measure+ [{:keys [definition] :as measure}]+ (let [measure (cond-> measure+ (some? definition) (assoc :definition (migrated-measure-definition measure)))]+ (when (seq (:definition measure))+ (lib/check-measure-overwrite nil (:definition measure)))+ measure))++(t2/define-before-update :model/Measure [{:keys [id] :as measure}]+ ;; throw an Exception if someone tries to update creator_id+ (when (contains? (t2/changes measure) :creator_id)+ (throw (UnsupportedOperationException. (tru "You cannot update the creator_id of a Measure."))))+ ;; check for cycles if definition is being updated+ (when-let [def-change (:definition (t2/changes measure))]+ (let [normalized-def (migrated-measure-definition (assoc measure :definition def-change))]+ (lib/check-measure-overwrite id normalized-def)))+ measure)++(defmethod mi/perms-objects-set :model/Measure+ [measure read-or-write]+ (let [table (or (:table measure)+ (t2/select-one ['Table :db_id :schema :id] :id (u/the-id (:table_id measure))))]+ (mi/perms-objects-set table read-or-write)))++(defn- maybe-migrated-measure-definition+ [measure]+ (try+ (migrated-measure-definition measure)+ (catch Throwable e+ (log/error e "Error upgrading measure definition:" (ex-message e))+ nil)))++(t2/define-after-select :model/Measure+ [{:keys [definition] :as measure}]+ (cond-> measure+ (some? definition) (assoc :definition (maybe-migrated-measure-definition measure))))++(mu/defn- definition-description :- [:maybe ::lib.schema.common/non-blank-string]+ "Calculate a nice description of a Measure's definition."+ [{:keys [definition], :as _measure} :- (ms/InstanceOf :model/Measure)]+ (when (some? definition)+ (try+ (lib/describe-top-level-key definition :aggregation)+ (catch Throwable e+ (log/error e "Error calculating Measure description:" (ex-message e))+ nil))))++(methodical/defmethod t2.hydrate/batched-hydrate [:model/Measure :definition_description]+ [_model _key measures]+ (for [measure measures]+ (assoc measure :definition_description (definition-description measure))))++;;; ------------------------------------------------ Serialization ---------------------------------------------------++(defmethod serdes/hash-fields :model/Measure+ [_measure]+ [:name (serdes/hydrated-hash :table) :created_at])++(defmethod serdes/dependencies "Measure" [{:keys [definition table_id]}]+ (set/union #{(serdes/table->path table_id)}+ (serdes/mbql-deps definition)))++(defmethod serdes/storage-path "Measure" [measure _ctx]+ (let [{:keys [id label]} (-> measure serdes/path last)]+ (-> measure+ :table_id+ serdes/table->path+ serdes/storage-path-prefixes+ (concat ["measures" (serdes/storage-leaf-file-name id label)]))))++(defmethod serdes/make-spec "Measure" [_model-name _opts]+ {:copy [:name :archived :description :entity_id]+ :skip [:dependency_analysis_version]+ :transform {:created_at (serdes/date)+ :table_id (serdes/fk :model/Table)+ :creator_id (serdes/fk :model/User)+ :definition {:export serdes/export-mbql :import serdes/import-mbql}}})++;;;; ------------------------------------------------- Search ----------------------------------------------------------++(search/define-spec "measure"+ {:model :model/Measure+ :attrs {:archived true+ :collection-id false+ :creator-id false+ :database-id :table.db_id+ :created-at false+ :updated-at true}+ :search-terms [:name :description]+ :render-terms {:table-id :table_id+ :table_description :table.description+ :table_name :table.name+ :table_schema :table.schema}+ :joins {:table [:model/Table [:= :table.id :this.table_id]]}})diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.cljindex f411236f3ae..dea38e7ba53 100644--- a/src/metabase/models/resolution.clj+++ b/src/metabase/models/resolution.clj@@ -51,6 +51,7 @@:model/HTTPAction metabase.actions.models:model/ImplicitAction metabase.actions.models:model/LoginHistory metabase.login-history.models.login-history+ :model/Measure metabase.measures.models.measure:model/Metabot metabase-enterprise.metabot-v3.models.metabot:model/MetabotConversation metabase-enterprise.metabot-v3.models.metabot-conversation:model/MetabotMessage metabase-enterprise.metabot-v3.models.metabot-messagediff --git a/src/metabase/query_processor/middleware/measures.clj b/src/metabase/query_processor/middleware/measures.cljnew file mode 100644index 00000000000..9c98ae9468c--- /dev/null+++ b/src/metabase/query_processor/middleware/measures.clj@@ -0,0 +1,158 @@+(ns metabase.query-processor.middleware.measures+ "Middleware for expanding `:measure` clauses in MBQL queries.++ Measures are saved aggregation expressions. When a query contains a `:measure` clause,+ this middleware replaces it with the actual aggregation from the measure's definition.++ Measures can reference other measures, so expansion is recursive. Cycles are detected+ by tracking the path of measure IDs being expanded."+ (:refer-clojure :exclude [not-empty some])+ (:require+ [clojure.set :as set]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.lib.schema :as lib.schema]+ [metabase.lib.util :as lib.util]+ [metabase.lib.util.match :as lib.util.match]+ [metabase.lib.walk :as lib.walk]+ [metabase.query-processor.error-type :as qp.error-type]+ [metabase.util :as u]+ [metabase.util.i18n :refer [tru]]+ [metabase.util.log :as log]+ [metabase.util.malli :as mu]+ [metabase.util.performance :refer [not-empty some]]))++(mu/defn- unresolved-measure-ids :- [:maybe [:set {:min 1} pos-int?]]+ "Find all the unresolved :measure references in `query`."+ [query :- ::lib.schema/query]+ (let [ids (transient #{})]+ (lib.walk/walk-stages+ query+ (fn [_query _path stage]+ (lib.util.match/match stage+ [:measure _opts (id :guard pos-int?)]+ (conj! ids id))+ nil))+ (not-empty (persistent! ids))))++(defn- contains-metric-reference?+ "Check if the given query or clause contains any `:metric` references.+ Returns true if found, false otherwise."+ [query-or-clause]+ (let [found? (volatile! false)+ check-clause (fn [x]+ (when (lib.util/clause-of-type? x :metric)+ (vreset! found? true))+ nil)]+ (if (map? query-or-clause)+ ;; Full query - walk all clauses in all stages+ (lib.walk/walk-clauses+ query-or-clause+ (fn [_query _path-type _stage-or-join-path clause]+ (check-clause clause)))+ ;; Single clause - walk directly+ (lib.walk/walk-clause query-or-clause check-clause))+ @found?))++(defn- check-no-metric-references!+ "Throw an exception if the measure definition contains any `:metric` references.+ Measures cannot reference metrics."+ [{:keys [id name definition]}]+ (when (contains-metric-reference? definition)+ (throw (ex-info (tru "Measures cannot reference metrics. Measure \"{0}\" (ID {1}) contains a metric reference."+ name id)+ {:type qp.error-type/invalid-query+ :measure-id id+ :measure-name name}))))++(mu/defn- fetch-measures :- [:map-of pos-int? :map]+ "Fetch measure metadata for the given IDs."+ [query :- ::lib.schema/query+ measure-ids :- [:set {:min 1} pos-int?]]+ (u/prog1 (into {}+ (map (juxt :id identity))+ (lib.metadata/bulk-metadata-or-throw query :metadata/measure measure-ids))+ (doseq [id measure-ids]+ (if-let [measure (get <> id)]+ (check-no-metric-references! measure)+ (throw (ex-info (tru "Measure {0} does not exist or belongs to a different Database."+ id)+ {:type qp.error-type/invalid-query, :id id}))))))++(defn- measure-aggregation+ "Extract the aggregation clause from a measure's definition.+ Measure definitions are MBQL 5 queries with a single stage containing one aggregation."+ [{:keys [definition]}]+ (when-let [aggregation (-> definition :stages first :aggregation first)]+ (lib.util/fresh-uuids aggregation)))++(mu/defn- expand-measures-in-stage :- ::lib.schema/stage+ "Replace :measure clauses in a stage with their actual aggregation expressions."+ [stage :- ::lib.schema/stage+ id->measure :- [:map-of pos-int? :map]]+ (lib.util.match/replace stage+ [:measure opts (id :guard pos-int?)]+ (if-let [measure (get id->measure id)]+ (if-let [aggregation (measure-aggregation measure)]+ (do+ (log/debugf "Expanding measure %d:\n%s\n->\n%s" id (u/pprint-to-str &match) (u/pprint-to-str aggregation))+ ;; Preserve :lib/uuid and :display-name from the measure clause options if present+ ;; This is important so that :aggregation refs pointing to the measure remain valid+ (cond-> aggregation+ (:lib/uuid opts) (assoc-in [1 :lib/uuid] (:lib/uuid opts))+ (:display-name opts) (assoc-in [1 :display-name] (:display-name opts))))+ (throw (ex-info (tru "Measure {0} has no aggregation defined." id)+ {:type qp.error-type/invalid-query, :measure measure})))+ (throw (ex-info (tru "Measure {0} not found." id)+ {:type qp.error-type/invalid-query, :id id})))))++(mu/defn- expand-measures-once :- ::lib.schema/query+ "Expand all :measure clauses in the query (single pass)."+ [query :- ::lib.schema/query+ measure-ids :- [:set {:min 1} pos-int?]]+ (log/debugf "Expanding measures with IDs %s" measure-ids)+ (let [id->measure (fetch-measures query measure-ids)]+ (lib.walk/walk-stages+ query+ (fn [_query _path stage]+ (expand-measures-in-stage stage id->measure)))))++(def ^:private max-expansion-depth+ "Maximum depth for recursive measure expansion. This is a safety limit to prevent+ runaway expansion in case of bad or malicious input."+ 50)++(mu/defn- expand-measures-recursive :- ::lib.schema/query+ "Recursively expand all :measure clauses in the query, detecting cycles.++ `seen-ids` is the set of measure IDs we've already expanded in this recursive chain.+ If we encounter a measure ID that's already in `seen-ids`, we have a cycle."+ [query :- ::lib.schema/query+ seen-ids :- [:set pos-int?]+ depth :- :int]+ (when (> depth max-expansion-depth)+ (throw (ex-info (tru "Measure expansion exceeded maximum depth of {0}." max-expansion-depth)+ {:type qp.error-type/invalid-query+ :seen-ids seen-ids})))+ (if-let [measure-ids (unresolved-measure-ids query)]+ ;; Check for cycles: if any measure ID is already in seen-ids, we have a cycle+ (if-let [cycle-id (some seen-ids measure-ids)]+ ;; Found a cycle - use lib/check-measure-cycles to get a detailed error with the cycle path+ ;; The metadata is already cached from previous expansions, so this is cheap+ (let [measure (lib.metadata/measure query cycle-id)]+ (lib/check-measure-cycles query (:definition measure) cycle-id))+ ;; No cycle - expand measures and continue recursively+ (recur (expand-measures-once query measure-ids)+ (set/union seen-ids measure-ids)+ (inc depth)))+ ;; No more measures to expand+ query))++(mu/defn adjust :- ::lib.schema/query+ "Middleware that looks for `:measure` clauses in an MBQL query and substitutes them+ with their actual aggregation expressions.++ Measures can reference other measures, so expansion is recursive. Cycles are detected+ and reported with the full cycle path."+ [query :- ::lib.schema/query]+ (expand-measures-recursive query #{} 0))diff --git a/src/metabase/query_processor/preprocess.clj b/src/metabase/query_processor/preprocess.cljindex d8eaead43d1..b4e8cceee8b 100644--- a/src/metabase/query_processor/preprocess.clj+++ b/src/metabase/query_processor/preprocess.clj@@ -24,6 +24,7 @@[metabase.query-processor.middleware.fetch-source-query :as fetch-source-query][metabase.query-processor.middleware.fix-bad-field-id-refs :as fix-bad-field-id-refs][metabase.query-processor.middleware.limit :as limit]+ [metabase.query-processor.middleware.measures :as measures][metabase.query-processor.middleware.metrics :as metrics][metabase.query-processor.middleware.normalize-query :as normalize][metabase.query-processor.middleware.optimize-temporal-filters :as optimize-temporal-filters]@@ -66,6 +67,7 @@#'drop-fields-in-summaries/drop-fields-in-summaries#'expand-aggregations/expand-aggregations#'metrics/adjust+ #'measures/adjust#'expand-macros/expand-macros#'qp.resolve-referenced/resolve-referenced-card-resources#'parameters/substitute-parametersdiff --git a/src/metabase/revisions/api.clj b/src/metabase/revisions/api.cljindex 5c3da1d140e..1d53b299d0c 100644--- a/src/metabase/revisions/api.clj+++ b/src/metabase/revisions/api.clj@@ -13,6 +13,7 @@{"card" :model/Card"dashboard" :model/Dashboard"document" :model/Document+ "measure" :model/Measure"segment" :model/Segment"transform" :model/Transform})diff --git a/src/metabase/revisions/events.clj b/src/metabase/revisions/events.cljindex f037a37f452..ba139245dee 100644--- a/src/metabase/revisions/events.clj+++ b/src/metabase/revisions/events.clj@@ -62,6 +62,15 @@[topic event](push-revision! :model/Segment event {:is-creation? (= topic :event/segment-create)}))+(derive ::measure-event ::event)+(derive :event/measure-create ::measure-event)+(derive :event/measure-update ::measure-event)+(derive :event/measure-delete ::measure-event)++(methodical/defmethod events/publish-event! ::measure-event+ [topic event]+ (push-revision! :model/Measure event {:is-creation? (= topic :event/measure-create)}))+(derive ::document-event ::event)(derive :event/document-create ::document-event)(derive :event/document-update ::document-event)diff --git a/src/metabase/revisions/impl/measure.clj b/src/metabase/revisions/impl/measure.cljnew file mode 100644index 00000000000..f2523bf42c3--- /dev/null+++ b/src/metabase/revisions/impl/measure.clj@@ -0,0 +1,35 @@+(ns metabase.revisions.impl.measure+ (:require+ [medley.core :as m]+ [metabase.lib.schema.util :as lib.schema.util]+ [metabase.revisions.models.revision :as revision]))++(def ^:private excluded-columns-for-measure-revision+ #{:created_at :updated_at :dependency_analysis_version})++(defmethod revision/serialize-instance :model/Measure+ [_model _id instance]+ (apply dissoc instance excluded-columns-for-measure-revision))++(defn- normalize-measure+ [measure]+ (-> measure+ (select-keys [:name :description :definition])+ (update :definition lib.schema.util/remove-lib-uuids)))++(defmethod revision/diff-map :model/Measure+ [model measure1 measure2]+ (if-not measure1+ ;; this is the first version of the measure+ (m/map-vals (fn [v] {:after v}) (select-keys measure2 [:name :description :definition]))+ ;; do our diff logic+ (let [base-diff ((get-method revision/diff-map :default)+ model+ (normalize-measure measure1)+ (normalize-measure measure2))]+ (cond-> (merge-with merge+ (m/map-vals (fn [v] {:after v}) (:after base-diff))+ (m/map-vals (fn [v] {:before v}) (:before base-diff)))+ (or (get-in base-diff [:after :definition])+ (get-in base-diff [:before :definition])) (assoc :definition {:before (get measure1 :definition)+ :after (get measure2 :definition)})))))diff --git a/src/metabase/revisions/init.clj b/src/metabase/revisions/init.cljindex 1cba8346066..a52a31f660a 100644--- a/src/metabase/revisions/init.clj+++ b/src/metabase/revisions/init.clj@@ -6,5 +6,6 @@;; https://linear.app/metabase/issue/DEV-326[metabase.revisions.impl.card][metabase.revisions.impl.dashboard]+ [metabase.revisions.impl.measure][metabase.revisions.impl.segment][metabase.revisions.impl.transform]))diff --git a/src/metabase/revisions/models/revision/diff.clj b/src/metabase/revisions/models/revision/diff.cljindex 3c8c203b9cb..e0169d610d9 100644--- a/src/metabase/revisions/models/revision/diff.clj+++ b/src/metabase/revisions/models/revision/diff.clj@@ -142,8 +142,9 @@(case model-str"Dashboard" (deferred-tru "Dashboard")"Card" (deferred-tru "Card")- "Segment" (deferred-tru "Segment")- "Document" (deferred-tru "Document")+ "Segment" (deferred-tru "Segment")+ "Measure" (deferred-tru "Measure")+ "Document" (deferred-tru "Document")"Transform" (deferred-tru "Transform")))(defn diff-strings*diff --git a/src/metabase/search/config.clj b/src/metabase/search/config.cljindex 74182529426..be410628466 100644--- a/src/metabase/search/config.clj+++ b/src/metabase/search/config.clj@@ -73,7 +73,7 @@(def models-search-order"The order of this list influences the order of the results: items earlier in thelist will be ranked higher."- (cond-> ["dashboard" "metric" "segment" "indexed-entity" "card" "dataset" "collection" "table" "action" "document"]+ (cond-> ["dashboard" "metric" "segment" "measure" "indexed-entity" "card" "dataset" "collection" "table" "action" "document"]config/ee-available? (concat ["transform"]):always (conj "database")))diff --git a/src/metabase/search/in_place/legacy.clj b/src/metabase/search/in_place/legacy.cljindex 16bb55e05e3..efaefed9bb3 100644--- a/src/metabase/search/in_place/legacy.clj+++ b/src/metabase/search/in_place/legacy.clj@@ -307,6 +307,11 @@[_ search-native-query](searchable-columns "card" search-native-query))+(defmethod searchable-columns "measure"+ [_ _]+ [:name+ :description])+(defmethod searchable-columns "metric"[_ search-native-query](searchable-columns "card" search-native-query))@@ -441,6 +446,16 @@[_](concat default-columns table-columns [:creator_id]))+(defmethod columns-for-model "measure"+ [_]+ ;; Measure excludes created_at and creator_id from search (see search spec)+ [:id :name :description :archived :updated_at+ :table_id+ [:table.db_id :database_id]+ [:table.schema :table_schema]+ [:table.name :table_name]+ [:table.description :table_description]])+(defmethod columns-for-model "metric"[_](concat default-columns table-columns [:creator_id]))@@ -611,6 +626,11 @@(sql.helpers/left-join [:collection :collection] [:= :model.collection_id :collection.id])(add-model-index-permissions-clause search-ctx)))+(defmethod search-query-for-model "measure"+ [model search-ctx]+ (-> (base-query-for-model model search-ctx)+ (sql.helpers/left-join [:metabase_table :table] [:= :measure.table_id :table.id])))+(defmethod search-query-for-model "segment"[model search-ctx](-> (base-query-for-model model search-ctx)diff --git a/src/metabase/search/spec.clj b/src/metabase/search/spec.cljindex 6ced6e2d1aa..81bd2a0a504 100644--- a/src/metabase/search/spec.clj+++ b/src/metabase/search/spec.clj@@ -16,7 +16,7 @@(def search-models"Set of search model string names. Sorted by order to index based on importance and amount of time to index"- (cond-> ["collection" "dashboard" "segment" "database" "action" "document"]+ (cond-> ["collection" "dashboard" "segment" "measure" "database" "action" "document"]config/ee-available? (conj "transform");; metric/card/dataset moved to the end because they take a long time due to computing has_temporal_dim etc.;; table and indexed-entity moved to the end because there can be a large number of themdiff --git a/src/metabase/segments/api.clj b/src/metabase/segments/api.cljindex 3ea90e5e9fd..87e899b36e7 100644--- a/src/metabase/segments/api.clj+++ b/src/metabase/segments/api.clj@@ -4,9 +4,6 @@[metabase.api.common :as api][metabase.api.macros :as api.macros][metabase.events.core :as events]- ^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.normalize :as mbql.normalize]- ^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.schema :as mbql.s]- [metabase.lib.core :as lib][metabase.models.interface :as mi][metabase.util :as u][metabase.util.log :as log]@@ -75,20 +72,13 @@clean-body (u/select-keys-when body:present #{:description :caveats :points_of_interest}:non-nil #{:archived :definition :name :show_in_getting_started})- new-def (when-let [def (:definition clean-body)]- (cond->> def- (not= :mbql-version/mbql5 (lib/normalized-mbql-version def))- (mbql.normalize/normalize ::mbql.s/MBQLQuery)))- new-body (merge- (dissoc clean-body :revision_message)- (when new-def {:definition new-def}))+ new-body (dissoc clean-body :revision_message)changes (when-not (= new-body existing)- new-body)- archive? (:archived changes)]+ new-body)](when changes(t2/update! :model/Segment id changes))(u/prog1 (hydrated-segment id)- (events/publish-event! (if archive? :event/segment-delete :event/segment-update)+ (events/publish-event! :event/segment-update{:object <> :user-id api/*current-user-id* :revision-message revision_message}))));; TODO (Cam 2025-11-25) please add a response schema to this API endpoint, it makes it easier for our customers todiff --git a/src/metabase/segments/models/segment.clj b/src/metabase/segments/models/segment.cljindex 4c7f5e5e725..e3c73cf7981 100644--- a/src/metabase/segments/models/segment.clj+++ b/src/metabase/segments/models/segment.clj@@ -86,12 +86,6 @@([model pk](mi/can-read? (t2/select-one model pk))))-(t2/define-before-update :model/Segment [segment]- ;; throw an Exception if someone tries to update creator_id- (when (contains? (t2/changes segment) :creator_id)- (throw (UnsupportedOperationException. (tru "You cannot update the creator_id of a Segment."))))- segment)-(defn- migrated-segment-definition[{:keys [definition], table-id :table_id}](let [database-id (t2/select-one-fn :db_id :model/Table :id table-id)]@@ -99,8 +93,23 @@(t2/define-before-insert :model/Segment[{:keys [definition] :as segment}]- (cond-> segment- (some? definition) (assoc :definition (migrated-segment-definition segment))))+ (let [segment (cond-> segment+ (some? definition) (assoc :definition (migrated-segment-definition segment)))]+ (when (seq (:definition segment))+ (lib/check-segment-overwrite nil (:definition segment)))+ segment))++(t2/define-before-update :model/Segment [{:keys [id] :as segment}]+ ;; throw an Exception if someone tries to update creator_id+ (when (contains? (t2/changes segment) :creator_id)+ (throw (UnsupportedOperationException. (tru "You cannot update the creator_id of a Segment."))))+ ;; normalize and check for cycles if definition is being updated+ (if-let [def-change (:definition (t2/changes segment))]+ (let [normalized-def (migrated-segment-definition (assoc segment :definition def-change))]+ (when (seq normalized-def)+ (lib/check-segment-overwrite id normalized-def))+ (assoc segment :definition normalized-def))+ segment))(defmethod mi/perms-objects-set :model/Segment[segment read-or-write]diff --git a/src/metabase/warehouse_schema/models/table.clj b/src/metabase/warehouse_schema/models/table.cljindex 51df676ef32..985112936c8 100644--- a/src/metabase/warehouse_schema/models/table.clj+++ b/src/metabase/warehouse_schema/models/table.clj@@ -391,6 +391,15 @@(t2/select :model/Segment :table_id [:in table-ids], :archived false, {:order-by [[:name :asc]]}))tables))+(mi/define-batched-hydration-method with-measures+ :measures+ "Efficiently hydrate the Measures for a collection of `tables`."+ [tables]+ (with-objects :measures+ (fn [table-ids]+ (t2/select :model/Measure :table_id [:in table-ids], :archived false, {:order-by [[:name :asc]]}))+ tables))+(mi/define-batched-hydration-method with-metrics:metrics"Efficiently hydrate the Metrics for a collection of `tables`."diff --git a/src/metabase/warehouse_schema/table.clj b/src/metabase/warehouse_schema/table.cljindex 2c9aea5cd7c..f0aebf4ce46 100644--- a/src/metabase/warehouse_schema/table.clj+++ b/src/metabase/warehouse_schema/table.clj@@ -55,7 +55,7 @@(api/write-check table)(api/check-403 (can-access-table-for-query-metadata? table)))(let [hydration-keys (cond-> [:db [:fields [:target :has_field_values] :has_field_values :dimensions :name_field]- [:segments :definition_description] :metrics :collection]+ [:segments :definition_description] [:measures :definition_description] :metrics :collection](premium-features/has-feature? :transforms) (conj :transform))](-> table(update :collection nil-if-unreadable)@@ -77,7 +77,8 @@(filter can-access-table-for-query-metadata?))tables (t2/hydrate tables[:fields [:target :has_field_values] :has_field_values :dimensions :name_field]- :segments+ [:segments :definition_description]+ [:measures :definition_description]:metrics)](for [table tables](-> tablediff --git a/src/metabase/xrays/automagic_dashboards/comparison.clj b/src/metabase/xrays/automagic_dashboards/comparison.cljindex cd64c20159c..cdcc0d82290 100644--- a/src/metabase/xrays/automagic_dashboards/comparison.clj+++ b/src/metabase/xrays/automagic_dashboards/comparison.clj@@ -178,9 +178,10 @@(mu/defn- series-labels[card :- [:map[:dataset_query {:optional true} ::ads/query]]]- (get-in card [:visualization_settings :graph.series_labels]- (map (comp capitalize-first names/metric-name)- (lib/aggregations (:dataset_query card)))))+ (let [database-id (get-in card [:dataset_query :database])]+ (get-in card [:visualization_settings :graph.series_labels]+ (map (comp capitalize-first (partial names/metric-name database-id))+ (lib/aggregations (:dataset_query card))))))(mu/defn- unroll-multiseries[card :- [:mapdiff --git a/src/metabase/xrays/automagic_dashboards/names.clj b/src/metabase/xrays/automagic_dashboards/names.cljindex db2ac742451..e0d3264b7e7 100644--- a/src/metabase/xrays/automagic_dashboards/names.clj+++ b/src/metabase/xrays/automagic_dashboards/names.clj@@ -2,7 +2,9 @@(:require[clojure.string :as str][java-time.api :as t]+ [metabase.lib-be.core :as lib-be][metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata][metabase.lib.schema.aggregation :as lib.schema.aggregation][metabase.lib.schema.expression :as lib.schema.expression][metabase.lib.schema.ref :as lib.schema.ref]@@ -28,8 +30,18 @@(mu/defn metric-name :- ::ads/string-or-18n-string"Return the name of the metric or name by describing it."- [[tag :as metric] :- vector?]+ [database-id :- [:maybe :int]+ [tag opts :as metric] :- vector?](cond+ (lib/clause-of-type? metric :measure)+ (or (:display-name opts)+ (when-let [measure-id (when (int? (nth metric 2 nil))+ (nth metric 2))]+ (when database-id+ (let [mp (lib-be/application-database-metadata-provider database-id)]+ (some-> (lib.metadata/measure mp measure-id) :name))))+ (tru "[Unknown Measure]"))+(magic.util/adhoc-metric? metric)(-> tag keyword op->name)@@ -57,17 +69,18 @@aggregation-clause :- [:or::lib.schema.aggregation/aggregation::lib.schema.aggregation/aggregations]]- (join-enumeration- (for [metric (if (sequential? (first aggregation-clause))- aggregation-clause- [aggregation-clause])]- (if (magic.util/adhoc-metric? metric)- (tru "{0} of {1}" (metric-name metric) (or (when (> (count metric) 2)- (->> (nth metric 2) ; icky- (magic.util/->field root)- :display_name))- (source-name root)))- (metric-name metric)))))+ (let [database-id (:database root)]+ (join-enumeration+ (for [metric (if (sequential? (first aggregation-clause))+ aggregation-clause+ [aggregation-clause])]+ (if (magic.util/adhoc-metric? metric)+ (tru "{0} of {1}" (metric-name database-id metric) (or (when (> (count metric) 2)+ (->> (nth metric 2) ; icky+ (magic.util/->field root)+ :display_name))+ (source-name root)))+ (metric-name database-id metric))))))(mu/defn question-description"Generate a description for the question."diff --git a/src/metabase/xrays/automagic_dashboards/util.clj b/src/metabase/xrays/automagic_dashboards/util.cljindex 40172b1d800..4aa6d6d1cd5 100644--- a/src/metabase/xrays/automagic_dashboards/util.clj+++ b/src/metabase/xrays/automagic_dashboards/util.clj@@ -45,9 +45,10 @@(filter #(-> % :entity_type (isa? tablespec)) tables))(defn saved-metric?- "Is metric a saved (V2) metric? (Note that X-Rays do not currently know how to handle Saved V2 Metrics.)"+ "Is this a saved aggregation clause? True for V2 Metrics and Measures."[metric]- (lib/clause-of-type? metric :metric))+ (or (lib/clause-of-type? metric :metric)+ (lib/clause-of-type? metric :measure)))(def ^{:arglists '([metric])} adhoc-metric?"Is this an adhoc metric?"diff --git a/test/metabase/legacy_mbql/normalize_test.cljc b/test/metabase/legacy_mbql/normalize_test.cljcindex 7db43f5177b..42ce2896da5 100644--- a/test/metabase/legacy_mbql/normalize_test.cljc+++ b/test/metabase/legacy_mbql/normalize_test.cljc@@ -43,6 +43,12 @@(is (= {:aggregation [[:+ [:metric 10] 1]]}(mbql.normalize/normalize ::mbql.s/MBQLQuery {:aggregation ["+" ["METRIC" 10] 1]})))))+;; TODO (Tamas 2026-01-05): Remove this test once FE tests switch to using MBQL5+(deftest ^:parallel normalize-measure-test+ (testing "MEASURES shouldn't get normalized in some kind of wacky way"+ (is (= {:aggregation [[:+ [:measure 10] 1]]}+ (mbql.normalize/normalize ::mbql.s/MBQLQuery {:aggregation ["+" ["MEASURE" 10] 1]})))))+(deftest ^:parallel normalize-test-4(testing "Nor should SEGMENTS"(is (= {:filter [:= [:+ [:segment 10] 1] 10]}@@ -804,6 +810,12 @@"METRICS shouldn't get canonicalized in some kind of wacky way"{{:query {:aggregation [:+ [:metric 1] 2]}} {:query {:aggregation [[:+ [:metric 1] 2]]}}}))+;; TODO (Tamas 2026-01-05): Remove this test once FE tests switch to using MBQL5+(deftest ^:parallel canonicalize-aggregations-measure-test+ (normalize-tests+ "MEASURES shouldn't get canonicalized in some kind of wacky way"+ {{:query {:aggregation [:+ [:measure 1] 2]}} {:query {:aggregation [[:+ [:measure 1] 2]]}}}))+(deftest ^:parallel canonicalize-aggregations-test-15(normalize-tests"can cumulative-count be handled with or without a Field?"diff --git a/test/metabase/lib/convert_test.cljc b/test/metabase/lib/convert_test.cljcindex 529743589b4..50c4d33bdfb 100644--- a/test/metabase/lib/convert_test.cljc+++ b/test/metabase/lib/convert_test.cljc@@ -636,6 +636,14 @@:source-table 1}:type :query}))+;; TODO (Tamas 2026-01-05): Remove this test once FE tests switch to using MBQL5+(deftest ^:parallel round-trip-aggregation-with-measure-test+ (test-round-trip+ {:database 1+ :query {:aggregation [[:+ [:measure 82] 1]]+ :source-table 1}+ :type :query}))+(deftest ^:parallel unclean-stage-round-trip-test(binding [lib.convert/*clean-query* false](doseq [querydiff --git a/test/metabase/lib/measure_test.cljc b/test/metabase/lib/measure_test.cljcnew file mode 100644index 00000000000..dd253896b8b--- /dev/null+++ b/test/metabase/lib/measure_test.cljc@@ -0,0 +1,215 @@+(ns metabase.lib.measure-test+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.lib.core :as lib]+ [metabase.lib.test-metadata :as meta]+ [metabase.lib.test-util :as lib.tu]))++(defn- measure-definition-with-aggregation+ "Create an MBQL5 measure definition with the given aggregation clause and metadata provider."+ [mp aggregation-clause]+ (-> (lib/query mp (meta/table-metadata :venues))+ (lib/aggregate aggregation-clause)))++(defn- measure-definition-referencing+ "Create a measure definition that references another measure by ID."+ [mp referenced-measure-id]+ (measure-definition-with-aggregation mp [:measure {:lib/uuid (str (random-uuid))} referenced-measure-id]))++(deftest ^:parallel check-measure-overwrite-no-refs-test+ (testing "Measure with no measure references - should pass"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ definition (measure-definition-with-aggregation mp (lib/count))]+ (is (nil? (lib/check-measure-overwrite 1 definition))))))++(deftest ^:parallel check-measure-overwrite-valid-ref-test+ (testing "Measure referencing another measure (no cycle) - should pass"+ (let [;; Measure 2 has no measure references - use base provider for its definition+ measure-2-def (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/count))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 2+ :name "Measure 2"+ :table-id (meta/id :venues)+ :definition measure-2-def}]})+ ;; Measure 1 references Measure 2 - use mp so it can find measure 2+ measure-1-def (measure-definition-referencing mp 2)]+ (is (nil? (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel check-measure-overwrite-self-reference-not-in-mp-test+ (testing "Measure referencing itself - should throw (reported as does not exist since measure being saved isn't in mp)"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ measure-1-def (measure-definition-referencing mp 1)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"does not exist"+ (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel check-measure-overwrite-self-reference-in-mp-test+ (testing "Measure referencing itself (measure exists in mp) - should throw cycle"+ (let [simple-def (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/count))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Measure 1"+ :table-id (meta/id :venues)+ :definition simple-def}]})+ measure-1-def (measure-definition-referencing mp 1)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel check-measure-overwrite-indirect-cycle-test+ (testing "Measure A -> Measure B -> Measure A - should throw"+ (let [;; Measure 1 exists with a simple definition (will be overwritten)+ simple-def (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/count))+ ;; Measure 2 references Measure 1+ measure-2-def (measure-definition-referencing meta/metadata-provider 1)+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Measure 1"+ :table-id (meta/id :venues)+ :definition simple-def}+ {:id 2+ :name "Measure 2"+ :table-id (meta/id :venues)+ :definition measure-2-def}]})+ ;; New definition for Measure 1 references Measure 2 -> creates cycle: 1 -> 2 -> 1+ measure-1-def (measure-definition-referencing mp 2)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel check-measure-overwrite-longer-cycle-test+ (testing "Measure A -> B -> C -> A - should throw"+ (let [;; Measure 1 exists with a simple definition (will be overwritten)+ simple-def (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/count))+ ;; Measure 3 references Measure 1+ measure-3-def (measure-definition-referencing meta/metadata-provider 1)+ ;; Measure 2 references Measure 3+ measure-2-def (measure-definition-referencing meta/metadata-provider 3)+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Measure 1"+ :table-id (meta/id :venues)+ :definition simple-def}+ {:id 2+ :name "Measure 2"+ :table-id (meta/id :venues)+ :definition measure-2-def}+ {:id 3+ :name "Measure 3"+ :table-id (meta/id :venues)+ :definition measure-3-def}]})+ ;; New definition for Measure 1 references Measure 2 -> creates cycle: 1 -> 2 -> 3 -> 1+ measure-1-def (measure-definition-referencing mp 2)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel check-measure-overwrite-unknown-measure-test+ (testing "Measure referencing unknown measure - should throw"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ measure-1-def (measure-definition-referencing mp 999)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"does not exist"+ (lib/check-measure-overwrite 1 measure-1-def))))))++(deftest ^:parallel measure-field-ref-uses-operator-name-test+ (testing "When a measure is used in a query and referenced in a subsequent stage, the :field ref should use the operator name (e.g., 'sum') not the measure's display name"+ (let [definition (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/sum (meta/field-metadata :venues :price)))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Total Revenue"+ :table-id (meta/id :venues)+ :definition definition}]})+ ;; Create a query with the measure as an aggregation+ query (-> (lib/query mp (meta/table-metadata :venues))+ (lib/aggregate [:measure {:lib/uuid (str (random-uuid))} 1])+ ;; Add a second stage to force the measure to be referenced as a field+ (lib/append-stage))+ ;; Get the visible columns in the second stage - these come from the first stage's aggregations+ visible-cols (lib/visible-columns query)+ measure-col (first visible-cols)+ ;; Get the field ref that would be generated for this column+ field-ref (lib/ref measure-col)]+ (testing "The field ref should use 'sum' as the field name, not 'Total Revenue'"+ ;; field-ref is [:field {:...} "sum"] - the third element is the field name+ (is (= "sum" (nth field-ref 2)))))))++(deftest ^:parallel type-of-test+ (testing "type-of returns the type of the measure's aggregation"+ (let [definition (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/count))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Count Measure"+ :table-id (meta/id :venues)+ :definition definition}]})+ query (lib/query mp (meta/table-metadata :venues))+ measure-metadata (lib/available-measures query)+ measure-clause [:measure {:lib/uuid (str (random-uuid))} 1]]+ (testing "for measure metadata"+ (is (= :type/Integer+ (lib/type-of query (first measure-metadata)))))+ (testing "for measure clause"+ (is (= :type/Integer+ (lib/type-of query measure-clause)))))))++(deftest ^:parallel type-of-sum-test+ (testing "type-of for sum aggregation returns numeric type"+ (let [definition (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/sum (meta/field-metadata :venues :price)))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Sum Measure"+ :table-id (meta/id :venues)+ :definition definition}]})+ query (lib/query mp (meta/table-metadata :venues))+ measure-metadata (first (lib/available-measures query))]+ (is (= :type/Integer+ (lib/type-of query measure-metadata))))))++(deftest ^:parallel type-of-min-max-test+ (testing "type-of for min/max aggregation returns the type of the aggregated field"+ (let [definition (measure-definition-with-aggregation+ meta/metadata-provider+ (lib/min (meta/field-metadata :venues :name)))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:id 1+ :name "Min Name"+ :table-id (meta/id :venues)+ :definition definition}]})+ query (lib/query mp (meta/table-metadata :venues))+ measure-metadata (first (lib/available-measures query))]+ (is (= :type/Text+ (lib/type-of query measure-metadata))))))++(deftest ^:parallel unknown-type-of-test+ (testing "type-of for unknown measure returns :type/*"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ query (lib/query mp (meta/table-metadata :venues))]+ (is (= :type/*+ (lib/type-of query [:measure {} 999]))))))diff --git a/test/metabase/lib/segment_test.cljc b/test/metabase/lib/segment_test.cljcindex 5cb4642a45b..ef9423ba3e3 100644--- a/test/metabase/lib/segment_test.cljc+++ b/test/metabase/lib/segment_test.cljc@@ -146,3 +146,127 @@:description "The ID is greater than 11 times the price and the name contains \"BBQ\"."}](map (partial lib/display-info query')(lib/filters query'))))))))))++(defn- segment-definition-with-filter+ "Create an MBQL5 segment definition with the given filter clause and metadata provider."+ [mp filter-clause]+ (-> (lib/query mp (meta/table-metadata :venues))+ (lib/filter filter-clause)))++(defn- segment-definition-referencing+ "Create a segment definition that references another segment by ID."+ [mp referenced-segment-id]+ (segment-definition-with-filter mp [:segment {:lib/uuid (str (random-uuid))} referenced-segment-id]))++(deftest ^:parallel check-segment-overwrite-no-refs-test+ (testing "Segment with no segment references - should pass"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ definition (segment-definition-with-filter mp (lib/> (meta/field-metadata :venues :price) 2))]+ (is (nil? (lib/check-segment-overwrite 1 definition))))))++(deftest ^:parallel check-segment-overwrite-valid-ref-test+ (testing "Segment referencing another segment (no cycle) - should pass"+ (let [;; Segment 2 has no segment references - use base provider for its definition+ segment-2-def (segment-definition-with-filter+ meta/metadata-provider+ (lib/> (meta/field-metadata :venues :price) 2))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:segments [{:id 2+ :name "Segment 2"+ :table-id (meta/id :venues)+ :definition segment-2-def}]})+ ;; Segment 1 references Segment 2 - use mp so it can find segment 2+ segment-1-def (segment-definition-referencing mp 2)]+ (is (nil? (lib/check-segment-overwrite 1 segment-1-def))))))++(deftest ^:parallel check-segment-overwrite-self-reference-not-in-mp-test+ (testing "Segment referencing itself - should throw (reported as does not exist since segment being saved isn't in mp)"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ segment-1-def (segment-definition-referencing mp 1)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"does not exist"+ (lib/check-segment-overwrite 1 segment-1-def))))))++(deftest ^:parallel check-segment-overwrite-self-reference-in-mp-test+ (testing "Segment referencing itself (segment exists in mp) - should throw cycle"+ (let [simple-def (segment-definition-with-filter+ meta/metadata-provider+ (lib/> (meta/field-metadata :venues :price) 2))+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:segments [{:id 1+ :name "Segment 1"+ :table-id (meta/id :venues)+ :definition simple-def}]})+ segment-1-def (segment-definition-referencing mp 1)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-segment-overwrite 1 segment-1-def))))))++(deftest ^:parallel check-segment-overwrite-indirect-cycle-test+ (testing "Segment A -> Segment B -> Segment A - should throw"+ (let [;; Segment 1 exists with a simple definition (will be overwritten)+ simple-def (segment-definition-with-filter+ meta/metadata-provider+ (lib/> (meta/field-metadata :venues :price) 2))+ ;; Segment 2 references Segment 1+ segment-2-def (segment-definition-referencing meta/metadata-provider 1)+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:segments [{:id 1+ :name "Segment 1"+ :table-id (meta/id :venues)+ :definition simple-def}+ {:id 2+ :name "Segment 2"+ :table-id (meta/id :venues)+ :definition segment-2-def}]})+ ;; New definition for Segment 1 references Segment 2 -> creates cycle: 1 -> 2 -> 1+ segment-1-def (segment-definition-referencing mp 2)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-segment-overwrite 1 segment-1-def))))))++(deftest ^:parallel check-segment-overwrite-longer-cycle-test+ (testing "Segment A -> B -> C -> A - should throw"+ (let [;; Segment 1 exists with a simple definition (will be overwritten)+ simple-def (segment-definition-with-filter+ meta/metadata-provider+ (lib/> (meta/field-metadata :venues :price) 2))+ ;; Segment 3 references Segment 1+ segment-3-def (segment-definition-referencing meta/metadata-provider 1)+ ;; Segment 2 references Segment 3+ segment-2-def (segment-definition-referencing meta/metadata-provider 3)+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:segments [{:id 1+ :name "Segment 1"+ :table-id (meta/id :venues)+ :definition simple-def}+ {:id 2+ :name "Segment 2"+ :table-id (meta/id :venues)+ :definition segment-2-def}+ {:id 3+ :name "Segment 3"+ :table-id (meta/id :venues)+ :definition segment-3-def}]})+ ;; New definition for Segment 1 references Segment 2 -> creates cycle: 1 -> 2 -> 3 -> 1+ segment-1-def (segment-definition-referencing mp 2)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"[Cc]ycle"+ (lib/check-segment-overwrite 1 segment-1-def))))))++(deftest ^:parallel check-segment-overwrite-unknown-segment-test+ (testing "Segment referencing unknown segment - should throw"+ (let [mp (lib.tu/mock-metadata-provider meta/metadata-provider {})+ segment-1-def (segment-definition-referencing mp 999)]+ (is (thrown-with-msg?+ #?(:clj Exception :cljs js/Error)+ #"does not exist"+ (lib/check-segment-overwrite 1 segment-1-def))))))diff --git a/test/metabase/lib/test_util/metadata_providers/mock.cljc b/test/metabase/lib/test_util/metadata_providers/mock.cljcindex 60a32f69723..573d04a8894 100644--- a/test/metabase/lib/test_util/metadata_providers/mock.cljc+++ b/test/metabase/lib/test_util/metadata_providers/mock.cljc@@ -37,6 +37,8 @@[:maybe [:sequential (with-optional-lib-type ::lib.schema.metadata/card :metadata/card)]]][:segments {:optional true}[:maybe [:sequential (with-optional-lib-type ::lib.schema.metadata/segment :metadata/segment)]]]+ [:measures {:optional true}+ [:maybe [:sequential (with-optional-lib-type ::lib.schema.metadata/measure :metadata/measure)]]][:native-query-snippets {:optional true}[:maybe [:sequential (with-optional-lib-type ::lib.schema.metadata/native-query-snippet :metadata/native-query-snippet)]]][:transforms {:optional true}@@ -55,6 +57,7 @@:metadata/column :fields:metadata/card :cards:metadata/segment :segments+ :metadata/measure :measures:metadata/native-query-snippet :native-query-snippets:metadata/metric :cards:metadata/transform :transforms)]diff --git a/test/metabase/measures/api_test.clj b/test/metabase/measures/api_test.cljnew file mode 100644index 00000000000..aac5940ea76--- /dev/null+++ b/test/metabase/measures/api_test.clj@@ -0,0 +1,256 @@+(ns metabase.measures.api-test+ "Tests for /api/measure endpoints."+ (:require+ [clojure.test :refer :all]+ [metabase.api.response :as api.response]+ [metabase.lib-be.core :as lib-be]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.query-processor :as qp]+ [metabase.test :as mt]+ [metabase.test.http-client :as client]+ [metabase.util :as u]+ [toucan2.core :as t2]))++;; TODO (Tamas 2026-01-05): Remove this helper once FE tests switch to using MBQL5+(defn- legacy-mbql-measure-definition+ "Create an MBQL4 (legacy MBQL) measure definition. This format is used by Cypress e2e tests.+ Remove this helper when FE tests switch to MBQL5."+ [database-id table-id aggregation]+ {:database database-id+ :type :query+ :query {:source-table table-id+ :aggregation aggregation}})++;; ## Helper Fns++(defn- pmbql-measure-definition+ "Create an MBQL5 measure definition with a sum aggregation."+ [table-id field-id]+ (let [metadata-provider (lib-be/application-database-metadata-provider (t2/select-one-fn :db_id :model/Table :id table-id))+ table (lib.metadata/table metadata-provider table-id)+ query (lib/query metadata-provider table)+ field (lib.metadata/field metadata-provider field-id)]+ (lib/aggregate query (lib/sum field))))++;; ## /api/measure/* AUTHENTICATION Tests+;; We assume that all endpoints for a given context are enforced by the same middleware, so we don't run the same+;; authentication test on every single individual endpoint++(deftest authentication-test+ (is (= (get api.response/response-unauthentic :body)+ (client/client :get 401 "measure")))++ (is (= (get api.response/response-unauthentic :body)+ (client/client :put 401 "measure/13"))))++;; ## POST /api/measure++(deftest create-measure-permissions-test+ (testing "POST /api/measure"+ (testing "Test security. Requires superuser perms."+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :post 403 "measure" {:name "abc"+ :table_id (mt/id :venues)+ :definition {}}))))))++(deftest create-measure-input-validation-test+ (testing "POST /api/measure"+ (is (=? {:errors {:name "value must be a non-blank string."}}+ (mt/user-http-request :crowberto :post 400 "measure" {})))++ (is (=? {:errors {:table_id "value must be an integer greater than zero."}}+ (mt/user-http-request :crowberto :post 400 "measure" {:name "abc"})))++ (is (=? {:errors {:table_id "value must be an integer greater than zero."}}+ (mt/user-http-request :crowberto :post 400 "measure" {:name "abc"+ :table_id "foobar"})))++ (is (=? {:errors {:definition "Value must be a map."}}+ (mt/user-http-request :crowberto :post 400 "measure" {:name "abc"+ :table_id 123})))++ (is (=? {:errors {:definition "Value must be a map."}}+ (mt/user-http-request :crowberto :post 400 "measure" {:name "abc"+ :table_id 123+ :definition "foobar"})))))++(deftest create-measure-test+ (testing "POST /api/measure"+ (is (=? {:name "A Measure"+ :description "I did it!"+ :creator_id (mt/user->id :crowberto)+ :creator {:id (mt/user->id :crowberto)}+ :entity_id string?+ :created_at some?+ :updated_at some?+ :archived false+ :definition map?}+ (mt/user-http-request :crowberto :post 200 "measure"+ {:name "A Measure"+ :description "I did it!"+ :table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))})))))++;; ## PUT /api/measure++(deftest update-permissions-test+ (testing "PUT /api/measure/:id"+ (testing "test security. requires superuser perms"+ (mt/with-temp [:model/Measure measure {:table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :put 403 (str "measure/" (:id measure))+ {:name "abc"+ :definition {}+ :revision_message "something different"})))))))++(deftest update-input-validation-test+ (testing "PUT /api/measure/:id"+ (is (=? {:errors {:name "nullable value must be a non-blank string."}}+ (mt/user-http-request :crowberto :put 400 "measure/1" {:name "" :revision_message "abc"})))++ (is (=? {:errors {:revision_message "value must be a non-blank string."}}+ (mt/user-http-request :crowberto :put 400 "measure/1" {:name "abc"})))++ (is (=? {:errors {:revision_message "value must be a non-blank string."}}+ (mt/user-http-request :crowberto :put 400 "measure/1" {:name "abc"+ :revision_message ""})))++ (is (=? {:errors {:definition "nullable map"}}+ (mt/user-http-request :crowberto :put 400 "measure/1" {:name "abc"+ :revision_message "123"+ :definition "foobar"})))))++(deftest update-test+ (testing "PUT /api/measure/:id"+ (mt/with-temp [:model/Measure {:keys [id]} {:table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (is (=? {:name "Updated Measure"+ :description nil+ :creator_id (mt/user->id :rasta)+ :creator {:id (mt/user->id :rasta)}+ :entity_id string?+ :created_at some?+ :updated_at some?+ :archived false+ :definition map?}+ (mt/user-http-request+ :crowberto :put 200 (format "measure/%d" id)+ {:id id+ :name "Updated Measure"+ :description nil+ :table_id (mt/id :venues)+ :revision_message "I got me some revisions"+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}))))))++(deftest partial-update-test+ (testing "PUT /api/measure/:id"+ (testing "Can I update a measure's name without specifying all fields?"+ (mt/with-temp [:model/Measure measure {:table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ ;; just make sure API call doesn't barf+ (is (some? (mt/user-http-request :crowberto :put 200 (str "measure/" (u/the-id measure))+ {:name "Cool name"+ :revision_message "WOW HOW COOL"})))))))++(deftest archive-test+ (testing "PUT /api/measure/:id"+ (testing "Can we archive a Measure with the PUT endpoint?"+ (mt/with-temp [:model/Measure {:keys [id]} {:table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (is (map? (mt/user-http-request :crowberto :put 200 (str "measure/" id)+ {:archived true, :revision_message "Archive the Measure"})))+ (is (true?+ (t2/select-one-fn :archived :model/Measure :id id)))))))++(deftest unarchive-test+ (testing "PUT /api/measure/:id"+ (testing "Can we unarchive a Measure with the PUT endpoint?"+ (mt/with-temp [:model/Measure {:keys [id]} {:archived true+ :table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (is (map? (mt/user-http-request :crowberto :put 200 (str "measure/" id)+ {:archived false, :revision_message "Unarchive the Measure"})))+ (is (= false+ (t2/select-one-fn :archived :model/Measure :id id)))))))++;; ## GET /api/measure/:id++(deftest fetch-measure-permissions-test+ (testing "GET /api/measure/:id"+ (testing "test security. Requires manage-table-metadata perms for the Table it references"+ (mt/with-temp [:model/Measure measure {:table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (mt/with-no-data-perms-for-all-users!+ (is (= "You don't have permissions to do that."+ (mt/user-http-request :rasta :get 403 (str "measure/" (u/the-id measure))))))))))++(deftest fetch-measure-test+ (testing "GET /api/measure/:id"+ (mt/with-temp [:model/Measure {:keys [id]} {:creator_id (mt/user->id :crowberto)+ :table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (mt/with-full-data-perms-for-all-users!+ (is (=? {:name "Mock Measure"+ :description nil+ :creator_id (mt/user->id :crowberto)+ :creator {:id (mt/user->id :crowberto)}+ :created_at some?+ :updated_at some?+ :entity_id string?+ :archived false+ :definition map?}+ (mt/user-http-request :rasta :get 200 (format "measure/%d" id))))))))++(deftest list-test+ (testing "GET /api/measure/"+ (mt/with-temp [:model/Measure {id-1 :id} {:name "Measure 1"+ :table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}+ :model/Measure {id-2 :id} {:name "Measure 2"+ :table_id (mt/id :products)+ :definition (pmbql-measure-definition (mt/id :products) (mt/id :products :price))}+ ;; archived measures shouldn't show up+ :model/Measure {id-3 :id} {:archived true+ :table_id (mt/id :venues)+ :definition (pmbql-measure-definition (mt/id :venues) (mt/id :venues :price))}]+ (mt/with-full-data-perms-for-all-users!+ (is (=? [{:id id-1+ :name "Measure 1"+ :creator {}+ :definition_description string?}+ {:id id-2+ :name "Measure 2"+ :definition {}+ :creator {}+ :definition_description string?}]+ (filter (fn [{measure-id :id}]+ (contains? #{id-1 id-2 id-3} measure-id))+ (mt/user-http-request :rasta :get 200 "measure/"))))))))++(deftest cypress-e2e-workflow-measure-in-expression-test+ ;; TODO (Tamas 2026-01-05): Remove this test once FE tests switch to using MBQL5+ (testing "Cypress workflow: create measure via API, then use in expression with legacy MBQL4"+ (mt/with-model-cleanup [:model/Measure]+ ;; Create a measure via POST /api/measure+ (let [{measure-id :id} (mt/user-http-request+ :crowberto :post 200 "measure"+ {:name "Venue Count"+ :table_id (mt/id :venues)+ :definition (legacy-mbql-measure-definition+ (mt/id)+ (mt/id :venues)+ [[:count]])})+ ;; Reference the measure in an expression: [:+ [:measure id] 100]+ legacy-query {:database (mt/id)+ :type :query+ :query {:source-table (mt/id :venues)+ :aggregation [[:+ [:measure measure-id] 100]]}}+ ;; Equivalent direct query: count + 100+ direct-query {:database (mt/id)+ :type :query+ :query {:source-table (mt/id :venues)+ :aggregation [[:+ [:count] 100]]}}]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query legacy-query))))))))diff --git a/test/metabase/measures/models/measure_test.clj b/test/metabase/measures/models/measure_test.cljnew file mode 100644index 00000000000..21f75216e14--- /dev/null+++ b/test/metabase/measures/models/measure_test.clj@@ -0,0 +1,143 @@+(ns metabase.measures.models.measure-test+ (:require+ [clojure.test :refer :all]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.models.serialization :as serdes]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(defn- measure-definition+ "Create an MBQL5 measure definition with the given aggregation clause.+ Uses lib/aggregate to create a proper MBQL5 query."+ [aggregation-clause]+ (let [mp (mt/metadata-provider)+ table-metadata (lib.metadata/table mp (mt/id :venues))]+ (-> (lib/query mp table-metadata)+ (lib/aggregate aggregation-clause))))++(deftest insert-measure-cycle-detection-test+ (testing "Inserting a measure that references an existing measure should succeed"+ (mt/with-temp [:model/Measure {measure-1-id :id} {:name "Measure 1"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib/count))}+ :model/Measure measure-2 {:name "Measure 2"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (-> (mt/metadata-provider)+ (lib.metadata/measure measure-1-id)+ measure-definition)}]+ (is (some? (:id measure-2))))))++(defn- measure-definition-referencing+ "Create a measure definition that references another measure by ID."+ [referenced-measure-id]+ (measure-definition [:measure {:lib/uuid (str (random-uuid))} referenced-measure-id]))++(deftest identity-hash-test+ (testing "Measure hashes are composed of the measure name and table identity-hash"+ (let [now #t "2022-09-01T12:34:56Z"]+ (mt/with-temp [:model/Database db {:name "field-db" :engine :h2}+ :model/Table table {:schema "PUBLIC" :name "widget" :db_id (:id db)}+ :model/Measure measure {:name "total sales" :table_id (:id table) :created_at now+ :definition (measure-definition (lib/count))}]+ (is (= (serdes/raw-hash ["total sales" (serdes/identity-hash table) (:created_at measure)])+ (serdes/identity-hash measure)))))))++(deftest update-measure-cycle-detection-test+ (testing "Updating a measure to reference a non-existent measure should fail"+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Measure"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib/count))}]+ (is (thrown-with-msg?+ Exception+ #"does not exist"+ (t2/update! :model/Measure measure-id {:definition (measure-definition-referencing 99999)})))))+ (testing "Updating a measure to reference itself should fail"+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Measure"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib/count))}]+ (is (thrown-with-msg?+ Exception+ #"[Cc]ycle"+ (t2/update! :model/Measure measure-id {:definition (measure-definition-referencing measure-id)})))))+ (testing "Updating a measure to create an indirect cycle should fail"+ (mt/with-temp [:model/Measure {measure-1-id :id} {:name "Measure 1"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib/count))}+ :model/Measure {measure-2-id :id} {:name "Measure 2"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition-referencing measure-1-id)}]+ (is (thrown-with-msg?+ Exception+ #"[Cc]ycle"+ (t2/update! :model/Measure measure-1-id {:definition (measure-definition-referencing measure-2-id)})))))++;;; ------------------------------------------------ Metric Reference Tests ------------------------------------------------++ (defn- metric-query+ "Create a metric-style dataset query (a query with a single aggregation)."+ []+ (measure-definition (lib/count)))++ (deftest insert-measure-with-metric-reference-test+ (testing "Inserting a measure that references a metric should fail"+ (mt/with-temp [:model/Card {metric-id :id} {:name "Test Metric"+ :type :metric+ :database_id (mt/id)+ :table_id (mt/id :venues)+ :dataset_query (metric-query)}]+ (let [mp (mt/metadata-provider)]+ (is (thrown-with-msg?+ Exception+ #"[Mm]easures cannot reference metrics"+ (t2/insert! :model/Measure+ {:name "Bad Measure"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib.metadata/metric mp metric-id))})))))))++ (deftest insert-measure-with-nested-metric-reference-test+ (testing "Inserting a measure with metric nested in arithmetic expression should fail"+ (mt/with-temp [:model/Card {metric-id :id} {:name "Test Metric"+ :type :metric+ :database_id (mt/id)+ :table_id (mt/id :venues)+ :dataset_query (metric-query)}]+ (let [mp (mt/metadata-provider)]+ (is (thrown-with-msg?+ Exception+ #"[Mm]easures cannot reference metrics"+ (t2/insert! :model/Measure+ {:name "Bad Measure"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ ;; Metric nested in an arithmetic expression: metric + 1+ :definition (measure-definition+ (lib/+ (lib.metadata/metric mp metric-id)+ 1))})))))))++ (deftest update-measure-with-metric-reference-test+ (testing "Updating a measure to reference a metric should fail"+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Good Measure"+ :table_id (mt/id :venues)+ :creator_id (mt/user->id :rasta)+ :definition (measure-definition (lib/count))}+ :model/Card {metric-id :id} {:name "Test Metric"+ :type :metric+ :database_id (mt/id)+ :table_id (mt/id :venues)+ :dataset_query (metric-query)}]+ (let [mp (mt/metadata-provider)]+ (is (thrown-with-msg?+ Exception+ #"[Mm]easures cannot reference metrics"+ (t2/update! :model/Measure measure-id+ {:definition (measure-definition (lib.metadata/metric mp metric-id))}))))))))diff --git a/test/metabase/query_processor/middleware/measures_test.clj b/test/metabase/query_processor/middleware/measures_test.cljnew file mode 100644index 00000000000..3cf5dff4809--- /dev/null+++ b/test/metabase/query_processor/middleware/measures_test.clj@@ -0,0 +1,515 @@+(ns metabase.query-processor.middleware.measures-test+ (:require+ [clojure.test :refer [deftest is testing]]+ [mb.hawk.assert-exprs.approximately-equal :as =?]+ [metabase.lib.core :as lib]+ [metabase.lib.metadata :as lib.metadata]+ [metabase.lib.test-metadata :as meta]+ [metabase.lib.test-util :as lib.tu]+ [metabase.query-processor :as qp]+ [metabase.query-processor.middleware.measures :as measures]+ [metabase.query-processor.preprocess :as qp.preprocess]+ [metabase.test :as mt]))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Test Helpers |+;;; +----------------------------------------------------------------------------------------------------------------+++(defn- mock-measure+ "Create a mock measure with the given ID and definition query.+ Returns [measure metadata-provider]."+ ([id definition-query]+ (mock-measure meta/metadata-provider id definition-query))+ ([metadata-provider id definition-query]+ (mock-measure metadata-provider id definition-query nil))+ ([metadata-provider id definition-query measure-details]+ (let [measure (merge {:lib/type :metadata/measure+ :id id+ :name (str "Mock Measure " id)+ :table-id (meta/id :products)+ :description "A test measure"+ :archived false+ :definition definition-query}+ measure-details)]+ [measure (lib.tu/mock-metadata-provider+ metadata-provider+ {:measures [measure]})])))++(defn- basic-sum-measure-query+ "Create a basic measure definition query with a sum aggregation on products.price."+ []+ (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/sum (meta/field-metadata :products :price)))))++(defn- basic-count-measure-query+ "Create a measure definition query with a count aggregation."+ []+ (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/count))))++(defn- adjust+ "Run the measures middleware on a query."+ [query]+ (#'measures/adjust query))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Basic Tests |+;;; +----------------------------------------------------------------------------------------------------------------+++(deftest ^:parallel no-measure-should-result-in-exact-same-query-test+ (testing "Query without measures passes through unchanged"+ (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/sum (meta/field-metadata :products :price))))]+ (is (= query (adjust query))))))++(deftest ^:parallel basic-measure-expansion-test+ (testing "Single measure reference is replaced with its aggregation"+ (let [[_measure mp] (mock-measure 1 (basic-sum-measure-query))+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (=? {:stages [{:source-table (meta/id :products)+ :aggregation [[:sum {} [:field {} (meta/id :products :price)]]]}]}+ (adjust query))))))++(deftest ^:parallel measure-with-display-name-override-test+ (testing "display-name from measure clause options is preserved"+ (let [[_measure mp] (mock-measure 1 (basic-sum-measure-query))+ measure-meta (lib.metadata/measure mp 1)+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib/with-expression-name (lib/ref measure-meta) "My Custom Name")))]+ (is (=? {:stages [{:aggregation [[:sum {:display-name "My Custom Name"} some?]]}]}+ (adjust query))))))++(deftest ^:parallel multiple-measures-in-query-test+ (testing "Multiple measures in a query all expand"+ (let [[_measure1 mp] (mock-measure 1 (basic-sum-measure-query))+ [_measure2 mp] (mock-measure mp 2 (basic-count-measure-query))+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1))+ (lib/aggregate (lib.metadata/measure mp 2)))]+ (is (=? {:stages [{:source-table (meta/id :products)+ :aggregation [[:sum {} [:field {} (meta/id :products :price)]]+ [:count {}]]}]}+ (adjust query))))))++(deftest ^:parallel non-existent-measure-error-test+ (testing "Proper error when measure doesn't exist"+ (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate [:measure {:lib/uuid (str (random-uuid))} 9999]))]+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #":metadata/measure 9999" (adjust query))))))++(deftest ^:parallel measure-with-no-aggregation-error-test+ (testing "Error when measure definition has no aggregation"+ (let [empty-definition (lib/query meta/metadata-provider (meta/table-metadata :products))+ [_measure mp] (mock-measure 1 empty-definition)+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Measure 1 has no aggregation" (adjust query))))))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Nested Measure Tests |+;;; +----------------------------------------------------------------------------------------------------------------+++(deftest ^:parallel nested-measure-expansion-test+ (testing "Measure A references Measure B, both expand correctly"+ (let [;; Measure 2 is a simple count+ [_measure2 mp] (mock-measure 2 (basic-count-measure-query))+ ;; Measure 1 references Measure 2 in an arithmetic expression: measure2 + 1+ measure1-definition (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib/+ (lib.metadata/measure mp 2) 1)))+ [_measure1 mp] (mock-measure mp 1 measure1-definition)+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (=? {:stages [{:source-table (meta/id :products)+ :aggregation [[:+ {} [:count {}] 1]]}]}+ (adjust query))))))++(deftest ^:parallel three-level-nested-measures-test+ (testing "A → B → C chain expands correctly"+ (let [;; Measure 3 is a simple sum+ [_measure3 mp] (mock-measure 3 (basic-sum-measure-query))+ ;; Measure 2 references Measure 3: measure3 * 2+ measure2-definition (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib/* (lib.metadata/measure mp 3) 2)))+ [_measure2 mp] (mock-measure mp 2 measure2-definition)+ ;; Measure 1 references Measure 2: measure2 + 10+ measure1-definition (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib/+ (lib.metadata/measure mp 2) 10)))+ [_measure1 mp] (mock-measure mp 1 measure1-definition)+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ ;; Should expand to: (sum(price) * 2) + 10+ (is (=? {:stages [{:source-table (meta/id :products)+ :aggregation [[:+ {}+ [:* {} [:sum {} [:field {} (meta/id :products :price)]] 2]+ 10]]}]}+ (adjust query))))))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Cycle Detection Tests |+;;; +----------------------------------------------------------------------------------------------------------------+++(defn- measure-ref+ "Create a measure reference clause for use in definitions."+ [id]+ [:measure {:lib/uuid (str (random-uuid))} id])++(deftest ^:parallel measure-direct-cycle-detection-test+ (testing "Direct cycle (A → A) is detected and reported"+ (let [;; Measure 1 references itself - we need to construct this carefully+ ;; First create a placeholder measure, then update it with a self-reference+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Self-referencing Measure"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 1) 1)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Measure cycle detected" (adjust query))))))++(deftest ^:parallel measure-mutual-recursion-cycle-test+ (testing "Indirect cycle (A → B → A) is detected and reported"+ (let [;; Create both measures with mutual references+ ;; Measure 1 references Measure 2+ ;; Measure 2 references Measure 1+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Measure 1"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 2) 1)))}+ {:lib/type :metadata/measure+ :id 2+ :name "Measure 2"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/* (measure-ref 1) 2)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Measure cycle detected" (adjust query))))))++(deftest ^:parallel measure-longer-cycle-detection-test+ (testing "Longer cycle (A → B → C → A) is detected"+ (let [;; Create three measures forming a cycle+ mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Measure 1"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 2) 1)))}+ {:lib/type :metadata/measure+ :id 2+ :name "Measure 2"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/* (measure-ref 3) 2)))}+ {:lib/type :metadata/measure+ :id 3+ :name "Measure 3"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/- (measure-ref 1) 5)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"Measure cycle detected" (adjust query))))))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | E2E Tests |+;;; +----------------------------------------------------------------------------------------------------------------+++(deftest ^:parallel e2e-measure-results-test+ (testing "Execute query with measure through full QP, verify results match equivalent direct aggregation"+ (let [mp (mt/metadata-provider)+ ;; Create a measure that sums the price field+ measure-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price)))))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Total Price"+ :table-id (mt/id :products)+ :definition measure-definition}]})+ ;; Query using the measure+ measure-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib.metadata/measure mp 1)))+ ;; Equivalent direct query+ direct-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price)))))]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query measure-query)))))))++(deftest ^:parallel e2e-nested-measure-results-test+ (testing "Execute query with nested measures, verify results"+ (let [mp (mt/metadata-provider)+ ;; Measure 2: count of products+ measure2-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/count)))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 2+ :name "Product Count"+ :table-id (mt/id :products)+ :definition measure2-definition}]})+ ;; Measure 1: references measure 2 with arithmetic (count * 10)+ measure1-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/* (lib.metadata/measure mp 2) 10)))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Product Count x10"+ :table-id (mt/id :products)+ :definition measure1-definition}]})+ ;; Query using measure 1+ measure-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib.metadata/measure mp 1)))+ ;; Equivalent direct query: count * 10+ direct-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/* (lib/count) 10)))]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query measure-query)))))))++(deftest ^:parallel e2e-measure-with-breakout-test+ (testing "Measure works correctly with breakout"+ (let [mp (mt/metadata-provider)+ measure-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price)))))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Total Price"+ :table-id (mt/id :products)+ :definition measure-definition}]})+ measure-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib.metadata/measure mp 1))+ (lib/breakout (lib.metadata/field mp (mt/id :products :category))))+ direct-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price))))+ (lib/breakout (lib.metadata/field mp (mt/id :products :category))))]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query measure-query)))))))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Measures with Segment References |+;;; +----------------------------------------------------------------------------------------------------------------+++(deftest ^:parallel e2e-measure-with-segment-test+ (testing "Measure with segment reference works through full QP pipeline"+ (let [mp (mt/metadata-provider)+ ;; Create a segment for venues with price < 4+ mp (lib.tu/mock-metadata-provider+ mp+ {:segments [{:id 1+ :name "Affordable Venues"+ :table-id (mt/id :venues)+ :definition (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/filter (lib/< (lib.metadata/field mp (mt/id :venues :price)) 4)))}]})+ ;; Create a measure that counts venues matching the segment+ measure-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/aggregate (lib/count-where (lib.metadata/segment mp 1))))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Affordable Venue Count"+ :table-id (mt/id :venues)+ :definition measure-definition}]})+ ;; Query using the measure+ measure-query (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/aggregate (lib.metadata/measure mp 1)))+ ;; Equivalent direct query+ direct-query (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/aggregate (lib/count-where (lib/< (lib.metadata/field mp (mt/id :venues :price)) 4))))]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query measure-query)))))))++(deftest ^:parallel e2e-measure-multi-stage-query-test+ (testing "Measure works correctly when referenced in a subsequent stage (field ref should use operator name, not display name)"+ (let [mp (mt/metadata-provider)+ ;; Create a measure "Total Price" that sums products.price+ ;; The measure's name is "Total Price" but the operator name should be "sum"+ measure-definition (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price)))))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Total Price"+ :table-id (mt/id :products)+ :definition measure-definition}]})+ ;; Create a multi-stage query:+ ;; Stage 0: Group by category, aggregate with measure+ ;; Stage 1: Filter on the aggregation result+ measure-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/breakout (lib.metadata/field mp (mt/id :products :category)))+ (lib/aggregate (lib.metadata/measure mp 1))+ lib/append-stage)+ ;; Find the sum column (from the aggregation) in the second stage+ ;; The column should have :name "sum" not "Total Price"+ measure-cols (lib/filterable-columns measure-query)+ measure-col (first (filter #(= (:name %) "sum") measure-cols))+ measure-query (lib/filter measure-query (lib/> measure-col 100))+ ;; Equivalent direct query+ direct-query (-> (lib/query mp (lib.metadata/table mp (mt/id :products)))+ (lib/breakout (lib.metadata/field mp (mt/id :products :category)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :products :price))))+ lib/append-stage)+ direct-cols (lib/filterable-columns direct-query)+ direct-col (first (filter #(= (:name %) "sum") direct-cols))+ direct-query (lib/filter direct-query (lib/> direct-col 100))]+ (is (= (mt/rows (qp/process-query direct-query))+ (mt/rows (qp/process-query measure-query)))))))++;;; +----------------------------------------------------------------------------------------------------------------++;;; | Measures with Metric References (disallowed) |+;;; +----------------------------------------------------------------------------------------------------------------+++(def ^:private test-metric-card+ "A metric card for testing metric references in measures."+ {:lib/type :metadata/card+ :id 100+ :type :metric+ :name "Test Metric"+ :database-id (meta/id)+ :table-id (meta/id :products)+ :dataset-query (basic-count-measure-query)})++(defn- mp-with-metric+ "Create a metadata provider that includes the test metric."+ []+ (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:cards [test-metric-card]}))++(deftest ^:parallel measure-with-metric-reference-error-test+ (testing "Measure containing a metric reference fails with descriptive error at query time"+ (let [metric-mp (mp-with-metric)+ mp (lib.tu/mock-metadata-provider+ metric-mp+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Bad Measure"+ :table-id (meta/id :products)+ :definition (-> (lib/query metric-mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/metric metric-mp 100)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"[Mm]easures cannot reference metrics"+ (adjust query))))))++(deftest ^:parallel measure-with-nested-metric-in-expression-error-test+ (testing "Measure with metric nested in arithmetic expression fails"+ (let [metric-mp (mp-with-metric)+ mp (lib.tu/mock-metadata-provider+ metric-mp+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Bad Measure"+ :table-id (meta/id :products)+ ;; Metric nested in: (metric + count) * 2+ :definition (-> (lib/query metric-mp (meta/table-metadata :products))+ (lib/aggregate+ (lib/* (lib/+ (lib.metadata/metric metric-mp 100)+ (lib/count))+ 2)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"[Mm]easures cannot reference metrics"+ (adjust query))))))++(deftest ^:parallel maintain-aggregation-refs-test+ (testing "the aggregation that replaces a :measure ref should keep the :measure's :lib/uuid, so :aggregation refs pointing to it are still valid"+ (let [mp (mt/metadata-provider)+ definition (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/aggregate (lib/sum (lib.metadata/field mp (mt/id :venues :price)))))+ mp (lib.tu/mock-metadata-provider+ mp+ {:measures [{:id 1+ :name "Total Revenue"+ :table-id (mt/id :venues)+ :definition definition}]})+ measure (lib.metadata/measure mp 1)+ query (-> (lib/query mp (lib.metadata/table mp (mt/id :venues)))+ (lib/aggregate measure)+ (as-> <> (lib/order-by <> (lib/aggregation-ref <> 0))))]+ (is (=? {:stages [{:aggregation [[:sum {:lib/uuid (=?/same :uuid)} [:field {} (mt/id :venues :price)]]]+ :order-by [[:asc {} [:aggregation {} (=?/same :uuid)]]]}]}+ (qp.preprocess/preprocess query))))))++(deftest max-expansion-depth-test+ (let [mp (lib.tu/mock-metadata-provider+ meta/metadata-provider+ {:measures [{:lib/type :metadata/measure+ :id 4+ :name "Measure 4"+ :table-id (meta/id :products)+ :definition (basic-sum-measure-query)}+ {:lib/type :metadata/measure+ :id 3+ :name "Measure 3"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 4) 1)))}+ {:lib/type :metadata/measure+ :id 2+ :name "Measure 2"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 3) 1)))}+ {:lib/type :metadata/measure+ :id 1+ :name "Measure 1"+ :table-id (meta/id :products)+ :definition (-> (lib/query meta/metadata-provider (meta/table-metadata :products))+ (lib/aggregate (lib/+ (measure-ref 2) 1)))}]})+ base-query (lib/query mp (meta/table-metadata :products))]+ (testing "Expansion fails when it exceeds max-expansion-depth"+ (let [query (-> base-query+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"exceeded maximum depth"+ (with-redefs [measures/max-expansion-depth 3]+ (adjust query))))))+ (testing "Expansion succeeds when within max-expansion-depth"+ (let [query (-> base-query+ (lib/aggregate (lib.metadata/measure mp 2)))]+ (is (=? {:stages [{:aggregation [[:+ {} [:+ {} [:sum {} some?] 1] 1]]}]}+ (with-redefs [measures/max-expansion-depth 3]+ (adjust query))))))))++(deftest ^:parallel nested-measure-with-metric-reference-error-test+ (testing "Nested measure containing metric reference fails (A → B where B uses metric)"+ (let [metric-mp (mp-with-metric)+ ;; First create inner measure that references the metric+ inner-mp (lib.tu/mock-metadata-provider+ metric-mp+ {:measures [{:lib/type :metadata/measure+ :id 2+ :name "Inner Measure with Metric"+ :table-id (meta/id :products)+ :definition (-> (lib/query metric-mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/metric metric-mp 100)))}]})+ ;; Then create outer measure that references the inner measure+ mp (lib.tu/mock-metadata-provider+ inner-mp+ {:measures [{:lib/type :metadata/measure+ :id 1+ :name "Outer Measure"+ :table-id (meta/id :products)+ :definition (-> (lib/query inner-mp (meta/table-metadata :products))+ (lib/aggregate (lib/+ (lib.metadata/measure inner-mp 2) 1)))}]})+ query (-> (lib/query mp (meta/table-metadata :products))+ (lib/aggregate (lib.metadata/measure mp 1)))]+ (is (thrown-with-msg?+ clojure.lang.ExceptionInfo+ #"[Mm]easures cannot reference metrics"+ (adjust query))))))diff --git a/test/metabase/query_processor/middleware/metrics_test.clj b/test/metabase/query_processor/middleware/metrics_test.cljindex 75cdfdadf84..2eef712e92c 100644--- a/test/metabase/query_processor/middleware/metrics_test.clj+++ b/test/metabase/query_processor/middleware/metrics_test.clj@@ -1131,5 +1131,5 @@(testing "All available aggregations are tested for filter expansion in metric"(is (empty? (set/difference(disj (descendants @lib.hierarchy/hierarchy :metabase.lib.schema.aggregation/aggregation-clause-tag)- :aggregation :metric :offset)+ :aggregation :metric :measure :offset)(set (map :operator tested-aggregations)))))))diff --git a/test/metabase/search/api_test.clj b/test/metabase/search/api_test.cljindex 2807d09f41d..03858d2296f 100644--- a/test/metabase/search/api_test.clj+++ b/test/metabase/search/api_test.clj@@ -168,10 +168,16 @@:description "Lookin' for a blueberry":creator_id true:creator_common_name "Rasta Toucan")+ (table-search-results))+ (merge+ (make-result "measure test measure"+ :model "measure")(table-search-results))]))-(defn- default-segment-results []- (filter #(contains? #{"segment"} (:model %)) (default-search-results)))+(defn- default-table-scoped-results+ "Return search results for models that are scoped to tables (not collections) - segments and measures."+ []+ (filter (comp #{"segment" "measure"} :model) (default-search-results)))(defn- default-archived-results [](for [result (default-search-results)@@ -222,7 +228,8 @@:model/Dashboard dashboard (coll-data-map "dashboard %s dashboard" coll):model/Card metric (assoc (coll-data-map "metric %s metric" coll):type :metric)- :model/Segment segment (data-map "segment %s segment")]+ :model/Segment segment (data-map "segment %s segment")+ :model/Measure measure (data-map "measure %s measure")](f {:action action:collection coll:card card@@ -231,7 +238,8 @@:dashboard dashboard:metric metric:table table- :segment segment})))))+ :segment segment+ :measure measure})))))(defmacro ^:private with-search-items-in-root-collection [search-string & body]`(do-with-search-items ~search-string true (fn [~'_] ~@body)))@@ -403,9 +411,9 @@(let [search-term "query-model-set"](with-search-items-in-root-collection search-term(testing "should returns a list of models that search result will return"- (is (= #{"dashboard" "table" "dataset" "segment" "collection" "database" "action" "metric" "card"}+ (is (= #{"dashboard" "table" "dataset" "segment" "measure" "collection" "database" "action" "metric" "card"}(get-available-models)))- (is (= #{"dashboard" "table" "dataset" "segment" "collection" "database" "action" "metric" "card"}+ (is (= #{"dashboard" "table" "dataset" "segment" "measure" "collection" "database" "action" "metric" "card"}(get-available-models :q search-term))))(testing "return a subset of model for created-by filter"(is (= #{"dashboard" "dataset" "card" "metric" "action"}@@ -514,12 +522,12 @@:archived true :q search-name))))))))))))(deftest permissions-test- (testing (str "Ensure that users without perms for the root collection don't get results NOTE: Segments "- "don't have collections, so they'll be returned")+ (testing (str "Ensure that users without perms for the root collection don't get results NOTE: Segments and "+ "Measures don't have collections, so they'll be returned")(mt/with-non-admin-groups-no-root-collection-perms(with-search-items-in-root-collection "test"(mt/with-full-data-perms-for-all-users!- (is (= (default-segment-results)+ (is (= (default-table-scoped-results)(search-request-data :rasta :q "test"))))))))(deftest permissions-test-2@@ -552,7 +560,8 @@(assoc :can_write false)))(concat (map #(merge default-search-row % (table-search-results))[{:name "segment test2 segment", :description "Lookin' for a blueberry",- :model "segment" :creator_id true :creator_common_name "Rasta Toucan"}]))+ :model "segment" :creator_id true :creator_common_name "Rasta Toucan"}+ {:name "measure test2 measure", :model "measure"}]));; This reverse is hokey; it's because the test2 results happen to come first in the API responsereversecleaned-results)@@ -609,7 +618,8 @@(is (= (->> (default-results-with-collection)(concat (map #(merge default-search-row % (table-search-results))[{:name "segment test2 segment" :description "Lookin' for a blueberry" :model "segment"- :creator_id true :creator_common_name "Rasta Toucan"}]))+ :creator_id true :creator_common_name "Rasta Toucan"}+ {:name "measure test2 measure" :model "measure"}]))(map #(cond-> %(contains? #{"collection" "dashboard" "card" "dataset" "metric"} (:model %))(assoc :can_write false)))@@ -852,7 +862,8 @@:model/Dashboard _ (archived {:name "dashboard test dashboard"}):model/Collection _ (archived-collection {:name "collection test collection"}):model/Card _ (archived {:name "metric test metric" :type :metric})- :model/Segment _ (archived {:name "segment test segment"})]+ :model/Segment _ (archived {:name "segment test segment"})+ :model/Measure _ (archived {:name "measure test measure"})](is (= (default-archived-results)(search-request-data :crowberto :q "test", :archived "true")))))))@@ -869,7 +880,8 @@:model/Dashboard _ (archived {:name "dashboard test dashboard"}):model/Collection _ (archived-collection {:name "collection test collection"}):model/Card _ (archived {:name "metric test metric" :type :metric})- :model/Segment _ (archived {:name "segment test segment"})]+ :model/Segment _ (archived {:name "segment test segment"})+ :model/Measure _ (archived {:name "measure test measure"})](is (mt/ordered-subset? (default-archived-results)(search-request-data :crowberto :archived "true")))))))@@ -1393,13 +1405,13 @@(let [search-term "Available models"](with-search-items-in-root-collection search-term(testing "GET /api/search"- (is (= #{"dashboard" "dataset" "segment" "collection" "action" "metric" "card" "table" "database"}+ (is (= #{"dashboard" "dataset" "segment" "measure" "collection" "action" "metric" "card" "table" "database"}(-> (mt/user-http-request :crowberto :get 200 "search" :q search-term :models "card":calculate_available_models true):available_modelsset)))- (is (= #{"dashboard" "dataset" "segment" "collection" "action" "metric" "card" "table" "database"}+ (is (= #{"dashboard" "dataset" "segment" "measure" "collection" "action" "metric" "card" "table" "database"}(-> (mt/user-http-request :crowberto :get 200 "search" :q search-term :models "card" :models "dashboard":calculate_available_models true):available_models@@ -1487,7 +1499,7 @@:type :query:model_id model-id})](testing "`archived-string` is 'false'"- (is (= #{"dashboard" "table" "dataset" "segment" "collection" "database" "action" "metric" "card"}+ (is (= #{"dashboard" "table" "dataset" "segment" "measure" "collection" "database" "action" "metric" "card"}(get-available-models :archived "false"))))(testing "`archived-string` is 'true'"(is (= #{"action"}diff --git a/test/metabase/search/appdb/index_test.clj b/test/metabase/search/appdb/index_test.cljindex 1c7544c0056..dfbf74b46ee 100644--- a/test/metabase/search/appdb/index_test.clj+++ b/test/metabase/search/appdb/index_test.clj@@ -542,11 +542,11 @@(def ^:private model->deleted-descendants;; Note that these refer to the table names, not the search-model names.- {"core_user" (cond-> #{"action" "collection" "document" "model_index_value" "report_card" "report_dashboard" "segment"}+ {"core_user" (cond-> #{"action" "collection" "document" "measure" "model_index_value" "report_card" "report_dashboard" "segment"}config/ee-available? (conj "transform"))"model_index" #{"model_index_value"}- "metabase_database" #{"action" "metabase_table" "model_index_value" "report_card" "segment"}- "metabase_table" #{"action" "model_index_value" "report_card" "segment"}+ "metabase_database" #{"action" "measure" "metabase_table" "model_index_value" "report_card" "segment"}+ "metabase_table" #{"action" "measure" "model_index_value" "report_card" "segment"}"document" #{"action" "model_index_value" "report_card"}"report_card" #{"action" "model_index_value" "report_card"}"report_dashboard" #{"action" "model_index_value" "report_card"}})diff --git a/test/metabase/search/filter_test.clj b/test/metabase/search/filter_test.cljindex 0169809ae6f..6860e964dff 100644--- a/test/metabase/search/filter_test.clj+++ b/test/metabase/search/filter_test.clj@@ -66,7 +66,7 @@(search.filter/search-context->applicable-models (with-all-models-and-regular-user {:archived? false})))))(testing "We only search for certain models in the trash"- (is (= #{"dashboard" "dataset" "document" "segment" "collection" "action" "metric" "card"}+ (is (= #{"dashboard" "dataset" "document" "segment" "measure" "collection" "action" "metric" "card"}(search.filter/search-context->applicable-models (with-all-models-and-regular-user {:archived? true})))))(testing "Indexed entities and transforms (which are admin-only) are not visible for sandboxed users"@@ -123,7 +123,7 @@:from :somewhere;; This :where clause is a set to avoid flakes, since the clause order will be non-deterministic.:where #{:and- [:in :search_index.model (cond-> #{"dashboard" "table" "segment" "collection" "database" "action" "indexed-entity" "metric" "card" "document"}+ [:in :search_index.model (cond-> #{"dashboard" "table" "segment" "measure" "collection" "database" "action" "indexed-entity" "metric" "card" "document"}config/ee-available? (conj "transform"))][:in :search_index.model_id ["1" "2" "3" "4"]][:in :search_index.model ["card" "dataset" "metric" "dashboard" "action"]]diff --git a/test/metabase/search/spec_test.clj b/test/metabase/search/spec_test.cljindex 08d0c4ccf76..3eeb1f6be54 100644--- a/test/metabase/search/spec_test.clj+++ b/test/metabase/search/spec_test.clj@@ -127,7 +127,8 @@(is (= #{["table" [:= 123 :this.db_id]]["database" [:= 123 :this.id]]}(search.spec/search-models-to-update (t2/instance :model/Database {:id 123 :name "databass"}))))- (is (= #{["segment" [:= 321 :this.table_id]]+ (is (= #{["measure" [:= 321 :this.table_id]]+ ["segment" [:= 321 :this.table_id]]["table" [:= 321 :this.id]]}(search.spec/search-models-to-update (t2/instance :model/Table {:id 321 :name "turn-tables"})))))diff --git a/test/metabase/segments/api_test.clj b/test/metabase/segments/api_test.cljindex 8ddfea45ade..1677a1cdcea 100644--- a/test/metabase/segments/api_test.clj+++ b/test/metabase/segments/api_test.clj@@ -181,6 +181,27 @@:revision_message "WOW HOW COOL":definition {}})))))))+(deftest update-with-full-legacy-query-test+ (testing "PUT /api/segment/:id"+ (testing "Can update a segment with a full legacy MBQL query structure (type, database, query keys)"+ (mt/with-temp [:model/Segment {:keys [id]} {:table_id (mt/id :orders)+ :definition (mbql4-segment-definition (mt/id :orders) (mt/id :orders :total) 50)}]+ (let [legacy-full-query {:type "query"+ :database (mt/id)+ :query {:source-table (mt/id :orders)+ :filter [">" ["field" (mt/id :orders :total) nil] 100]}}]+ (is (=? {:name "Updated Segment"+ :definition {:lib/type "mbql/query"+ :database (mt/id)+ :stages [{:lib/type "mbql.stage/mbql"+ :source-table (mt/id :orders)+ :filters some?}]}}+ (mt/user-http-request :crowberto :put 200 (format "segment/%d" id)+ {:name "Updated Segment"+ :revision_message "Updated with full legacy query"+ :definition legacy-full-query}))+ "The definition should be converted to MBQL5"))))))+(deftest archive-test(testing "PUT /api/segment/:id"(testing "Can we archive a Segment with the PUT endpoint?"diff --git a/test/metabase/segments/models/segment_test.clj b/test/metabase/segments/models/segment_test.cljindex cfcd3c8d913..560d19050f8 100644--- a/test/metabase/segments/models/segment_test.clj+++ b/test/metabase/segments/models/segment_test.clj@@ -137,3 +137,49 @@(is (nil? (-> (t2/select-one :model/Segment id)(t2/hydrate :definition_description):definition_description))))))++(deftest insert-segment-cycle-detection-test+ (testing "Inserting a segment that references a non-existent segment should fail"+ (is (thrown-with-msg?+ Exception+ #"does not exist"+ (t2/insert! :model/Segment {:name "Bad Segment"+ :table_id (mt/id :venues)+ :definition {:filter [:segment 99999]}}))))+ (testing "Inserting a segment that references an existing segment should succeed"+ (mt/with-temp [:model/Segment {segment-1-id :id} {:name "Segment 1"+ :table_id (mt/id :venues)+ :definition {:filter [:> [:field (mt/id :venues :price) nil] 2]}}]+ (mt/with-temp [:model/Segment segment-2 {:name "Segment 2"+ :table_id (mt/id :venues)+ :definition {:filter [:segment segment-1-id]}}]+ (is (some? (:id segment-2)))))))++(deftest update-segment-cycle-detection-test+ (testing "Updating a segment to reference a non-existent segment should fail"+ (mt/with-temp [:model/Segment {segment-id :id} {:name "Segment"+ :table_id (mt/id :venues)+ :definition {:filter [:> [:field (mt/id :venues :price) nil] 2]}}]+ (is (thrown-with-msg?+ Exception+ #"does not exist"+ (t2/update! :model/Segment segment-id {:definition {:filter [:segment 99999]}})))))+ (testing "Updating a segment to reference itself should fail"+ (mt/with-temp [:model/Segment {segment-id :id} {:name "Segment"+ :table_id (mt/id :venues)+ :definition {:filter [:> [:field (mt/id :venues :price) nil] 2]}}]+ (is (thrown-with-msg?+ Exception+ #"[Cc]ycle"+ (t2/update! :model/Segment segment-id {:definition {:filter [:segment segment-id]}})))))+ (testing "Updating a segment to create an indirect cycle should fail"+ (mt/with-temp [:model/Segment {segment-1-id :id} {:name "Segment 1"+ :table_id (mt/id :venues)+ :definition {:filter [:> [:field (mt/id :venues :price) nil] 2]}}]+ (mt/with-temp [:model/Segment {segment-2-id :id} {:name "Segment 2"+ :table_id (mt/id :venues)+ :definition {:filter [:segment segment-1-id]}}]+ (is (thrown-with-msg?+ Exception+ #"[Cc]ycle"+ (t2/update! :model/Segment segment-1-id {:definition {:filter [:segment segment-2-id]}})))))))diff --git a/test/metabase/test/generate.clj b/test/metabase/test/generate.cljindex bba44a121a9..c0f9ab1aea7 100644--- a/test/metabase/test/generate.clj+++ b/test/metabase/test/generate.clj@@ -156,6 +156,7 @@(s/def ::field (s/keys :req-un [::id ::name ::base_type ::database_type ::position ::description]))+(s/def ::measure (s/keys :req-un [::id ::name ::definition ::description]))(s/def ::metric (s/keys :req-un [::id ::name ::definition ::description]))(s/def ::segment (s/keys :req-un [::id ::name ::definition ::description]))(s/def ::table (s/keys :req-un [::id ::active ::name ::description]))@@ -299,7 +300,12 @@:spec ::segment:insert! {:model :model/Segment}:relations {:creator_id [:core-user :id]- :table_id [:table :id]}}})+ :table_id [:table :id]}}+ :measure {:prefix :msr+ :spec ::measure+ :insert! {:model :model/Measure}+ :relations {:creator_id [:core-user :id]+ :table_id [:table :id]}}});; :revision {};; :task-history {}diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.cljindex 6ffb00cb86e..f32f97cb234 100644--- a/test/metabase/test/util.clj+++ b/test/metabase/test/util.clj@@ -209,6 +209,13 @@:ip_address "0:0:0:0:0:0:0:1":timestamp (t/zoned-date-time)})+ :model/Measure+ (fn [_] (default-timestamped+ {:creator_id (rasta-id)+ :definition {}+ :name "Mock Measure"+ :table_id (data/id :checkins)}))+:model/NativeQuerySnippet(fn [_] (default-timestamped{:creator_id (user-id :crowberto)diff --git a/test/metabase/warehouse_schema_rest/api/table_test.clj b/test/metabase/warehouse_schema_rest/api/table_test.cljindex 9c0e43d5f91..f6f1fb4b7e3 100644--- a/test/metabase/warehouse_schema_rest/api/table_test.clj+++ b/test/metabase/warehouse_schema_rest/api/table_test.clj@@ -68,6 +68,7 @@:entity_type "entity/GenericTable":field_order "database":view_count 0+ :measures []:metrics []:segments []:is_writable (or (= driver :h2) nil)})))@@ -159,7 +160,7 @@(deftest ^:parallel get-table-test(testing "GET /api/table/:id"(is (= (merge- (dissoc (table-defaults :h2) :segments :field_values :metrics)+ (dissoc (table-defaults :h2) :segments :field_values :metrics :measures)(t2/hydrate (t2/select-one [:model/Table :id :created_at :updated_at :initial_sync_status:view_count]:id (mt/id :venues))@@ -180,7 +181,7 @@:entity_type "entity/GenericTable":schema nil}](is (= (merge- (dissoc (table-defaults) :segments :field_values :metrics :db)+ (dissoc (table-defaults) :segments :field_values :metrics :measures :db)(t2/hydrate (t2/select-one [:model/Table :id :created_at :updated_at :initial_sync_status:view_count]:id table-id)@@ -420,7 +421,7 @@:owner_user_id (mt/user->id :crowberto)})(is (= (merge(-> (table-defaults)- (dissoc :segments :field_values :metrics :updated_at)+ (dissoc :segments :field_values :metrics :measures :updated_at)(update :db merge (select-keys (mt/db) [:details])))(t2/hydrate (t2/select-one [:model/Table :id :schema :name :created_at :initial_sync_status] :id (u/the-id table)):pk_field :collection)@@ -609,7 +610,7 @@;; Index sync is turned off across the application as it is not used ATM.#_#_:database_indexed true:table (merge- (dissoc (table-defaults) :segments :field_values :metrics)+ (dissoc (table-defaults) :segments :field_values :metrics :measures)(t2/select-one [:model/Table:id :created_at :updated_at:initial_sync_status :view_count]@@ -630,7 +631,7 @@;; Index sync is turned off across the application as it is not used ATM.#_#_:database_indexed true:table (merge- (dissoc (table-defaults :h2) :db :segments :field_values :metrics)+ (dissoc (table-defaults :h2) :db :segments :field_values :metrics :measures)(t2/select-one [:model/Table:id :created_at :updated_at:initial_sync_status :view_count]diff --git a/test/metabase/xrays/automagic_dashboards/core_test.clj b/test/metabase/xrays/automagic_dashboards/core_test.cljindex 4c6735dd827..c129b9a16c9 100644--- a/test/metabase/xrays/automagic_dashboards/core_test.clj+++ b/test/metabase/xrays/automagic_dashboards/core_test.clj@@ -771,6 +771,54 @@(is (false? (str/ends-with? question-dashboard-name "model")))(is (true? (str/ends-with? question-dashboard-name (format "\"%s\"" (:name question-card))))))))))))+(deftest question-with-measure-xray-title-test+ (testing "X-Ray dashboard should properly handle questions with measures"+ (let [mp (lib-be/application-database-metadata-provider (mt/id))+ venues-table (lib.metadata/table mp (mt/id :venues))+ price-field (lib.metadata/field mp (mt/id :venues :price))+ measure-definition (-> (lib/query mp venues-table)+ (lib/aggregate (lib/sum price-field)))]+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Total Price"+ :table_id (mt/id :venues)+ :definition measure-definition}]+ (let [mp' (lib-be/application-database-metadata-provider (mt/id))+ measure-meta (lib.metadata/measure mp' measure-id)+ query-with-measure (-> (lib/query mp' venues-table)+ (lib/aggregate measure-meta))]+ (mt/with-temp [:model/Card question-card {:table_id (mt/id :venues)+ :dataset_query query-with-measure+ :type :question}]+ (let [{:keys [name dashcards]} (mt/with-test-user :rasta (magic/automagic-analysis question-card nil))+ all-text (str name " " (pr-str dashcards))]+ (testing "Dashboard should not contain 'null' from failed measure name resolution"+ (is (not (str/includes? name "null"))))+ (testing "Dashboard content should include the measure name"+ (is (str/includes? all-text "Total Price"))))))))))++(deftest model-with-measure-xray-title-test+ (testing "X-Ray dashboard should properly handle models with measures"+ (let [mp (lib-be/application-database-metadata-provider (mt/id))+ venues-table (lib.metadata/table mp (mt/id :venues))+ price-field (lib.metadata/field mp (mt/id :venues :price))+ measure-definition (-> (lib/query mp venues-table)+ (lib/aggregate (lib/sum price-field)))]+ (mt/with-temp [:model/Measure {measure-id :id} {:name "Total Price"+ :table_id (mt/id :venues)+ :definition measure-definition}]+ (let [mp' (lib-be/application-database-metadata-provider (mt/id))+ measure-meta (lib.metadata/measure mp' measure-id)+ query-with-measure (-> (lib/query mp' venues-table)+ (lib/aggregate measure-meta))]+ (mt/with-temp [:model/Card model-card {:table_id (mt/id :venues)+ :dataset_query query-with-measure+ :type :model}]+ (let [{:keys [name dashcards]} (mt/with-test-user :rasta (magic/automagic-analysis model-card nil))+ all-text (str name " " (pr-str dashcards))]+ (testing "Dashboard should not contain 'null' from failed measure name resolution"+ (is (not (str/includes? name "null"))))+ (testing "Dashboard content should include the measure name"+ (is (str/includes? all-text "Total Price"))))))))))+(deftest ^:parallel model-based-automagic-dashboards-have-correct-parameter-mappings-test(testing "Dashcard parameter mappings have valid targets when X-raying models (#58214)"(mt/dataset test-datadiff --git a/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/measures/0SHLtATxX8wbutAOlZAtM_my_measure.yaml b/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/measures/0SHLtATxX8wbutAOlZAtM_my_measure.yamlnew file mode 100644index 00000000000..fe6a3c28ab3--- /dev/null+++ b/test_resources/serialization_baseline/databases/My Database/tables/Schemaless Table/measures/0SHLtATxX8wbutAOlZAtM_my_measure.yaml@@ -0,0 +1,30 @@+archived: false+created_at: '2025-12-16T20:33:13.171335Z'+creator_id: [email protected]+definition:+ database: My Database+ query:+ aggregation:+ - - sum+ - - field+ - - My Database+ - null+ - Schemaless Table+ - Some Field+ - base-type: type/Text+ source-table:+ - My Database+ - null+ - Schemaless Table+ type: query+description: null+entity_id: 0SHLtATxX8wbutAOlZAtM+name: My Measure+table_id:+- My Database+- null+- Schemaless Table+serdes/meta:+- id: 0SHLtATxX8wbutAOlZAtM+ label: my_measure+ model: Measure