Skip to content

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

GDGT-2589 Make H.popover() to select the Select component from "metabase/ui" (#76737)

Egor Grushin8d56144be171
diff --git a/e2e/support/helpers/e2e-embedding-helpers.js b/e2e/support/helpers/e2e-embedding-helpers.js
index 118c18eaad1..f8f8da7c65c 100644
--- a/e2e/support/helpers/e2e-embedding-helpers.js
+++ b/e2e/support/helpers/e2e-embedding-helpers.js
@@ -6,7 +6,10 @@ import {
embedModalEnableEmbedding,
legacyStaticEmbeddingButton,
} from "e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers";
-import { modal } from "e2e/support/helpers/e2e-ui-elements-helpers";
+import {
+ modal,
+ selectDropdown,
+} from "e2e/support/helpers/e2e-ui-elements-helpers";
import { JWT_SHARED_SECRET } from "e2e/support/helpers/embedding-sdk-helpers/constants";
import { openSharingMenu } from "./e2e-sharing-helpers";
@@ -318,7 +321,7 @@ export function getParametersContainer() {
export function setEmbeddingParameter(name, value) {
getParametersContainer().findByLabelText(name).click();
- cy.findByRole("listbox").contains(value).click();
+ selectDropdown().contains(value).click();
}
export function assertEmbeddingParameter(name, value) {
diff --git a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
index eda1b5d1422..bee87ceefa2 100644
--- a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
@@ -1349,7 +1349,7 @@ function createDashboardWithActionButton({
.first()
.click();
});
- cy.findByRole("listbox").findByText("ID").click();
+ H.selectDropdown().findByText("ID").click();
}
cy.findByRole("dialog").within(() => {
diff --git a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
index f2973ad9a4d..29b2cb2e46d 100644
--- a/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-reproductions.cy.spec.js
@@ -258,7 +258,7 @@ describe("issue 51020", () => {
cy.findByText("Update a dashboard filter").click();
cy.findByTestId("click-target-column").click();
});
- cy.findByRole("listbox").findByText(columnName).click();
+ H.selectDropdown().findByText(columnName).click();
cy.button("Done").click();
cy.findByLabelText("Add action").click();
@@ -268,7 +268,7 @@ describe("issue 51020", () => {
cy.findByText("Update").click();
cy.findAllByDisplayValue("Ask the user").eq(0).click();
});
- cy.findByRole("listbox").findByText("ID").click();
+ H.selectDropdown().findByText("ID").click();
cy.button("Done").click();
H.saveDashboard();
diff --git a/e2e/test/scenarios/admin-2/settings.cy.spec.js b/e2e/test/scenarios/admin-2/settings.cy.spec.js
index 15abaf411c4..fc521d5f51f 100644
--- a/e2e/test/scenarios/admin-2/settings.cy.spec.js
+++ b/e2e/test/scenarios/admin-2/settings.cy.spec.js
@@ -230,7 +230,7 @@ describe("scenarios > admin > settings", () => {
.as("timezoneSelect")
.clear()
.type("Centr");
- cy.findByRole("listbox").findByText("US/Central").click();
+ H.selectDropdown().findByText("US/Central").click();
cy.wait("@reportTimezone");
cy.get("@timezoneSelect").should("have.value", "US/Central");
});
@@ -912,9 +912,9 @@ describe("scenarios > admin > settings > map settings", () => {
cy.button("Load").click();
cy.wait("@getGeoJson");
cy.findByTestId("map-region-key-select").click();
- cy.findByRole("listbox").contains("NAME").click();
+ H.selectDropdown().contains("NAME").click();
cy.findByTestId("map-region-name-select").click();
- cy.findByRole("listbox").contains("NAME").click();
+ H.selectDropdown().contains("NAME").click();
cy.button("Add map").click();
cy.findByTestId("admin-layout-content").within(() => {
cy.contains("NAME").should("not.exist");
diff --git a/e2e/test/scenarios/dashboard-cards/dashboard-drill.cy.spec.js b/e2e/test/scenarios/dashboard-cards/dashboard-drill.cy.spec.js
index 0b10ed7f0e2..89ac445d668 100644
--- a/e2e/test/scenarios/dashboard-cards/dashboard-drill.cy.spec.js
+++ b/e2e/test/scenarios/dashboard-cards/dashboard-drill.cy.spec.js
@@ -248,7 +248,7 @@ describe("scenarios > dashboard > dashboard drill", () => {
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
.within(() => cy.findByText("My Param").click());
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByRole("listbox").within(() => cy.findByText("MY_STRING").click());
+ H.selectDropdown().within(() => cy.findByText("MY_STRING").click());
// set the text template
cy.findByPlaceholderText("E.x. Details for {{Column Name}}").type(
@@ -328,7 +328,7 @@ describe("scenarios > dashboard > dashboard drill", () => {
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
.within(() => cy.findByText("My Param").click());
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByRole("listbox").within(() => cy.findByText("MY_STRING").click());
+ H.selectDropdown().within(() => cy.findByText("MY_STRING").click());
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("Save").click();
diff --git a/e2e/test/scenarios/dashboard-filters/dashboard-chained-filters.cy.spec.js b/e2e/test/scenarios/dashboard-filters/dashboard-chained-filters.cy.spec.js
index c3280e6a38e..ff4f8e1e683 100644
--- a/e2e/test/scenarios/dashboard-filters/dashboard-chained-filters.cy.spec.js
+++ b/e2e/test/scenarios/dashboard-filters/dashboard-chained-filters.cy.spec.js
@@ -92,7 +92,7 @@ describe("scenarios > dashboard > chained filter", () => {
const valuesWidget = () =>
has_field_values === "search"
- ? cy.findByRole("listbox")
+ ? H.selectDropdown()
: cy.findByTestId("field-values-widget");
valuesWidget().within(() => {
@@ -271,7 +271,7 @@ describe("scenarios > dashboard > chained filter", () => {
.parent()
.findByText("ID")
.click();
- cy.findByRole("listbox").findByText("UUID").should("be.visible");
+ H.selectDropdown().findByText("UUID").should("be.visible");
});
});
});
diff --git a/e2e/test/scenarios/dashboard-filters/dashboard-filters-boolean.cy.spec.ts b/e2e/test/scenarios/dashboard-filters/dashboard-filters-boolean.cy.spec.ts
index 121e2003e2c..08253dc47a6 100644
--- a/e2e/test/scenarios/dashboard-filters/dashboard-filters-boolean.cy.spec.ts
+++ b/e2e/test/scenarios/dashboard-filters/dashboard-filters-boolean.cy.spec.ts
@@ -77,7 +77,7 @@ describe(
.findByText(PARAMETER_NAME)
.click();
});
- cy.findByRole("listbox").findByText(COLUMN_NAME).click();
+ H.selectDropdown().findByText(COLUMN_NAME).click();
H.saveDashboard();
cy.log("assert click behavior");
@@ -109,7 +109,7 @@ describe(
.findByTestId("unset-click-mappings")
.findByText(COLUMN_NAME)
.click();
- cy.findByRole("listbox").findByText(COLUMN_NAME).click();
+ H.selectDropdown().findByText(COLUMN_NAME).click();
H.saveDashboard();
cy.log("assert click behavior");
@@ -189,7 +189,7 @@ describe(
.findByTestId("unset-click-mappings")
.findByText(COLUMN_NAME)
.click();
- cy.findByRole("listbox").findByText(FIELD_NAME).click();
+ H.selectDropdown().findByText(FIELD_NAME).click();
H.saveDashboard();
cy.log("assert click behavior");
@@ -466,7 +466,7 @@ function setupDashboardClickBehavior({ targetName }: { targetName: string }) {
cy.findByText(DASHBOARD_NAME).click();
});
H.sidebar().findByText(PARAMETER_NAME).click();
- cy.findByRole("listbox").findByText(targetName).click();
+ H.selectDropdown().findByText(targetName).click();
H.saveDashboard();
});
}
diff --git a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
index 55e09a3ffe4..5a08091645a 100644
--- a/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
+++ b/e2e/test/scenarios/dashboard/dashboard.cy.spec.js
@@ -1519,7 +1519,7 @@ describe("scenarios > dashboard", () => {
function checkOptionsForFilter(filter) {
cy.findByText("Available filters").parent().contains(filter).click();
- cy.findByRole("listbox")
+ H.selectDropdown()
.should("contain", "Columns")
.and("contain", "COUNT(*)")
.and("not.contain", "Dashboard filters");
diff --git a/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js b/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js
index ec72e899327..3c3ad24ccae 100644
--- a/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js
@@ -89,11 +89,11 @@ describe("scenarios > embedding > dashboard parameters", () => {
cy.findByLabelText("Name").click();
});
- cy.findByRole("listbox").findByText("Editable").click();
+ H.selectDropdown().findByText("Editable").click();
cy.get("@allParameters").findByLabelText("Id").click();
- cy.findByRole("listbox").findByText("Locked").click();
+ H.selectDropdown().findByText("Locked").click();
H.modal().within(() => {
// set the locked parameter's value
@@ -160,10 +160,10 @@ describe("scenarios > embedding > dashboard parameters", () => {
});
});
cy.get("@allParameters").findByDisplayValue("Locked").click();
- cy.findByRole("listbox").findByText("Disabled").click();
+ H.selectDropdown().findByText("Disabled").click();
cy.get("@allParameters").findByDisplayValue("Editable").click();
- cy.findByRole("listbox").findByText("Disabled").click();
+ H.selectDropdown().findByText("Disabled").click();
H.publishChanges("dashboard", ({ request }) => {
assert.deepEqual(request.body.embedding_params, {
diff --git a/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js b/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
index 234e5863346..17d0ba5edf9 100644
--- a/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
@@ -330,7 +330,7 @@ describe("locked parameters in embedded question (metabase#20634)", () => {
cy.findByLabelText("Text").click();
});
- cy.findByRole("listbox").findByText("Locked").click();
+ H.selectDropdown().findByText("Locked").click();
H.modal().within(() => {
// set a parameter value
diff --git a/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js b/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js
index 27364d39207..436a27d1921 100644
--- a/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js
@@ -60,7 +60,7 @@ tokens.forEach((token) => {
.click();
});
- cy.findByRole("listbox")
+ H.selectDropdown()
.should("contain", "Node.js")
.and("contain", "Ruby")
.and("contain", "Python")
@@ -74,7 +74,7 @@ tokens.forEach((token) => {
.should("have.value", "Pug / Jade")
.click();
- cy.findByRole("listbox")
+ H.selectDropdown()
.should("contain", "Mustache")
.and("contain", "Pug / Jade")
.and("contain", "ERB")
@@ -181,7 +181,7 @@ tokens.forEach((token) => {
.click();
});
- cy.findByRole("listbox")
+ H.selectDropdown()
.should("contain", "Node.js")
.and("contain", "Ruby")
.and("contain", "Python")
diff --git a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
index 139baf7fbd3..a7206634f98 100644
--- a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
+++ b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
@@ -1073,7 +1073,7 @@ describe("issue 35840", () => {
function checkColumnMapping(path: string[]) {
H.pickEntity({ path, select: true });
H.modal().findByPlaceholderText("Pick a column…").click();
- cy.findByRole("listbox").findAllByText("Category").eq(0).click();
+ H.selectDropdown().findAllByText("Category").eq(0).click();
H.modal().within(() => {
cy.findByDisplayValue("Category").should("be.visible");
cy.findByDisplayValue("Category, Category").should("not.exist");
diff --git a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
index cabca6fe4a4..18b1264644b 100644
--- a/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
+++ b/e2e/test/scenarios/sharing/public-sharing-embed-button-behavior.cy.spec.js
@@ -314,7 +314,7 @@ describe("#39152 sharing an unsaved question", () => {
});
H.modal().findByLabelText("Price").click();
- cy.findByRole("listbox").findByText("Editable").click();
+ H.selectDropdown().findByText("Editable").click();
H.publishChanges(apiPath, ({ request, response }) => {
assert.deepEqual(request.body.embedding_type, "static-legacy");
@@ -507,7 +507,7 @@ describe("#39152 sharing an unsaved question", () => {
cy.findByDisplayValue("Node.js").click();
});
- cy.findByRole("listbox").findByText("Ruby").click();
+ H.selectDropdown().findByText("Ruby").click();
cy.findByTestId("embed-backend")
.findByTestId("copy-button")
.realClick();
@@ -534,7 +534,7 @@ describe("#39152 sharing an unsaved question", () => {
cy.findByDisplayValue("Ruby").click();
});
- cy.findByRole("listbox").findByText("Python").click();
+ H.selectDropdown().findByText("Python").click();
H.modal().within(() => {
cy.findByLabelText("Dark").click({ force: true });
@@ -654,7 +654,7 @@ describe("#39152 sharing an unsaved question", () => {
cy.findByDisplayValue("Node.js").click();
});
- cy.findByRole("listbox").findByText("Ruby").click();
+ H.selectDropdown().findByText("Ruby").click();
cy.findByTestId("embed-backend")
.findByTestId("copy-button")
.realClick();
@@ -681,7 +681,7 @@ describe("#39152 sharing an unsaved question", () => {
cy.findByDisplayValue("Ruby").click();
});
- cy.findByRole("listbox").findByText("Python").click();
+ H.selectDropdown().findByText("Python").click();
H.modal().within(() => {
cy.findByLabelText("Dark").click({ force: true });
@@ -829,7 +829,7 @@ describe("#39152 sharing an unsaved question", () => {
cy.log("changing parameters, so we could discard changes");
H.modal().findByLabelText("Price").click();
- cy.findByRole("listbox").findByText("Editable").click();
+ H.selectDropdown().findByText("Editable").click();
cy.findByTestId("embed-modal-content-status-bar").within(() => {
cy.findByText("Discard changes").click();
@@ -883,10 +883,10 @@ describe("#39152 sharing an unsaved question", () => {
H.modal().findByRole("tab", { name: "Parameters" }).click();
H.modal().findByLabelText("Price").click();
- cy.findByRole("listbox").findByText("Editable").click();
+ H.selectDropdown().findByText("Editable").click();
H.modal().findByLabelText("Category").click();
- cy.findByRole("listbox").findByText("Locked").click();
+ H.selectDropdown().findByText("Locked").click();
cy.then(function () {
const HOUR = 60 * 60 * 1000;
diff --git a/frontend/src/metabase/ui/components/inputs/Select/Select.tsx b/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
index ea1832bd6a4..9b813f0b66b 100644
--- a/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
+++ b/frontend/src/metabase/ui/components/inputs/Select/Select.tsx
@@ -59,6 +59,13 @@ function SelectWrapper<Value extends string | null>(
props.selectFirstOptionOnChange ?? props.searchable
}
onDropdownOpen={handleDropdownOpen}
+ attributes={{
+ ...props.attributes,
+ dropdown: {
+ "data-element-id": "mantine-popover",
+ ...props.attributes?.dropdown,
+ },
+ }}
/>
);
}