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
Consolidate visualizer e2e tests (#83556)
Nemanja Glumace729c00e1d96
diff --git a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.jsindex ce4bee39094..b1d5aa72202 100644--- a/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js+++ b/e2e/test/scenarios/dashboard/dashboard-reproductions.cy.spec.js@@ -2299,3 +2299,118 @@ describe("issue 58556, issue 66277", () => {.should("be.visible");});});++describe("issue 65908", () => {+ const dateParameters = {+ default: "2030-01-01~",+ id: "d3b78b27",+ name: "Date Filter",+ slug: "date_filter",+ type: "date/all-options",+ };++ function createDashcard({+ index,+ questionId,+ hideEmptyResults,+ withParameterMappings,+ }) {+ const cardHeightInRows = 10;++ return {+ col: 0,+ row: cardHeightInRows * index,+ size_x: 24,+ size_y: cardHeightInRows,+ card_id: questionId,+ visualization_settings: {+ "card.hide_empty": hideEmptyResults,+ },+ parameter_mappings: withParameterMappings+ ? [+ {+ parameter_id: dateParameters.id,+ card_id: questionId,+ target: ["dimension", ["field", ORDERS.CREATED_AT, null]],+ },+ ]+ : undefined,+ };+ }++ beforeEach(() => {+ H.restore();+ cy.signInAsAdmin();++ const dashboardDetails = {+ name: "Dashboard with empty result cards",+ parameters: [dateParameters],+ };++ const questionDetails = {+ name: "Orders question",+ query: {+ "source-table": ORDERS_ID,+ limit: 5,+ },+ };++ H.createDashboardWithQuestions({+ dashboardDetails,+ questions: [questionDetails],+ }).then(({ dashboard, questions }) => {+ const [question] = questions;+ H.updateDashboardCards({+ dashboard_id: dashboard.id,+ cards: [+ createDashcard({+ index: 0,+ questionId: question.id,+ hideEmptyResults: true,+ withParameterMappings: true,+ }),+ createDashcard({+ index: 1,+ questionId: question.id,+ hideEmptyResults: true,+ withParameterMappings: true,+ }),+ createDashcard({+ index: 2,+ questionId: question.id,+ hideEmptyResults: true,+ withParameterMappings: true,+ }),+ createDashcard({+ index: 3,+ questionId: question.id,+ hideEmptyResults: false,+ withParameterMappings: false,+ }),+ ],+ });+ cy.wrap(dashboard.id).as("dashboardId");+ });+ });++ it("should not take into account the height of cards with no results when calculating dashboard height (metabase#65908)", () => {+ cy.get("@dashboardId").then((dashboardId) => {+ H.visitDashboard(dashboardId);++ cy.findByDisplayValue("Dashboard with empty result cards").should(+ "be.visible",+ );++ H.getDashboardCard().within(() => {+ cy.findByText("Orders question").should("be.visible");+ cy.log("Checks for the subtotal value from the first row");+ cy.findByText("37.65").should("be.visible");+ });++ cy.findByRole("main").should(($main) => {+ // 4 cards take about 2000px in height, so only 1 card should definitely take less than 1000px+ expect($main[0].scrollHeight).to.be.lessThan(1000);+ });+ });+ });+});diff --git a/e2e/test/scenarios/dashboard/visualizer/columns-mapping.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/columns-mapping.cy.spec.tsdeleted file mode 100644index 3c5a35cbb8b..00000000000--- a/e2e/test/scenarios/dashboard/visualizer/columns-mapping.cy.spec.ts+++ /dev/null@@ -1,115 +0,0 @@-const { H } = cy;--import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";-import {- ACCOUNTS_COUNT_BY_COUNTRY,- COUNTRY_CODES,- ORDERS_COUNT_BY_PRODUCT_CATEGORY,-} from "e2e/support/test-visualizer-data";--describe("scenarios > dashboard > visualizer > columns-mapping", () => {- beforeEach(() => {- H.restore();-- cy.intercept("POST", "/api/dataset").as("dataset");- cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );-- cy.signInAsNormalUser();-- H.createQuestion(ACCOUNTS_COUNT_BY_COUNTRY, {- idAlias: "accountsCountByCountryQuestionId",- wrapId: true,- });-- H.createQuestion(ORDERS_COUNT_BY_PRODUCT_CATEGORY, {- idAlias: "ordersCountByProductCategoryQuestionId",- wrapId: true,- });- });-- it("should remap columns when changing a viz type", () => {- H.visitDashboard(ORDERS_DASHBOARD_ID);- H.editDashboard();-- H.openQuestionsSidebar();- H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_PRODUCT_CATEGORY.name);-- H.modal().within(() => {- // Turn into a pie chart- cy.findByTestId("viz-picker-main").icon("pie").click();- H.assertDataSourceColumnSelected(- ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,- "Count",- );- H.assertDataSourceColumnSelected(- ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,- "Product → Category",- );- H.pieMetricWell().findByText("Count").should("exist");- H.pieDimensionWell().findByText("Product → Category").should("exist");- H.echartsContainer().findByText("18,760").should("exist"); // total value-- // Turn into a funnel- cy.findByTestId("viz-picker-main").icon("funnel").click();- H.assertDataSourceColumnSelected(- ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,- "Count",- );- H.assertDataSourceColumnSelected(- ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,- "Product → Category",- );- H.verticalWell().findByText("Count").should("exist");- H.horizontalWell().within(() => {- cy.findByText("Product → Category").should("exist");- cy.findByText("Doohickey").should("exist");- cy.findByText("Gadget").should("exist");- cy.findByText("Gizmo").should("exist");- cy.findByText("Widget").should("exist");- cy.findAllByTestId("well-item").should("have.length", 5);- });- });- });-- it("should preserve column mapping when switching between cartesian and pie", () => {- H.createDashboard().then(({ body: { id: dashboardId } }) => {- H.visitDashboard(dashboardId);- });-- H.editDashboard();-- H.openQuestionsSidebar();- H.clickVisualizeAnotherWay(ACCOUNTS_COUNT_BY_COUNTRY.name);-- H.modal().within(() => {- H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });-- cy.log("cartesian (starting point) -> funnel -> scatter");- H.selectVisualization("funnel");- H.assertWellItems({- horizontal: ["Country", ...COUNTRY_CODES],- vertical: ["Count"],- });- H.selectVisualization("scatter");- H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });-- cy.log("Resetting the visualization to cartesian");- H.clickUndoButton();- H.clickUndoButton();-- cy.log("cartesian (starting point) -> pie -> funnel -> scatter");- H.selectVisualization("pie");- H.assertWellItems({ pieDimensions: ["Country"], pieMetric: ["Count"] });- H.selectVisualization("funnel");- H.assertWellItems({- horizontal: ["Country", ...COUNTRY_CODES],- vertical: ["Count"],- });- H.selectVisualization("scatter");- H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });- });- });-});diff --git a/e2e/test/scenarios/dashboard/visualizer/funnel-title-navigation.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/funnel-title-navigation.cy.spec.tsdeleted file mode 100644index 53bbbfd88ca..00000000000--- a/e2e/test/scenarios/dashboard/visualizer/funnel-title-navigation.cy.spec.ts+++ /dev/null@@ -1,100 +0,0 @@-export {};--const { H } = cy;--describe("scenarios > dashboard > visualizer > funnel title navigation", () => {- beforeEach(() => {- H.restore();-- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );-- cy.signInAsNormalUser();- });-- it("should open the underlying question when clicking the title of a single-question visualizer funnel (UXW-2692)", () => {- const visualizerTitle = "UXW-2692 Visualizer Funnel";-- H.createNativeQuestion({- name: "UXW-2692 Funnel Base",- display: "funnel",- native: {- query: `- SELECT 73 AS "Val", 'Downloads' AS "Step"- UNION ALL- SELECT 52 AS "Val", 'Followers' AS "Step"- `,- },- visualization_settings: {- "funnel.metric": "Val",- "funnel.dimension": "Step",- },- }).then(({ body: { id: questionId } }) => {- H.createDashboard({ name: "UXW-2692 Dashboard" }).then(- ({ body: { id: dashboardId } }) => {- cy.request("PUT", `/api/dashboard/${dashboardId}`, {- dashcards: [- {- id: -1,- card_id: questionId,- dashboard_tab_id: null,- row: 0,- col: 0,- size_x: 12,- size_y: 8,- visualization_settings: {- visualization: {- display: "funnel",- columnValuesMapping: {- COLUMN_1: [- {- name: "COLUMN_1",- originalName: "Step",- sourceId: `card:${questionId}`,- },- ],- COLUMN_2: [- {- name: "COLUMN_2",- originalName: "Val",- sourceId: `card:${questionId}`,- },- ],- },- settings: {- "card.title": visualizerTitle,- "funnel.metric": "COLUMN_2",- "funnel.dimension": "COLUMN_1",- "funnel.rows": [- {- key: "Followers",- name: "Followers",- enabled: true,- },- {- key: "Downloads",- name: "Downloads",- enabled: true,- },- ],- },- },- },- },- ],- });-- H.visitDashboard(dashboardId);-- cy.wait("@dashcardQuery");- H.getDashboardCard(0).findByTestId("funnel-chart").should("exist");-- H.clickOnCardTitle(0);-- cy.location("pathname").should("contain", `/question/${questionId}`);- },- );- });- });-});diff --git a/e2e/test/scenarios/dashboard/visualizer/pie.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/pie.cy.spec.tsdeleted file mode 100644index 47a7e75374f..00000000000--- a/e2e/test/scenarios/dashboard/visualizer/pie.cy.spec.ts+++ /dev/null@@ -1,91 +0,0 @@-const { H } = cy;--import {- ORDERS_COUNT_BY_CREATED_AT,- ORDERS_COUNT_BY_PRODUCT_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY_PIE,- PRODUCTS_COUNT_BY_CREATED_AT,- SCALAR_CARD,- STEP_COLUMN_CARD,- VIEWS_COLUMN_CARD,- createDashboardWithVisualizerDashcards,-} from "e2e/support/test-visualizer-data";--describe("scenarios > dashboard > visualizer > pie", () => {- beforeEach(() => {- H.restore();-- cy.intercept("POST", "/api/dataset").as("dataset");- cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );-- cy.signInAsNormalUser();-- H.createQuestion(ORDERS_COUNT_BY_CREATED_AT, {- idAlias: "ordersCountByCreatedAtQuestionId",- wrapId: true,- });- H.createQuestion(ORDERS_COUNT_BY_PRODUCT_CATEGORY, {- idAlias: "ordersCountByProductCategoryQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT, {- idAlias: "productsCountByCreatedAtQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY, {- idAlias: "productsCountByCategoryQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY_PIE, {- idAlias: "productsCountByCategoryPieQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.LANDING_PAGE_VIEWS, {- idAlias: "landingPageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.CHECKOUT_PAGE_VIEWS, {- idAlias: "checkoutPageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.PAYMENT_DONE_PAGE_VIEWS, {- idAlias: "paymentDonePageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(STEP_COLUMN_CARD, {- idAlias: "stepColumnQuestionId",- wrapId: true,- });- H.createNativeQuestion(VIEWS_COLUMN_CARD, {- idAlias: "viewsColumnQuestionId",- wrapId: true,- });- });-- it("should allow to change viz settings", () => {- createDashboardWithVisualizerDashcards();- H.editDashboard();-- // Pie chart- H.showDashcardVisualizerModalSettings(2);- H.modal().within(() => {- cy.findByText("Display").click();-- H.echartsContainer().within(() => {- cy.findByText("200").should("exist");- cy.findByText("Total").should("exist");- });- cy.findByTestId("chartsettings-sidebar").findByText("Show total").click();- H.echartsContainer().within(() => {- cy.findByText("200").should("not.exist");- cy.findByText("Total").should("not.exist");- });-- cy.button("Save").click();- });- });-});diff --git a/e2e/test/scenarios/dashboard/visualizer/snowplow-tracking.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/snowplow-tracking.cy.spec.tsdeleted file mode 100644index 02fc9247565..00000000000--- a/e2e/test/scenarios/dashboard/visualizer/snowplow-tracking.cy.spec.ts+++ /dev/null@@ -1,186 +0,0 @@-import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";-import {- ACCOUNTS_COUNT_BY_CREATED_AT,- ORDERS_COUNT_BY_CREATED_AT,- ORDERS_COUNT_BY_PRODUCT_CATEGORY,- PRODUCTS_COUNT_BY_CREATED_AT,-} from "e2e/support/test-visualizer-data";--const { H } = cy;--describe("Snowplow tracking", () => {- describe("add database card", () => {- beforeEach(() => {- H.resetSnowplow();- H.restore();- cy.signInAsAdmin();- H.enableTracking();-- cy.intercept("POST", "/api/dataset").as("dataset");- cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );- cy.intercept("GET", "/api/setting/version-info", {});-- cy.signInAsNormalUser();-- H.createQuestion(ORDERS_COUNT_BY_CREATED_AT, {- idAlias: "ordersCountByCreatedAtQuestionId",- wrapId: true,- });- H.createQuestion(ORDERS_COUNT_BY_PRODUCT_CATEGORY, {- idAlias: "ordersCountByProductCategoryQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT, {- idAlias: "productsCountByCreatedAtQuestionId",- wrapId: true,- });-- H.createQuestion(ACCOUNTS_COUNT_BY_CREATED_AT, {- idAlias: "accountsCountByCreatedAtQuestionId",- wrapId: true,- });- });-- it("should track visualizer related events", () => {- H.visitDashboard(ORDERS_DASHBOARD_ID);-- H.editDashboard();- H.openQuestionsSidebar();- cy.log("open questions sidebar");- H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_CREATED_AT.name);- // visualize another way from question list- H.expectUnstructuredSnowplowEvent({- event: "visualize_another_way_clicked",- triggered_from: "question-list",- });-- H.modal().within(() => {- // switch to datasets list- cy.log("switch to datasets list");- H.switchToAddMoreData();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_add_more_data_clicked",- triggered_from: "visualizer-modal",- });-- // add a dataset- cy.log("add a dataset");- H.selectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_datasource_added",- triggered_from: "visualizer-modal",- });-- cy.log("deselect a dataset");- H.deselectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_datasource_removed",- triggered_from: "visualizer-modal",- });-- // switch to columns list- cy.log("switch to columns list");- H.switchToColumnsList();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_show_columns_clicked",- triggered_from: "visualizer-modal",- });-- // deselect a column- cy.log("deselect a column");- H.deselectColumnFromColumnsList(- ORDERS_COUNT_BY_CREATED_AT.name,- "Count",- );- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_column_removed",- triggered_from: "visualizer-modal",- });-- // select a column- cy.log("select a column");- H.selectColumnFromColumnsList(ORDERS_COUNT_BY_CREATED_AT.name, "Count");- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_column_added",- triggered_from: "visualizer-modal",- });-- // show settings sidebar- cy.log("show settings sidebar");- H.toggleVisualizerSettingsSidebar();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_settings_clicked",- triggered_from: "visualizer-modal",- });-- // change the visualization type- cy.log("change the visualization type");- H.selectVisualization("line");- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_viz_type_changed",- triggered_from: "visualizer-modal",- });- });-- // save the card- cy.log("save the card");- H.saveDashcardVisualizerModal({ mode: "create" });- H.expectUnstructuredSnowplowEvent({- event: "visualizer_save_clicked",- triggered_from: "visualizer-modal",- });-- H.showDashcardVisualizerModal(1);- // show the table preview- cy.log("show the table preview");- cy.findByTestId("visualizer-view-as-table-button").click();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_view_as_table_clicked",- triggered_from: "visualizer-modal",- });-- cy.findByTestId("visualizer-tabular-preview-modal").within(() => {- cy.findByLabelText("Close").click();- });-- cy.log("resets a dataset");- H.selectVisualization("bar");- H.resetDataSourceButton(ORDERS_COUNT_BY_CREATED_AT.name).click();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_data_changed",- event_detail: "visualizer_datasource_reset",- triggered_from: "visualizer-modal",- });-- // remove a dataset- cy.log("remove a dataset");- H.removeDataSource(ORDERS_COUNT_BY_CREATED_AT.name, {- throughMenu: true,- });- H.expectUnstructuredSnowplowEvent(- {- event: "visualizer_data_changed",- event_detail: "visualizer_datasource_removed",- triggered_from: "visualizer-modal",- },- 2, // we already removed two datasets before- );-- // close the modal- cy.log("close the modal");- H.closeDashcardVisualizerModal();- H.expectUnstructuredSnowplowEvent({- event: "visualizer_close_clicked",- triggered_from: "visualizer-modal",- });- });- });-});diff --git a/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts b/e2e/test/scenarios/visualizer/basics.cy.spec.tssimilarity index 85%rename from e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.tsrename to e2e/test/scenarios/visualizer/basics.cy.spec.tsindex 88873fc7782..4f0d868de44 100644--- a/e2e/test/scenarios/dashboard/visualizer/basics.cy.spec.ts+++ b/e2e/test/scenarios/visualizer/basics.cy.spec.ts@@ -5,9 +5,7 @@ import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";import {ORDERS_COUNT_BY_CREATED_AT,ORDERS_COUNT_BY_PRODUCT_CATEGORY,- PRODUCTS_AVERAGE_BY_CREATED_AT,PRODUCTS_COUNT_BY_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY_PIE,PRODUCTS_COUNT_BY_CREATED_AT,SCALAR_CARD,STEP_COLUMN_CARD,@@ -20,20 +18,11 @@ import {// this should be fixed in the futureconst DASHCARD_QUERY_WAIT_TIME = 1000;-// There's a race condition when saving a dashboard-// and then immediately editing it again. After saving,-// we exit the edit mode and that can happen after-// `H.editDashboard` is called for some reason--describe("scenarios > dashboard > visualizer > basics", () => {+describe("scenarios > visualizer > basics", () => {beforeEach(() => {H.restore();- cy.intercept("POST", "/api/dataset").as("dataset");cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );cy.intercept("GET", "/api/setting/version-info", {});cy.signInAsNormalUser();@@ -46,10 +35,6 @@ describe("scenarios > dashboard > visualizer > basics", () => {idAlias: "ordersCountByProductCategoryQuestionId",wrapId: true,});- H.createQuestion(PRODUCTS_AVERAGE_BY_CREATED_AT, {- idAlias: "productsAverageByCreatedAtQuestionId",- wrapId: true,- });H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT, {idAlias: "productsCountByCreatedAtQuestionId",wrapId: true,@@ -58,10 +43,6 @@ describe("scenarios > dashboard > visualizer > basics", () => {idAlias: "productsCountByCategoryQuestionId",wrapId: true,});- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY_PIE, {- idAlias: "productsCountByCategoryPieQuestionId",- wrapId: true,- });H.createNativeQuestion(SCALAR_CARD.LANDING_PAGE_VIEWS, {idAlias: "landingPageViewsScalarQuestionId",wrapId: true,@@ -218,6 +199,10 @@ describe("scenarios > dashboard > visualizer > basics", () => {});});+ dashCard()+ .realHover({ scrollBehavior: "bottom" })+ .findByLabelText("Edit visualization")+ .should("exist");dashCard().realHover({ scrollBehavior: "bottom" }).findByLabelText("Visualize another way")@@ -270,49 +255,18 @@ describe("scenarios > dashboard > visualizer > basics", () => {cy.findByLabelText("Back to Test Dashboard").click();});- it("should open underlying questions in the ellipsis menu if the card has no title", () => {+ it("should rename, describe and untitle dashboard cards (metabase#61457)", () => {createDashboardWithVisualizerDashcards();-- // This card HAS a title, so it should NOT have the "View question(s)" option- H.getDashboardCard(0).realHover();- H.getDashboardCardMenu(0).click();- H.popover().findByText("View question(s)").should("not.exist");-- // This card has NO title, so it SHOULD have the "View question(s)" optionH.editDashboard();- H.showDashcardVisualizerModal(2);- H.modal().within(() => {- cy.findByTestId("visualizer-title").clear().blur();- });- H.saveDashcardVisualizerModal();- cy.wait(DASHCARD_QUERY_WAIT_TIME);- H.saveDashboard();- H.getDashboardCard(2).realHover();- H.getDashboardCardMenu(2).click();- H.popover().within(() => {- cy.findByText("View question(s)").should("exist");- cy.findByText("View question(s)").realHover();- });-- cy.findByTestId("dashcard-menu-open-underlying-question").within(() => {- cy.findByText(PRODUCTS_COUNT_BY_CATEGORY.name).click();- });-- cy.get("@productsCountByCategoryQuestionId").then((id) =>- cy.url().should("contain", `${id}-products-by-category`),- );- });-- it("should rename a dashboard card", () => {- createDashboardWithVisualizerDashcards();- H.editDashboard();-- // Rename the first card and check+ // Rename the first card and give it a description// My chart -> "Renamed chart"H.showDashcardVisualizerModal(0);H.modal().within(() => {cy.findByDisplayValue("My chart").clear().type("Renamed chart").blur();+ cy.findByText("Settings").click();+ cy.findByTestId("card.description").should("have.value", "");+ cy.findByTestId("card.description").type("My description").blur();});H.saveDashcardVisualizerModal();H.getDashboardCard(0).findByText("Created At: Month").should("exist"); // wait for query rerun@@ -343,80 +297,64 @@ describe("scenarios > dashboard > visualizer > basics", () => {H.getDashboardCard(1).findByText("Product → Category").should("exist"); // wait for query rerunH.assertDashboardCardTitle(1, "");+ // Clear the single-series pie title+ // My pie chart -> ""+ H.showDashcardVisualizerModal(2);+ H.modal().within(() => {+ cy.findByTestId("visualizer-title").clear().blur();+ });+ H.saveDashcardVisualizerModal();+ H.getDashboardCard(2).within(() => {+ H.pieSlices().should("have.length", 4); // wait for query rerun+ });+ H.assertDashboardCardTitle(2, "");+// Save the dashboardH.saveDashboard();// Check that the card titles are still goodH.assertDashboardCardTitle(0, "Renamed chart");H.assertDashboardCardTitle(1, "");+ H.assertDashboardCardTitle(2, "");H.assertDashboardCardTitle(3, "Another chart");- // Making sure the title is empty (not "My new visualization")- H.editDashboard();- H.showDashcardVisualizerModal(1);- H.modal().within(() => {- cy.findByTestId("visualizer-title").should("have.text", "");- });- });-- it("should allow adding description to a visualizer dashcard (metabase#61457)", () => {- createDashboardWithVisualizerDashcards();- H.editDashboard();-- H.showDashcardVisualizerModal(0);- H.modal().within(() => {- cy.findByText("Settings").click();- cy.findByTestId("card.description").should("have.value", "");- cy.findByTestId("card.description").type("My description").blur();- });-- H.saveDashcardVisualizerModal();- H.saveDashboard();-H.getDashboardCard(0).realHover().within(() => {cy.icon("info").realHover();});H.tooltip().findByText("My description").should("exist");- });- it("should allow drilling into the underlying question by clicking on the title (metabase#64340)", () => {- H.createQuestion(ORDERS_COUNT_BY_CREATED_AT, {- wrapId: true,- idAlias: "questionId",+ // A titled card doesn't offer "View question(s)" in its menu+ H.getDashboardCard(0).realHover();+ H.getDashboardCardMenu(0).click();+ H.popover().within(() => {+ cy.findByText("Download results").should("exist");+ cy.findByText("View question(s)").should("not.exist");});+ cy.realPress("Escape");- H.createDashboard().then(({ body: { id: dashboardId } }) => {- cy.get("@questionId").then((questionId) => {- H.addQuestionToDashboard({- dashboardId,- // Unjustified type cast. FIXME- cardId: questionId as any,- });- H.visitDashboard(dashboardId);- });+ // An untitled card offers its underlying question in the menu+ H.getDashboardCard(2).realHover();+ H.getDashboardCardMenu(2).click();+ H.popover().findByText("View question(s)").realHover();+ cy.findByTestId("dashcard-menu-open-underlying-question").within(() => {+ cy.findByText(PRODUCTS_COUNT_BY_CATEGORY.name).click();});+ cy.get("@productsCountByCategoryQuestionId").then((id) =>+ cy.url().should("contain", `${id}-products-by-category`),+ );+ // Making sure the title is empty (not "My new visualization")+ H.visitDashboard("@dashboardId");H.editDashboard();- H.getDashboardCard(0)- .realHover({ scrollBehavior: "bottom" })- .findByLabelText("Visualize another way")- .click();-+ H.showDashcardVisualizerModal(1);H.modal().within(() => {- H.selectVisualization("bar");- });- H.saveDashcardVisualizerModal();- H.saveDashboard();- H.getDashboardCard(0).within(() => {- cy.findByText("Orders by Created At (Month)").click();+ cy.findByTestId("visualizer-title").should("have.text", "");});-- cy.url().should("match", /\/question\/\d+/);});- it("should propagate original card title and description to visualizer cards (metabase#63863)", () => {+ it("should propagate original card title and description to visualizer cards (metabase#63863, metabase#64340)", () => {const questionWithDescription = {...ORDERS_COUNT_BY_CREATED_AT,name: "Original Question Title",@@ -482,6 +420,13 @@ describe("scenarios > dashboard > visualizer > basics", () => {});H.tooltip().findByText("Original question description").should("exist");+ // The propagated title drills into the underlying question (metabase#64340)+ H.getDashboardCard(0).findByText("Original Question Title").click();+ cy.get("@questionWithDescriptionId").then((id) =>+ cy.url().should("contain", `/question/${id}-`),+ );+ cy.findByLabelText("Back to Test Dashboard").click();+H.editDashboard();H.showDashcardVisualizerModal(0);@@ -516,13 +461,25 @@ describe("scenarios > dashboard > visualizer > basics", () => {H.tooltip().findByText("Updated description").should("exist");});- it("should start in a pristine state and update dirtyness accordingly", () => {+ it("should start in a pristine state and update dirtyness accordingly (metabase#69038)", () => {createDashboardWithVisualizerDashcards();H.editDashboard();H.showDashcardVisualizerModal(0);// no changes, save button should be disabled+ H.modal().within(() => {+ cy.findByText("Save").closest("button").should("be.disabled");+ });++ // viewing the table preview doesn't change the card (metabase#69038)+ cy.findByTestId("visualizer-view-as-table-button").click();+ cy.findByTestId("visualizer-tabular-preview-modal").within(() => {+ cy.findByText("Count").should("exist");+ cy.findByLabelText("Close").click();+ });+ cy.findByTestId("visualizer-tabular-preview-modal").should("not.exist");+H.modal().within(() => {cy.findByText("Save").closest("button").should("be.disabled");// hit escape@@ -553,6 +510,9 @@ describe("scenarios > dashboard > visualizer > basics", () => {cy.get("@redoButton").should("be.disabled");H.switchToAddMoreData();+ cy.findByPlaceholderText("Search for something").type("non-existing");+ cy.findByText("No compatible results").should("exist");+H.selectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);H.switchToColumnsList();@@ -604,10 +564,10 @@ describe("scenarios > dashboard > visualizer > basics", () => {cy.get("@undoButton").click();H.goalLine().should("not.exist");- // // Ensure UI state isn't tracked in history+ // Ensure UI state isn't tracked in historycy.findByTestId("chartsettings-sidebar").should("be.visible");- // // Redo goal line+ // Redo goal linecy.get("@redoButton").click();H.goalLine().should("exist");@@ -626,38 +586,6 @@ describe("scenarios > dashboard > visualizer > basics", () => {});});- it("should replace a dataset without remembering removing the current ones (metabase#57897)", () => {- H.visitDashboard(ORDERS_DASHBOARD_ID);-- H.editDashboard();- H.openQuestionsSidebar();- H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_CREATED_AT.name);-- H.modal().within(() => {- cy.findByLabelText("Undo").as("undoButton");- cy.findByLabelText("Redo").as("redoButton");-- cy.get("@undoButton").should("be.disabled");- cy.get("@redoButton").should("be.disabled");-- H.switchToAddMoreData();- H.selectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);- H.assertWellItems({- vertical: ["Count", "Count (Products by Created At (Month))"],- });-- H.selectDataset(PRODUCTS_AVERAGE_BY_CREATED_AT.name);-- H.assertWellItems({- vertical: [- "Count",- "Count (Products by Created At (Month))",- "Average of Price",- ],- });- });- });-it("should add the proper tabId to a new card", () => {// make an empty dashboardH.createDashboard().then(({ body: { id: dashboardId } }) => {@@ -685,7 +613,7 @@ describe("scenarios > dashboard > visualizer > basics", () => {// edit the dashboardH.editDashboard();- // add a new card to the first tab+ // add a new card to the remaining tabH.openQuestionsSidebar();H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_CREATED_AT.name);cy.wait("@cardQuery");@@ -906,9 +834,10 @@ describe("scenarios > dashboard > visualizer > basics", () => {.should("be.visible");}- it("visualizer cards should work in public dashboards", () => {+ it("visualizer cards should work in public and embedded dashboards", () => {cy.signInAsAdmin();createDashboardWithVisualizerDashcards();+cy.log("Visit public dashboard");cy.get("@dashboardId").then((dashboardId) => {@@ -917,40 +846,24 @@ describe("scenarios > dashboard > visualizer > basics", () => {.then(({ body: { uuid } }: any) => {cy.visit(`/public/dashboard/${uuid}`);});-ensureVisualizerCardsAreRendered();- });-- it("visualizer cards should work in embedded dashboards", () => {- cy.signInAsAdmin();- createDashboardWithVisualizerDashcards({ enable_embedding: true });- cy.log("Visit public dashboard");+ cy.log("Visit embedded dashboard");+ cy.get("@dashboardId").then((dashboardId) => {+ cy.request("PUT", `/api/dashboard/${dashboardId}`, {+ enable_embedding: true,+ });+ });cy.get("@dashboardId").then((dashboard: any) => {H.visitEmbeddedPage({resource: { dashboard: dashboard },params: {},});});-ensureVisualizerCardsAreRendered();});});- it("show a message when there are no search results", () => {- H.visitDashboard(ORDERS_DASHBOARD_ID);- H.editDashboard();- H.openQuestionsSidebar();- H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_CREATED_AT.name);-- H.modal().within(() => {- cy.findByText("Add more data").click();- cy.findByPlaceholderText("Search for something").type("non-existing");-- cy.findByText("No compatible results").should("exist");- });- });-it("should reset a dataset", () => {H.visitDashboard(ORDERS_DASHBOARD_ID);H.editDashboard();@@ -997,17 +910,4 @@ describe("scenarios > dashboard > visualizer > basics", () => {);});});-- it("should allow viewing the table preview (metabase#69038)", () => {- createDashboardWithVisualizerDashcards();- H.editDashboard();-- H.showDashcardVisualizerModal(0);-- cy.findByTestId("visualizer-view-as-table-button").click();-- cy.findByTestId("visualizer-tabular-preview-modal").within(() => {- cy.findByText("Count").should("exist");- });- });});diff --git a/e2e/test/scenarios/dashboard/visualizer/cartesian.cy.spec.ts b/e2e/test/scenarios/visualizer/cartesian.cy.spec.tssimilarity index 81%rename from e2e/test/scenarios/dashboard/visualizer/cartesian.cy.spec.tsrename to e2e/test/scenarios/visualizer/cartesian.cy.spec.tsindex 4bc50dbb11e..4841bf5653e 100644--- a/e2e/test/scenarios/dashboard/visualizer/cartesian.cy.spec.ts+++ b/e2e/test/scenarios/visualizer/cartesian.cy.spec.ts@@ -2,30 +2,26 @@ const { H } = cy;import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";import {+ ACCOUNTS_COUNT_BY_COUNTRY,+ COUNTRY_CODES,ORDERS_COUNT_BY_CREATED_AT,ORDERS_COUNT_BY_CREATED_AT_AND_PRODUCT_CATEGORY,ORDERS_COUNT_BY_PRODUCT_CATEGORY,PIVOT_TABLE_CARD,PRODUCTS_AVERAGE_BY_CREATED_AT,PRODUCTS_COUNT_BY_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY_PIE,PRODUCTS_COUNT_BY_CREATED_AT,- PRODUCTS_COUNT_BY_CREATED_AT_AND_CATEGORY,SCALAR_CARD,STEP_COLUMN_CARD,VIEWS_COLUMN_CARD,createDashboardWithVisualizerDashcards,} from "e2e/support/test-visualizer-data";-describe("scenarios > dashboard > visualizer > cartesian", () => {+describe("scenarios > visualizer > cartesian", () => {beforeEach(() => {H.restore();- cy.intercept("POST", "/api/dataset").as("dataset");cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );cy.signInAsNormalUser();@@ -45,10 +41,6 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {idAlias: "productsCountByCreatedAtQuestionId",wrapId: true,});- H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT_AND_CATEGORY, {- idAlias: "productsCountByCreatedAtAndCategoryQuestionId",- wrapId: true,- });H.createQuestion(PRODUCTS_AVERAGE_BY_CREATED_AT, {idAlias: "productsAvgByCreatedAtQuestionId",wrapId: true,@@ -57,10 +49,9 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {idAlias: "productsCountByCategoryQuestionId",wrapId: true,});- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY_PIE, {- idAlias: "productsCountByCategoryPieQuestionId",- wrapId: true,- });+ });++ it("should allow to change cartesian and pie viz settings (metabase#61197)", () => {H.createNativeQuestion(SCALAR_CARD.LANDING_PAGE_VIEWS, {idAlias: "landingPageViewsScalarQuestionId",wrapId: true,@@ -81,9 +72,7 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {idAlias: "viewsColumnQuestionId",wrapId: true,});- });- it("should allow to change viz settings", () => {createDashboardWithVisualizerDashcards();H.editDashboard();@@ -94,6 +83,9 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {cy.findByTestId("chartsettings-sidebar").findByText("Goal line").click();H.goalLine().should("exist");+ cy.findByTestId("chartsettings-sidebar").findByText("Trend line").click();+ H.trendLine().should("have.length", 2);+// Ensure the chart legend contains original series nameH.chartLegend().within(() => {cy.findByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should("exist");@@ -120,6 +112,7 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {const assertUpdatedVizSettingsApplied = () => {H.goalLine().should("exist");+ H.trendLine().should("have.length", 2);// Ensure the chart legend contains renamed seriesH.chartLegend().within(() => {cy.findByText("Series B").should("exist");@@ -137,6 +130,36 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.getDashboardCard(0).within(() => {assertUpdatedVizSettingsApplied();});++ // Pie chart+ H.getDashboardCard(2).within(() => {+ H.echartsContainer().findByText("Total").should("exist");+ });+ H.showDashcardVisualizerModalSettings(2);+ H.modal().within(() => {+ cy.findByText("Display").click();++ H.echartsContainer().within(() => {+ cy.findByText("200").should("exist");+ cy.findByText("Total").should("exist");+ });+ cy.findByTestId("chartsettings-sidebar").findByText("Show total").click();+ H.echartsContainer().within(() => {+ cy.findByText("200").should("not.exist");+ cy.findByText("Total").should("not.exist");+ });+ });+ H.saveDashcardVisualizerModalSettings();++ // Hovering a pie slice hides the total, so move the pointer away first+ H.getDashboardCard(0).realHover();+ H.getDashboardCard(2).within(() => {+ H.pieSlices().should("have.length", 4);+ H.echartsContainer().within(() => {+ cy.findByText("200").should("not.exist");+ cy.findByText("Total").should("not.exist");+ });+ });});it("should work correctly when built from a non-cartesian chart", () => {@@ -151,12 +174,14 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.switchToAddMoreData();H.selectDataset(ORDERS_COUNT_BY_CREATED_AT.name);H.switchToColumnsList();- // Shouldn't this be automatic though?H.selectColumnFromColumnsList(ORDERS_COUNT_BY_CREATED_AT.name, "Count");- // VIZ-668 pivot-grouping is an internal column sued byt he pivot table and shouldn't be+ // VIZ-668 pivot-grouping is an internal column used by the pivot table and shouldn't be// shown in the columns list- cy.findByText("pivot-grouping").should("not.exist");+ H.dataSourceColumn(PIVOT_TABLE_CARD.name, "Count").should("exist");+ H.dataSource(PIVOT_TABLE_CARD.name)+ .findByText("pivot-grouping")+ .should("not.exist");H.verticalWell().within(() => {cy.findByText("Count").should("exist");@@ -187,10 +212,18 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.modal().within(() => {H.switchToAddMoreData();- H.selectDataset(PRODUCTS_AVERAGE_BY_CREATED_AT.name);- H.assertWellItemsCount({ vertical: 2 });H.selectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);- H.assertWellItemsCount({ vertical: 3 });+ H.assertWellItems({+ vertical: ["Count", "Count (Products by Created At (Month))"],+ });+ H.selectDataset(PRODUCTS_AVERAGE_BY_CREATED_AT.name);+ H.assertWellItems({+ vertical: [+ "Count",+ "Count (Products by Created At (Month))",+ "Average of Price",+ ],+ });});H.saveDashcardVisualizerModal({ mode: "create" });@@ -256,6 +289,90 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {});});+ it("should remap columns when changing a viz type", () => {+ H.visitDashboard(ORDERS_DASHBOARD_ID);+ H.editDashboard();++ H.openQuestionsSidebar();+ H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_PRODUCT_CATEGORY.name);++ H.modal().within(() => {+ // Turn into a pie chart+ cy.findByTestId("viz-picker-main").icon("pie").click();+ H.assertDataSourceColumnSelected(+ ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,+ "Count",+ );+ H.assertDataSourceColumnSelected(+ ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,+ "Product → Category",+ );+ H.pieMetricWell().findByText("Count").should("exist");+ H.pieDimensionWell().findByText("Product → Category").should("exist");+ H.echartsContainer().findByText("18,760").should("exist"); // total value++ // Turn into a funnel+ cy.findByTestId("viz-picker-main").icon("funnel").click();+ H.assertDataSourceColumnSelected(+ ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,+ "Count",+ );+ H.assertDataSourceColumnSelected(+ ORDERS_COUNT_BY_PRODUCT_CATEGORY.name,+ "Product → Category",+ );+ H.verticalWell().findByText("Count").should("exist");+ H.horizontalWell().within(() => {+ cy.findByText("Product → Category").should("exist");+ cy.findByText("Doohickey").should("exist");+ cy.findByText("Gadget").should("exist");+ cy.findByText("Gizmo").should("exist");+ cy.findByText("Widget").should("exist");+ cy.findAllByTestId("well-item").should("have.length", 5);+ });+ });+ });++ it("should preserve column mapping when switching between cartesian and pie", () => {+ H.createQuestion(ACCOUNTS_COUNT_BY_COUNTRY);+ H.createDashboard().then(({ body: { id: dashboardId } }) => {+ H.visitDashboard(dashboardId);+ });++ H.editDashboard();++ H.openQuestionsSidebar();+ H.clickVisualizeAnotherWay(ACCOUNTS_COUNT_BY_COUNTRY.name);++ H.modal().within(() => {+ H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });++ cy.log("cartesian (starting point) -> funnel -> scatter");+ H.selectVisualization("funnel");+ H.assertWellItems({+ horizontal: ["Country", ...COUNTRY_CODES],+ vertical: ["Count"],+ });+ H.selectVisualization("scatter");+ H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });++ cy.log("Resetting the visualization to cartesian");+ H.clickUndoButton();+ H.clickUndoButton();++ cy.log("cartesian (starting point) -> pie -> funnel -> scatter");+ H.selectVisualization("pie");+ H.assertWellItems({ pieDimensions: ["Country"], pieMetric: ["Count"] });+ H.selectVisualization("funnel");+ H.assertWellItems({+ horizontal: ["Country", ...COUNTRY_CODES],+ vertical: ["Count"],+ });+ H.selectVisualization("scatter");+ H.assertWellItems({ horizontal: ["Country"], vertical: ["Count"] });+ });+ });+it("should handle implicit viz settings (VIZ-947)", () => {function assertDataSourceColumnSelected(columnName: string,@@ -334,23 +451,6 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {});});- it("should support trend lines (metabase #61197)", () => {- createDashboardWithVisualizerDashcards();- H.editDashboard();-- H.showDashcardVisualizerModalSettings(0);-- H.modal().within(() => {- cy.findByText("Trend line").click();- H.trendLine().should("have.length", 2);- cy.findByText("Save").click();- });-- H.getDashboardCard(0).within(() => {- H.trendLine().should("have.length", 2);- });- });-describe("timeseries breakout", () => {it("should automatically use new columns whenever possible", () => {const Q1_NAME = ORDERS_COUNT_BY_CREATED_AT.name;@@ -369,6 +469,7 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.verticalWell().within(() => {cy.findByText("Count").should("exist");+ cy.findByText(`Count (${Q2_NAME})`).should("exist");});H.horizontalWell().findByText("Created At: Month").should("exist");@@ -405,7 +506,6 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.chartLegendItems().should("have.length", 2);// Remove all count columns from the well- // TODO maybe put that into a functionH.verticalWell().within(() => {cy.findAllByTestId("well-item").first()@@ -427,7 +527,7 @@ describe("scenarios > dashboard > visualizer > cartesian", () => {H.assertDataSourceColumnSelected(Q2_NAME, "Created At: Month", false);H.chartLegend().should("not.exist");- // // Add all columns back+ // Add all columns backH.dataSourceColumn(Q1_NAME, "Count").click();H.dataSourceColumn(Q1_NAME, "Created At: Month").click();H.dataSourceColumn(Q2_NAME, "Count").click();diff --git a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts b/e2e/test/scenarios/visualizer/drillthrough.cy.spec.tssimilarity index 86%rename from e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.tsrename to e2e/test/scenarios/visualizer/drillthrough.cy.spec.tsindex d3537e7c10c..339c310ea58 100644--- a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts+++ b/e2e/test/scenarios/visualizer/drillthrough.cy.spec.ts@@ -4,7 +4,6 @@ import {ORDERS_COUNT_BY_CREATED_AT,ORDERS_COUNT_BY_PRODUCT_CATEGORY,PRODUCTS_COUNT_BY_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY_PIE,PRODUCTS_COUNT_BY_CREATED_AT,SCALAR_CARD,STEP_COLUMN_CARD,@@ -12,15 +11,12 @@ import {createDashboardWithVisualizerDashcards,} from "e2e/support/test-visualizer-data";-describe("scenarios > dashboard > visualizer > drillthrough", () => {+describe("scenarios > visualizer > drillthrough", () => {beforeEach(() => {H.restore();cy.intercept("POST", "/api/dataset").as("dataset");cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );cy.signInAsNormalUser();@@ -40,10 +36,6 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {idAlias: "productsCountByCategoryQuestionId",wrapId: true,});- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY_PIE, {- idAlias: "productsCountByCategoryPieQuestionId",- wrapId: true,- });H.createNativeQuestion(SCALAR_CARD.LANDING_PAGE_VIEWS, {idAlias: "landingPageViewsScalarQuestionId",wrapId: true,@@ -66,9 +58,42 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {});});- it("should work", () => {+ it("should drill through visualizer dashcards (VIZ-979)", () => {createDashboardWithVisualizerDashcards();+ // Brush filtering is disabled for multi-series timeseries charts+ H.getDashboardCard(0).within(() => {+ cy.findAllByText(ORDERS_COUNT_BY_CREATED_AT.name).should(+ "have.length",+ 2,+ );+ cy.findAllByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should(+ "have.length",+ 2,+ );+ H.applyBrush(200, 300);+ });++ // ...but works for single-series ones+ H.getDashboardCard(3).within(() => {+ cy.findByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should("exist");+ H.applyBrush(200, 300);+ cy.wait("@dataset");+ });+ cy.get("@dataset.all").should("have.length", 1);++ H.queryBuilderFiltersPanel()+ .findByText(/Created At: Month is May 1/)+ .should("exist");+ H.assertQueryBuilderRowCount(10);+ H.queryBuilderMain().within(() => {+ cy.findByText("Count").should("exist"); // y-axis+ cy.findByText("Created At: Month").should("exist"); // x-axis+ cy.findByText("May 2026").should("exist");+ });++ H.queryBuilderHeader().findByLabelText("Back to Test Dashboard").click();+const ORDERS_SERIES_COLOR = "#509EE3";const PRODUCTS_SERIES_COLOR = "#88BF4D";@@ -179,8 +204,9 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {H.queryBuilderHeader().findByLabelText("Back to Test Dashboard").click();- // 4. Funnel (regular)- H.getDashboardCard(4).get("polygon").first().click();+ // 4. Funnel+ H.getDashboardCard(4).find("polygon").first().click();+ H.clickActionsPopover().should("be.visible");H.tooltip().should("not.exist");H.clickActionsPopover().button("=").click();cy.wait("@dataset");@@ -189,52 +215,5 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {H.queryBuilderFiltersPanel().findByText("Views is equal to 600");H.tableInteractiveHeader().findByText("Views").should("exist");H.assertQueryBuilderRowCount(1);-- H.queryBuilderHeader().findByLabelText("Back to Test Dashboard").click();-- // 5. Funnel (scalar)- H.getDashboardCard(5).get("polygon").first().click();- H.tooltip().should("not.exist");- H.clickActionsPopover().button("=").click();- cy.wait("@dataset");-- H.queryBuilderFiltersPanel().children().should("have.length", 1);- H.queryBuilderFiltersPanel().findByText("Views is equal to 600");- H.tableInteractiveHeader().findByText("Views").should("exist");- H.assertQueryBuilderRowCount(1);- });-- it("should allow brush filtering single-series timeseries charts (VIZ-979)", () => {- createDashboardWithVisualizerDashcards();-- // Ensure the brush is disabled for multi-series charts- H.getDashboardCard(0).within(() => {- cy.findAllByText(ORDERS_COUNT_BY_CREATED_AT.name).should(- "have.length",- 2,- );- cy.findAllByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should(- "have.length",- 2,- );- H.applyBrush(200, 300);- cy.get("@dataset.all").should("have.length", 0);- });-- H.getDashboardCard(3).within(() => {- cy.findByText(PRODUCTS_COUNT_BY_CREATED_AT.name).should("exist");- H.applyBrush(200, 300);- cy.wait("@dataset");- });-- H.queryBuilderFiltersPanel()- .findByText(/Created At: Month is May 1/)- .should("exist");- H.assertQueryBuilderRowCount(10);- H.queryBuilderMain().within(() => {- cy.findByText("Count").should("exist"); // y-axis- cy.findByText("Created At: Month").should("exist"); // x-axis- cy.findByText("May 2026").should("exist");- });});});diff --git a/e2e/test/scenarios/dashboard/visualizer/funnels.cy.spec.ts b/e2e/test/scenarios/visualizer/funnels.cy.spec.tssimilarity index 71%rename from e2e/test/scenarios/dashboard/visualizer/funnels.cy.spec.tsrename to e2e/test/scenarios/visualizer/funnels.cy.spec.tsindex a9ae46e9ba6..34236e77941 100644--- a/e2e/test/scenarios/dashboard/visualizer/funnels.cy.spec.ts+++ b/e2e/test/scenarios/visualizer/funnels.cy.spec.ts@@ -2,71 +2,24 @@ const { H } = cy;import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";import {- ORDERS_COUNT_BY_CREATED_AT,- ORDERS_COUNT_BY_PRODUCT_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY,- PRODUCTS_COUNT_BY_CATEGORY_PIE,- PRODUCTS_COUNT_BY_CREATED_AT,SCALAR_CARD,STEP_COLUMN_CARD,VIEWS_COLUMN_CARD,} from "e2e/support/test-visualizer-data";-describe("scenarios > dashboard > visualizer > funnels", () => {+describe("scenarios > visualizer > funnels", () => {beforeEach(() => {H.restore();- cy.intercept("POST", "/api/dataset").as("dataset");cy.intercept("POST", "/api/card/*/query").as("cardQuery");- cy.intercept("POST", "/api/dashboard/*/dashcard/*/card/*/query").as(- "dashcardQuery",- );cy.signInAsNormalUser();-- H.createQuestion(ORDERS_COUNT_BY_CREATED_AT, {- idAlias: "ordersCountByCreatedAtQuestionId",- wrapId: true,- });- H.createQuestion(ORDERS_COUNT_BY_PRODUCT_CATEGORY, {- idAlias: "ordersCountByProductCategoryQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT, {- idAlias: "productsCountByCreatedAtQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY, {- idAlias: "productsCountByCategoryQuestionId",- wrapId: true,- });- H.createQuestion(PRODUCTS_COUNT_BY_CATEGORY_PIE, {- idAlias: "productsCountByCategoryPieQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.LANDING_PAGE_VIEWS, {- idAlias: "landingPageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.CHECKOUT_PAGE_VIEWS, {- idAlias: "checkoutPageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(SCALAR_CARD.PAYMENT_DONE_PAGE_VIEWS, {- idAlias: "paymentDonePageViewsScalarQuestionId",- wrapId: true,- });- H.createNativeQuestion(STEP_COLUMN_CARD, {- idAlias: "stepColumnQuestionId",- wrapId: true,- });- H.createNativeQuestion(VIEWS_COLUMN_CARD, {- idAlias: "viewsColumnQuestionId",- wrapId: true,- });});it("should build a funnel", () => {+ H.createNativeQuestion(STEP_COLUMN_CARD);+ H.createNativeQuestion(VIEWS_COLUMN_CARD);+H.visitDashboard(ORDERS_DASHBOARD_ID);H.editDashboard();@@ -165,10 +118,14 @@ describe("scenarios > dashboard > visualizer > funnels", () => {});});- it("should build a funnel of several scalar cards", () => {+ it("should build a funnel of several scalar cards (VIZ-678)", () => {const { LANDING_PAGE_VIEWS, CHECKOUT_PAGE_VIEWS, PAYMENT_DONE_PAGE_VIEWS } =SCALAR_CARD;+ H.createNativeQuestion(LANDING_PAGE_VIEWS);+ H.createNativeQuestion(CHECKOUT_PAGE_VIEWS);+ H.createNativeQuestion(PAYMENT_DONE_PAGE_VIEWS);+H.visitDashboard(ORDERS_DASHBOARD_ID);H.editDashboard();@@ -179,11 +136,6 @@ describe("scenarios > dashboard > visualizer > funnels", () => {H.switchToAddMoreData();H.selectDataset(CHECKOUT_PAGE_VIEWS.name);H.selectDataset(PAYMENT_DONE_PAGE_VIEWS.name);- H.switchToColumnsList();-- H.assertDataSourceColumnSelected(LANDING_PAGE_VIEWS.name, "views");- H.assertDataSourceColumnSelected(CHECKOUT_PAGE_VIEWS.name, "views");- H.assertDataSourceColumnSelected(PAYMENT_DONE_PAGE_VIEWS.name, "views");H.verticalWell().within(() => {cy.findByText("METRIC").should("not.exist");@@ -196,6 +148,12 @@ describe("scenarios > dashboard > visualizer > funnels", () => {cy.findAllByTestId("well-item").should("have.length", 3);});+ H.switchToColumnsList();++ H.assertDataSourceColumnSelected(LANDING_PAGE_VIEWS.name, "views");+ H.assertDataSourceColumnSelected(CHECKOUT_PAGE_VIEWS.name, "views");+ H.assertDataSourceColumnSelected(PAYMENT_DONE_PAGE_VIEWS.name, "views");+// Remove a column from the data managerH.deselectColumnFromColumnsList(CHECKOUT_PAGE_VIEWS.name, "views");H.assertDataSourceColumnSelected(@@ -248,31 +206,86 @@ describe("scenarios > dashboard > visualizer > funnels", () => {});});- it("should initialize a scalar funnel when opening a scalar card (VIZ-678)", () => {- const { LANDING_PAGE_VIEWS, CHECKOUT_PAGE_VIEWS, PAYMENT_DONE_PAGE_VIEWS } =- SCALAR_CARD;-- H.visitDashboard(ORDERS_DASHBOARD_ID);- H.editDashboard();-- H.openQuestionsSidebar();- H.clickVisualizeAnotherWay(LANDING_PAGE_VIEWS.name);-- H.modal().within(() => {- H.switchToAddMoreData();- H.selectDataset(CHECKOUT_PAGE_VIEWS.name);- H.selectDataset(PAYMENT_DONE_PAGE_VIEWS.name);-- H.verticalWell().within(() => {- cy.findByText("METRIC").should("not.exist");- });- H.horizontalWell().within(() => {- cy.findByText("DIMENSION").should("not.exist");- cy.findByText(LANDING_PAGE_VIEWS.name).should("exist");- cy.findByText(CHECKOUT_PAGE_VIEWS.name).should("exist");- cy.findByText(PAYMENT_DONE_PAGE_VIEWS.name).should("exist");- cy.findAllByTestId("well-item").should("have.length", 3);- });+ it("should open the underlying question when clicking the title of a single-question visualizer funnel (metabase#67980)", () => {+ const visualizerTitle = "UXW-2692 Visualizer Funnel";++ H.createNativeQuestion({+ name: "UXW-2692 Funnel Base",+ display: "funnel",+ native: {+ query: `+ SELECT 73 AS "Val", 'Downloads' AS "Step"+ UNION ALL+ SELECT 52 AS "Val", 'Followers' AS "Step"+ `,+ },+ visualization_settings: {+ "funnel.metric": "Val",+ "funnel.dimension": "Step",+ },+ }).then(({ body: { id: questionId } }) => {+ H.createDashboard({ name: "UXW-2692 Dashboard" }).then(+ ({ body: { id: dashboardId } }) => {+ cy.request("PUT", `/api/dashboard/${dashboardId}`, {+ dashcards: [+ {+ id: -1,+ card_id: questionId,+ dashboard_tab_id: null,+ row: 0,+ col: 0,+ size_x: 12,+ size_y: 8,+ visualization_settings: {+ visualization: {+ display: "funnel",+ columnValuesMapping: {+ COLUMN_1: [+ {+ name: "COLUMN_1",+ originalName: "Step",+ sourceId: `card:${questionId}`,+ },+ ],+ COLUMN_2: [+ {+ name: "COLUMN_2",+ originalName: "Val",+ sourceId: `card:${questionId}`,+ },+ ],+ },+ settings: {+ "card.title": visualizerTitle,+ "funnel.metric": "COLUMN_2",+ "funnel.dimension": "COLUMN_1",+ "funnel.rows": [+ {+ key: "Followers",+ name: "Followers",+ enabled: true,+ },+ {+ key: "Downloads",+ name: "Downloads",+ enabled: true,+ },+ ],+ },+ },+ },+ },+ ],+ });++ H.visitDashboard(dashboardId);+ H.getDashboardCard(0).findByTestId("funnel-chart").should("exist");++ H.clickOnCardTitle(0);++ cy.location("pathname").should("contain", `/question/${questionId}`);+ },+ );});});});diff --git a/e2e/test/scenarios/dashboard/visualizer/reproductions.cy.spec.ts b/e2e/test/scenarios/visualizer/reproductions.cy.spec.tssimilarity index 51%rename from e2e/test/scenarios/dashboard/visualizer/reproductions.cy.spec.tsrename to e2e/test/scenarios/visualizer/reproductions.cy.spec.tsindex 5b25af75a4f..fba86e14a9c 100644--- a/e2e/test/scenarios/dashboard/visualizer/reproductions.cy.spec.ts+++ b/e2e/test/scenarios/visualizer/reproductions.cy.spec.ts@@ -1,9 +1,5 @@import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";-import type {- DashboardDetails,- StructuredQuestionDetails,-} from "e2e/support/helpers";-import type { DashboardCard, Parameter } from "metabase-types/api";+import type { StructuredQuestionDetails } from "e2e/support/helpers";const { H } = cy;const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;@@ -16,7 +12,7 @@ describe("issue 61521", () => {cy.intercept("POST", "/api/card/*/query").as("cardQuery");});- it("should preserve column settings when use visualizer (metabase#61521)", () => {+ it("should preserve percent formatting of an added series (metabase#61521)", () => {const questionADetails = {name: "Question A for 61521",display: "line" as const,@@ -152,18 +148,20 @@ describe("issue 61521", () => {H.modal().within(() => {H.switchToAddMoreData();-- cy.findByText("Question B for 61521")- .closest("[data-testid='swap-dataset-button']")- .should("not.have.attr", "aria-pressed", "true")- .click({ force: true });-- cy.wait("@cardQuery");+ H.selectDataset("Question B for 61521");cy.findByLabelText("Legend").findByText("Question B for 61521").should("exist");+ H.cartesianChartCircleWithColor("#88BF4D").eq(5).realHover();+ });+ // The value must be a percentage; the period comparison is signed+ H.assertEChartsTooltip({+ rows: [{ name: "Question B for 61521", value: /^\d+(\.\d+)?%$/ }],+ });++ H.modal().within(() => {// ensure there is no additional unformatted axiscy.findByText("0.06").should("not.exist");cy.findByText("0.05").should("not.exist");@@ -171,124 +169,3 @@ describe("issue 61521", () => {});});});--describe("issue 65908 (UXW-2293)", () => {- const dateParameters: Parameter = {- default: "2030-01-01~",- id: "d3b78b27",- name: "Date Filter",- slug: "date_filter",- type: "date/all-options",- };-- interface CreateDashcardProps {- index: number;- questionId: number;- hideEmptyResults: boolean;- withParameterMappings: boolean;- }- function createDashcard({- index,- questionId,- hideEmptyResults,- withParameterMappings,- }: CreateDashcardProps): Partial<DashboardCard> {- const cardHeightInRows = 10;-- return {- col: 0,- row: cardHeightInRows * index,- size_x: 24,- size_y: cardHeightInRows,- card_id: questionId,- visualization_settings: {- "card.hide_empty": hideEmptyResults,- },- parameter_mappings: withParameterMappings- ? [- {- parameter_id: dateParameters.id,- card_id: questionId,- target: ["dimension", ["field", ORDERS.CREATED_AT, null]],- },- ]- : undefined,- };- }-- beforeEach(() => {- H.restore();- cy.signInAsAdmin();-- const dashboardDetails = {- name: "Dashboard with empty result cards",- parameters: [dateParameters],- } satisfies DashboardDetails;-- const questionDetails: StructuredQuestionDetails = {- name: "Orders question",- query: {- "source-table": ORDERS_ID,- limit: 5,- },- };-- H.createDashboardWithQuestions({- dashboardDetails,- questions: [questionDetails],- }).then(({ dashboard, questions }) => {- const [question] = questions;- H.updateDashboardCards({- dashboard_id: dashboard.id,- cards: [- createDashcard({- index: 0,- questionId: question.id,- hideEmptyResults: true,- withParameterMappings: true,- }),- createDashcard({- index: 1,- questionId: question.id,- hideEmptyResults: true,- withParameterMappings: true,- }),- createDashcard({- index: 2,- questionId: question.id,- hideEmptyResults: true,- withParameterMappings: true,- }),- createDashcard({- index: 3,- questionId: question.id,- hideEmptyResults: false,- withParameterMappings: false,- }),- ],- });- cy.wrap(dashboard.id).as("dashboardId");- });- });-- it("should not take into account the height of cards with no results when calculating dashboard height", () => {- cy.get("@dashboardId").then((dashboardId: any) => {- H.visitDashboard(dashboardId);-- cy.findByDisplayValue("Dashboard with empty result cards").should(- "be.visible",- );-- H.getDashboardCard().within(() => {- cy.findByText("Orders question").should("be.visible");- cy.log("Checks for the subtotal value from the first row");- cy.findByText("37.65").should("be.visible");- });-- cy.findByRole("main").should(($main) => {- // 4 cards take about 2000px in height, so only 1 card should definitely take less than 1000px- expect($main[0].scrollHeight).to.be.lessThan(1000);- });- });- });-});diff --git a/e2e/test/scenarios/visualizer/snowplow-tracking.cy.spec.ts b/e2e/test/scenarios/visualizer/snowplow-tracking.cy.spec.tsnew file mode 100644index 00000000000..ac28f9b965f--- /dev/null+++ b/e2e/test/scenarios/visualizer/snowplow-tracking.cy.spec.ts@@ -0,0 +1,166 @@+import { ORDERS_DASHBOARD_ID } from "e2e/support/cypress_sample_instance_data";+import {+ ORDERS_COUNT_BY_CREATED_AT,+ PRODUCTS_COUNT_BY_CREATED_AT,+} from "e2e/support/test-visualizer-data";++const { H } = cy;++describe("scenarios > visualizer > snowplow tracking", () => {+ beforeEach(() => {+ H.resetSnowplow();+ H.restore();+ cy.signInAsAdmin();+ H.enableTracking();++ cy.intercept("POST", "/api/card/*/query").as("cardQuery");+ cy.intercept("GET", "/api/setting/version-info", {});++ cy.signInAsNormalUser();++ H.createQuestion(ORDERS_COUNT_BY_CREATED_AT, {+ idAlias: "ordersCountByCreatedAtQuestionId",+ wrapId: true,+ });+ H.createQuestion(PRODUCTS_COUNT_BY_CREATED_AT, {+ idAlias: "productsCountByCreatedAtQuestionId",+ wrapId: true,+ });+ });++ it("should track visualizer related events", () => {+ H.visitDashboard(ORDERS_DASHBOARD_ID);++ H.editDashboard();+ cy.log("open questions sidebar");+ H.openQuestionsSidebar();+ H.clickVisualizeAnotherWay(ORDERS_COUNT_BY_CREATED_AT.name);+ // visualize another way from question list+ H.expectUnstructuredSnowplowEvent({+ event: "visualize_another_way_clicked",+ triggered_from: "question-list",+ });++ H.modal().within(() => {+ // switch to datasets list+ cy.log("switch to datasets list");+ H.switchToAddMoreData();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_add_more_data_clicked",+ triggered_from: "visualizer-modal",+ });++ // add a dataset+ cy.log("add a dataset");+ H.selectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_datasource_added",+ triggered_from: "visualizer-modal",+ });++ cy.log("deselect a dataset");+ H.deselectDataset(PRODUCTS_COUNT_BY_CREATED_AT.name);+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_datasource_removed",+ triggered_from: "visualizer-modal",+ });++ // switch to columns list+ cy.log("switch to columns list");+ H.switchToColumnsList();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_show_columns_clicked",+ triggered_from: "visualizer-modal",+ });++ // deselect a column+ cy.log("deselect a column");+ H.deselectColumnFromColumnsList(ORDERS_COUNT_BY_CREATED_AT.name, "Count");+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_column_removed",+ triggered_from: "visualizer-modal",+ });++ // select a column+ cy.log("select a column");+ H.selectColumnFromColumnsList(ORDERS_COUNT_BY_CREATED_AT.name, "Count");+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_column_added",+ triggered_from: "visualizer-modal",+ });++ // show settings sidebar+ cy.log("show settings sidebar");+ H.toggleVisualizerSettingsSidebar();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_settings_clicked",+ triggered_from: "visualizer-modal",+ });++ // change the visualization type+ cy.log("change the visualization type");+ H.selectVisualization("line");+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_viz_type_changed",+ triggered_from: "visualizer-modal",+ });+ });++ // save the card+ cy.log("save the card");+ H.saveDashcardVisualizerModal({ mode: "create" });+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_save_clicked",+ triggered_from: "visualizer-modal",+ });++ H.showDashcardVisualizerModal(1);+ // show the table preview+ cy.log("show the table preview");+ cy.findByTestId("visualizer-view-as-table-button").click();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_view_as_table_clicked",+ triggered_from: "visualizer-modal",+ });++ cy.findByTestId("visualizer-tabular-preview-modal").within(() => {+ cy.findByLabelText("Close").click();+ });++ cy.log("resets a dataset");+ H.selectVisualization("bar");+ H.resetDataSourceButton(ORDERS_COUNT_BY_CREATED_AT.name).click();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_data_changed",+ event_detail: "visualizer_datasource_reset",+ triggered_from: "visualizer-modal",+ });++ // remove a dataset+ cy.log("remove a dataset");+ H.removeDataSource(ORDERS_COUNT_BY_CREATED_AT.name, {+ throughMenu: true,+ });+ H.expectUnstructuredSnowplowEvent(+ {+ event: "visualizer_data_changed",+ event_detail: "visualizer_datasource_removed",+ triggered_from: "visualizer-modal",+ },+ 2, // deselecting a dataset fired the first one+ );++ // close the modal+ cy.log("close the modal");+ H.closeDashcardVisualizerModal();+ H.expectUnstructuredSnowplowEvent({+ event: "visualizer_close_clicked",+ triggered_from: "visualizer-modal",+ });+ });+});