Port metric v1 e2e tests

e2e/test/scenarios/question/notebook.cy.spec.js

@@ -845,6 +845,79 @@ describe("scenarios > question > notebook", { tags: "@slow" }, () => {
  .contains("[Revenue]");
  });
  });
+
+ it("should be possible to sort by metric (metabase#8283)", () => {
+ cy.createQuestion(
+ {
+ name: "Revenue",
+ description: "Sum of orders subtotal",
+ type: "metric",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["sum", ["field", ORDERS.SUBTOTAL, null]]],
+ },
+ },
+ {
+ wrapId: true,
+ idAlias: "metricId",
+ },
+ );
+
+ cy.get("@metricId").then(metricId => {
+ const questionDetails = {
+ query: {
+ "source-table": `card__${metricId}`,
+ aggregation: ["metric", metricId],
+ },
+ };
+
+ cy.createQuestion(questionDetails, { visitQuestion: true });
+
+ openNotebook();
+
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Pick a column to group by").click();
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Created At").click();
+
+ // eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
+ cy.findByText("Sort").click();
+
+ // Sorts ascending by default
+ // Revenue appears twice, but it's the only integer column to order by
+ popover().icon("int").click();
+
+ // Let's make sure it's possible to sort descending as well
+ cy.icon("arrow_up").click();
+
+ cy.icon("arrow_down").parent().contains("Revenue");
+
+ visualize();
+ // Visualization will render line chart by default. Switch to the table.
+ cy.icon("table2").click();
+
+ cy.findAllByRole("grid").as("table");
+ cy.get("@table")
+ .first()
+ .as("tableHeader")
+ .within(() => {
+ cy.get("[data-testid=cell-data]")
+ .eq(1)
+ .invoke("text")
+ .should("eq", "Revenue");
+ });
+
+ cy.get("@table")
+ .last()
+ .as("tableBody")
+ .within(() => {
+ cy.get("[data-testid=cell-data]")
+ .eq(1)
+ .invoke("text")
+ .should("eq", "50,072.98");
+ });
+ });
+ });
 });
 
 function assertTableRowCount(expectedCount) {

e2e/test/scenarios/visualizations-tabular/reproductions/6010-metric-filter-drill.cy.spec.js

@@ -5,7 +5,6 @@ import {
  visitQuestion,
  cartesianChartCircle,
 } from "e2e/support/helpers";
-import { createMetric as apiCreateMetric } from "e2e/support/helpers/e2e-table-metadata-helpers";
 
 const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
 
@@ -16,30 +15,29 @@ describe("issue 6010", () => {
  cy.intercept("POST", "/api/dataset").as("dataset");
  });
 
- // FIXME metrics v2
- it.skip("should apply the filter from a metric when drilling through (metabase#6010)", () => {
+ it("should apply the filter from a metric when drilling through (metabase#6010)", () => {
  createMetric()
  .then(({ body: { id } }) => createQuestion(id))
  .then(({ body: { id } }) => visitQuestion(id));
 
  cartesianChartCircle().eq(0).click();
 
- popover().findByText("See these Orders").click();
+ popover().findByText("See these Metrics").click();
  cy.wait("@dataset");
 
  cy.findByTestId("qb-filters-panel").within(() => {
- cy.findByText("Total is greater than 150").should("be.visible");
  cy.findByText("Created At is Jan 1–31, 2024").should("be.visible");
  });
+ // FIXME metrics v2 -- check that the values in column Total are above 150
  });
 });
 
 const createMetric = () => {
- return apiCreateMetric({
+ return cy.createQuestion({
  name: "Metric",
  description: "Metric with a filter",
- table_id: ORDERS_ID,
- definition: {
+ type: "metric",
+ query: {
  "source-table": ORDERS_ID,
  filter: [">", ORDERS.TOTAL, 150],
  aggregation: [["count"]],
@@ -52,7 +50,7 @@ const createQuestion = metric_id => {
  name: "Question",
  display: "line",
  query: {
- "source-table": ORDERS_ID,
+ "source-table": `card__${metric_id}`,
  breakout: [["field", ORDERS.CREATED_AT, { "temporal-unit": "month" }]],
  aggregation: [["metric", metric_id]],
  },

frontend/src/metabase/parameters/utils/mapping-options.unit.spec.js

@@ -75,9 +75,7 @@ describe("parameters/utils/mapping-options", () => {
  });
  });
 
- // FIXME metrics v2
- // eslint-disable-next-line jest/no-disabled-tests
- it.skip("should return fields from the model question's virtual card table, as though it is already nested", () => {
+ it("should return fields from the model question's virtual card table, as though it is already nested", () => {
  const options = getParameterMappingOptions(
  new Question(dataset.card(), metadata),
  { type: "date/single" },

frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx

@@ -70,9 +70,7 @@ describe("QueryBuilder - unsaved changes warning", () => {
  expect(screen.getByTestId("leave-confirmation")).toBeInTheDocument();
  });
 
- // FIXME metrics v2
- // eslint-disable-next-line jest/no-disabled-tests
- it.skip("does not show custom warning modal when saving new model", async () => {
+ it("does not show custom warning modal when saving new model", async () => {
  await setup({
  card: null,
  initialRoute: "/model/new",

src/metabase/lib/fe_util.cljc

@@ -213,7 +213,10 @@
 
 (mu/defn dependent-metadata :- [:sequential DependentItem]
  "Return the IDs and types of entities the metadata about is required
- for the FE to function properly."
+ for the FE to function properly. `card-id` is provided
+ when editing the card with that ID and in this case `a-query` is its
+ definition (i.e., the dataset-query). `card-type` specifies the type
+ of the card being created or edited."
  [query :- ::lib.schema/query
  card-id :- [:maybe ::lib.schema.id/card]
  card-type :- ::lib.schema.metadata/card.type]