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 replace deprecated select component (#76651)

Egor Grushin4193c0298d49
diff --git a/e2e/support/helpers/e2e-embedding-helpers.js b/e2e/support/helpers/e2e-embedding-helpers.js
index 99a7402a356..118c18eaad1 100644
--- a/e2e/support/helpers/e2e-embedding-helpers.js
+++ b/e2e/support/helpers/e2e-embedding-helpers.js
@@ -6,7 +6,7 @@ import {
embedModalEnableEmbedding,
legacyStaticEmbeddingButton,
} from "e2e/support/helpers/e2e-embedding-iframe-sdk-setup-helpers";
-import { modal, popover } from "e2e/support/helpers/e2e-ui-elements-helpers";
+import { modal } 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,11 +318,11 @@ export function getParametersContainer() {
export function setEmbeddingParameter(name, value) {
getParametersContainer().findByLabelText(name).click();
- popover().contains(value).click();
+ cy.findByRole("listbox").contains(value).click();
}
export function assertEmbeddingParameter(name, value) {
- getParametersContainer().findByLabelText(name).should("have.text", value);
+ getParametersContainer().findByLabelText(name).should("have.value", value);
}
// @param {("card"|"dashboard")} resourceType - The type of resource we are sharing
diff --git a/e2e/support/helpers/e2e-filter-helpers.js b/e2e/support/helpers/e2e-filter-helpers.js
index 4162fa31a25..05da4d6cf0c 100644
--- a/e2e/support/helpers/e2e-filter-helpers.js
+++ b/e2e/support/helpers/e2e-filter-helpers.js
@@ -1,4 +1,8 @@
-import { modal, popover } from "e2e/support/helpers/e2e-ui-elements-helpers";
+import {
+ modal,
+ popover,
+ selectDropdown,
+} from "e2e/support/helpers/e2e-ui-elements-helpers";
import { pickEntity } from "./e2e-collection-helpers";
@@ -20,24 +24,20 @@ export function setFilterQuestionSource({ question, field, labelField }) {
pickEntity({ path: [/Our analytics/, question], select: true });
- modal().within(() => {
- cy.findByText("Pick a column…").click();
- });
+ modal().findByPlaceholderText("Pick a column…").click();
- popover().within(() => {
- cy.findByText(field).click();
- });
+ selectDropdown().findByRole("option", { name: field, hidden: true }).click();
if (labelField) {
cy.log("the label selector defaults to None until a column is chosen");
modal().within(() => {
cy.findByText("Column to supply the labels").should("be.visible");
- cy.findByText("None").click();
+ cy.findByDisplayValue("None").click();
});
- popover().within(() => {
- cy.findByText(labelField).click();
- });
+ selectDropdown()
+ .findByRole("option", { name: labelField, hidden: true })
+ .click();
}
modal().within(() => {
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 978c4158243..eda1b5d1422 100644
--- a/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
+++ b/e2e/test/scenarios/actions/actions-on-dashboards.cy.spec.js
@@ -1345,13 +1345,11 @@ function createDashboardWithActionButton({
cy.findByRole("dialog").within(() => {
cy.findByText(/has no parameters to map/i).should("not.exist");
cy.findByText(/Where should the values/i);
- cy.findAllByText(/ask the user/i)
+ cy.findAllByDisplayValue(/ask the user/i)
.first()
.click();
});
- H.popover().within(() => {
- cy.findByText("ID").click();
- });
+ cy.findByRole("listbox").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 35219902afd..f2973ad9a4d 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();
});
- H.popover().findByText(columnName).click();
+ cy.findByRole("listbox").findByText(columnName).click();
cy.button("Done").click();
cy.findByLabelText("Add action").click();
@@ -266,9 +266,9 @@ describe("issue 51020", () => {
H.modal().within(() => {
cy.findByText(modelName).click();
cy.findByText("Update").click();
- cy.findAllByText("Ask the user").eq(0).click();
+ cy.findAllByDisplayValue("Ask the user").eq(0).click();
});
- H.popover().findByText("ID").click();
+ cy.findByRole("listbox").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 f7c6059d2df..15abaf411c4 100644
--- a/e2e/test/scenarios/admin-2/settings.cy.spec.js
+++ b/e2e/test/scenarios/admin-2/settings.cy.spec.js
@@ -912,9 +912,9 @@ describe("scenarios > admin > settings > map settings", () => {
cy.button("Load").click();
cy.wait("@getGeoJson");
cy.findByTestId("map-region-key-select").click();
- H.popover().contains("NAME").click();
+ cy.findByRole("listbox").contains("NAME").click();
cy.findByTestId("map-region-name-select").click();
- H.popover().contains("NAME").click();
+ cy.findByRole("listbox").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 e8c3149df3d..0b10ed7f0e2 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
- H.popover().within(() => cy.findByText("MY_STRING").click());
+ cy.findByRole("listbox").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
- H.popover().within(() => cy.findByText("MY_STRING").click());
+ cy.findByRole("listbox").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 69f1f4c3f34..c3280e6a38e 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
@@ -271,7 +271,7 @@ describe("scenarios > dashboard > chained filter", () => {
.parent()
.findByText("ID")
.click();
- H.popover().findByText("UUID").should("be.visible");
+ cy.findByRole("listbox").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 ea13fc470da..121e2003e2c 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();
});
- H.popover().findByText(COLUMN_NAME).click();
+ cy.findByRole("listbox").findByText(COLUMN_NAME).click();
H.saveDashboard();
cy.log("assert click behavior");
@@ -109,7 +109,7 @@ describe(
.findByTestId("unset-click-mappings")
.findByText(COLUMN_NAME)
.click();
- H.popover().findByText(COLUMN_NAME).click();
+ cy.findByRole("listbox").findByText(COLUMN_NAME).click();
H.saveDashboard();
cy.log("assert click behavior");
@@ -189,7 +189,7 @@ describe(
.findByTestId("unset-click-mappings")
.findByText(COLUMN_NAME)
.click();
- H.popover().findByText(FIELD_NAME).click();
+ cy.findByRole("listbox").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();
- H.popover().findByText(targetName).click();
+ cy.findByRole("listbox").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 db19f608195..55e09a3ffe4 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();
- H.popover()
+ cy.findByRole("listbox")
.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 a9c77b160b4..ec72e899327 100644
--- a/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-dashboard.cy.spec.js
@@ -80,28 +80,20 @@ describe("scenarios > embedding > dashboard parameters", () => {
cy.get("@allParameters").within(() => {
// verify that all the parameters on the dashboard are defaulted to disabled
- cy.findAllByText("Disabled").should(
+ cy.findAllByDisplayValue("Disabled").should(
"have.length",
dashboardDetails.parameters.length,
);
- // select the dropdown next to the Name parameter so that we can set it to editable
- cy.findByText("Name")
- .parent()
- .within(() => {
- cy.findByText("Disabled").click();
- });
+ // open the dropdown next to the Name parameter so that we can set it to editable
+ cy.findByLabelText("Name").click();
});
- H.popover().findByText("Editable").click();
+ cy.findByRole("listbox").findByText("Editable").click();
- cy.get("@allParameters")
- .findByText("Id")
- .parent()
- .findByText("Disabled")
- .click();
+ cy.get("@allParameters").findByLabelText("Id").click();
- H.popover().findByText("Locked").click();
+ cy.findByRole("listbox").findByText("Locked").click();
H.modal().within(() => {
// set the locked parameter's value
@@ -167,11 +159,11 @@ describe("scenarios > embedding > dashboard parameters", () => {
unpublishBeforeOpen: false,
});
});
- cy.get("@allParameters").findByText("Locked").click();
- H.popover().contains("Disabled").click();
+ cy.get("@allParameters").findByDisplayValue("Locked").click();
+ cy.findByRole("listbox").findByText("Disabled").click();
- cy.get("@allParameters").findByText("Editable").click();
- H.popover().contains("Disabled").click();
+ cy.get("@allParameters").findByDisplayValue("Editable").click();
+ cy.findByRole("listbox").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 c0ffb835601..234e5863346 100644
--- a/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-reproductions.cy.spec.js
@@ -326,16 +326,11 @@ describe("locked parameters in embedded question (metabase#20634)", () => {
});
H.modal().within(() => {
- // select the dropdown next to the Text parameter so that we can set the value to "Locked"
- cy.findByText("Text")
- .parent()
- .within(() => {
- cy.findByText("Disabled").click();
- });
+ // open the visibility dropdown for the Text parameter so that we can set the value to "Locked"
+ cy.findByLabelText("Text").click();
});
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("Locked").click();
+ cy.findByRole("listbox").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 7d6550e8764..27364d39207 100644
--- a/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js
+++ b/e2e/test/scenarios/embedding/embedding-snippets.cy.spec.js
@@ -56,11 +56,11 @@ tokens.forEach((token) => {
);
cy.findAllByTestId("embed-backend-select-button")
- .should("contain", "Node.js")
+ .should("have.value", "Node.js")
.click();
});
- H.popover()
+ cy.findByRole("listbox")
.should("contain", "Node.js")
.and("contain", "Ruby")
.and("contain", "Python")
@@ -71,10 +71,10 @@ tokens.forEach((token) => {
H.modal()
.findAllByTestId("embed-frontend-select-button")
- .should("contain", "Pug / Jade")
+ .should("have.value", "Pug / Jade")
.click();
- H.popover()
+ cy.findByRole("listbox")
.should("contain", "Mustache")
.and("contain", "Pug / Jade")
.and("contain", "ERB")
@@ -177,11 +177,11 @@ tokens.forEach((token) => {
}
cy.findByTestId("embed-backend-select-button")
- .should("contain", "Node.js")
+ .should("have.value", "Node.js")
.click();
});
- H.popover()
+ cy.findByRole("listbox")
.should("contain", "Node.js")
.and("contain", "Ruby")
.and("contain", "Python")
diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts
index 740826af15e..4361562615f 100644
--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts
+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding-setup/guest-embed-ee.cy.spec.ts
@@ -3,7 +3,6 @@ import {
JWT_SHARED_SECRET,
embedModalEnableEmbedding,
entityPickerModal,
- getParametersContainer,
} from "e2e/support/helpers";
import { enableJwtAuth } from "e2e/support/helpers/e2e-jwt-helpers";
@@ -310,9 +309,7 @@ describe("scenarios > embedding > sdk iframe embed setup > guest-embed", () => {
cy.button("Unpublish").should("be.visible");
- getParametersContainer()
- .findByLabelText("Text")
- .should("contain.text", "Disabled");
+ H.assertEmbeddingParameter("Text", "Disabled");
getEmbedSidebar().within(() => {
cy.findByText("Back").click();
@@ -333,13 +330,9 @@ describe("scenarios > embedding > sdk iframe embed setup > guest-embed", () => {
cy.button("Unpublish").should("be.visible");
- getParametersContainer()
- .findByLabelText("Text1")
- .should("contain.text", "Editable");
+ H.assertEmbeddingParameter("Text1", "Editable");
- getParametersContainer()
- .findByLabelText("Text2")
- .should("contain.text", "Disabled");
+ H.assertEmbeddingParameter("Text2", "Disabled");
H.setEmbeddingParameter("Text1", "Locked");
@@ -364,9 +357,7 @@ describe("scenarios > embedding > sdk iframe embed setup > guest-embed", () => {
cy.button("Unpublish").should("be.visible");
- getParametersContainer()
- .findByLabelText("Text")
- .should("contain.text", "Disabled");
+ H.assertEmbeddingParameter("Text", "Disabled");
});
});
diff --git a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
index 532032726d3..139baf7fbd3 100644
--- a/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
+++ b/e2e/test/scenarios/models/reproductions-1.cy.spec.ts
@@ -1072,11 +1072,11 @@ describe("issue 35840", () => {
function checkColumnMapping(path: string[]) {
H.pickEntity({ path, select: true });
- H.modal().findByText("Pick a column…").click();
- H.popover().findAllByText("Category").eq(0).click();
+ H.modal().findByPlaceholderText("Pick a column…").click();
+ cy.findByRole("listbox").findAllByText("Category").eq(0).click();
H.modal().within(() => {
- cy.findByText("Category").should("be.visible");
- cy.findByText("Category, Category").should("not.exist");
+ cy.findByDisplayValue("Category").should("be.visible");
+ cy.findByDisplayValue("Category, Category").should("not.exist");
});
}
diff --git a/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js b/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js
index 153d3ee4045..434abad15e8 100644
--- a/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js
+++ b/e2e/test/scenarios/onboarding/home/homepage.cy.spec.js
@@ -187,18 +187,16 @@ describe("scenarios > home > homepage", () => {
cy.visit("/");
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText(/Here are some explorations of the/);
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("public");
+ cy.findByTestId("xray-schema-name").should("have.text", "public");
cy.findAllByRole("link").contains("sqlite");
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("Orders");
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("People").should("not.exist");
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("public").click();
- // eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
- cy.findByText("private").click();
+ cy.findByTestId("xray-schema-name").click();
+ cy.findByRole("option", { name: "private" }).click();
+ cy.findByTestId("xray-schema-name").should("have.text", "private");
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("People");
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
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 309928b65b3..cabca6fe4a4 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
@@ -313,8 +313,8 @@ describe("#39152 sharing an unsaved question", () => {
assert.deepEqual(response.body.embedding_type, "static-legacy");
});
- H.modal().button("Price").click();
- H.popover().findByText("Editable").click();
+ H.modal().findByLabelText("Price").click();
+ cy.findByRole("listbox").findByText("Editable").click();
H.publishChanges(apiPath, ({ request, response }) => {
assert.deepEqual(request.body.embedding_type, "static-legacy");
@@ -505,9 +505,9 @@ describe("#39152 sharing an unsaved question", () => {
H.modal().within(() => {
cy.findByRole("tab", { name: "Parameters" }).click();
- cy.findByText("Node.js").click();
+ cy.findByDisplayValue("Node.js").click();
});
- H.popover().findByText("Ruby").click();
+ cy.findByRole("listbox").findByText("Ruby").click();
cy.findByTestId("embed-backend")
.findByTestId("copy-button")
.realClick();
@@ -531,10 +531,10 @@ describe("#39152 sharing an unsaved question", () => {
H.modal().within(() => {
cy.findByRole("tab", { name: "Look and Feel" }).click();
- cy.findByText("Ruby").click();
+ cy.findByDisplayValue("Ruby").click();
});
- H.popover().findByText("Python").click();
+ cy.findByRole("listbox").findByText("Python").click();
H.modal().within(() => {
cy.findByLabelText("Dark").click({ force: true });
@@ -652,9 +652,9 @@ describe("#39152 sharing an unsaved question", () => {
H.modal().within(() => {
cy.findByRole("tab", { name: "Parameters" }).click();
- cy.findByText("Node.js").click();
+ cy.findByDisplayValue("Node.js").click();
});
- H.popover().findByText("Ruby").click();
+ cy.findByRole("listbox").findByText("Ruby").click();
cy.findByTestId("embed-backend")
.findByTestId("copy-button")
.realClick();
@@ -678,10 +678,10 @@ describe("#39152 sharing an unsaved question", () => {
H.modal().within(() => {
cy.findByRole("tab", { name: "Look and Feel" }).click();
- cy.findByText("Ruby").click();
+ cy.findByDisplayValue("Ruby").click();
});
- H.popover().findByText("Python").click();
+ cy.findByRole("listbox").findByText("Python").click();
H.modal().within(() => {
cy.findByLabelText("Dark").click({ force: true });
@@ -828,8 +828,8 @@ describe("#39152 sharing an unsaved question", () => {
});
cy.log("changing parameters, so we could discard changes");
- H.modal().button("Price").click();
- H.popover().findByText("Editable").click();
+ H.modal().findByLabelText("Price").click();
+ cy.findByRole("listbox").findByText("Editable").click();
cy.findByTestId("embed-modal-content-status-bar").within(() => {
cy.findByText("Discard changes").click();
@@ -882,11 +882,11 @@ describe("#39152 sharing an unsaved question", () => {
.click();
H.modal().findByRole("tab", { name: "Parameters" }).click();
- H.modal().button("Price").click();
- H.popover().findByText("Editable").click();
+ H.modal().findByLabelText("Price").click();
+ cy.findByRole("listbox").findByText("Editable").click();
- H.modal().button("Category").click();
- H.popover().findByText("Locked").click();
+ H.modal().findByLabelText("Category").click();
+ cy.findByRole("listbox").findByText("Locked").click();
cy.then(function () {
const HOUR = 60 * 60 * 1000;
diff --git a/frontend/src/metabase/actions/components/ActionForm/ActionForm.unit.spec.tsx b/frontend/src/metabase/actions/components/ActionForm/ActionForm.unit.spec.tsx
index 4f337f41da8..d9159f9411a 100644
--- a/frontend/src/metabase/actions/components/ActionForm/ActionForm.unit.spec.tsx
+++ b/frontend/src/metabase/actions/components/ActionForm/ActionForm.unit.spec.tsx
@@ -223,7 +223,7 @@ describe("Actions > ActionForm", () => {
},
});
- expect(screen.getByTestId("select-button")).toBeInTheDocument();
+ expect(screen.getByRole("textbox")).toBeInTheDocument();
});
it("can submit form field values", async () => {
diff --git a/frontend/src/metabase/actions/components/ActionFormFieldWidget/ActionFormFieldWidget.tsx b/frontend/src/metabase/actions/components/ActionFormFieldWidget/ActionFormFieldWidget.tsx
index 76a9f36ba04..fbe037422ca 100644
--- a/frontend/src/metabase/actions/components/ActionFormFieldWidget/ActionFormFieldWidget.tsx
+++ b/frontend/src/metabase/actions/components/ActionFormFieldWidget/ActionFormFieldWidget.tsx
@@ -4,13 +4,14 @@ import { forwardRef } from "react";
import type { ActionFormFieldProps } from "metabase/actions/types";
import { FormInput as FormInputWidget } from "metabase/common/components/FormInput";
import { FormNumericInput as FormNumericInputWidget } from "metabase/common/components/FormNumericInput";
-import { FormSelect as FormSelectWidget } from "metabase/common/components/FormSelect";
import { FormTextArea as FormTextAreaWidget } from "metabase/common/components/FormTextArea";
import { FormToggle as FormBooleanWidget } from "metabase/common/components/FormToggle";
import { FormRadioGroup, type FormRadioGroupProps } from "metabase/forms";
import { Radio, Stack } from "metabase/ui";
import type { InputComponentType } from "metabase-types/api";
+import { FormSelectWidget } from "./FormSelectWidget";
+
type RadioOption = {
name: string;
// Radio.Group in our forms provides string values; stringify numeric values when rendering
diff --git a/frontend/src/metabase/actions/components/ActionFormFieldWidget/FormSelectWidget.tsx b/frontend/src/metabase/actions/components/ActionFormFieldWidget/FormSelectWidget.tsx
new file mode 100644
index 00000000000..3c3d91fbd27
--- /dev/null
+++ b/frontend/src/metabase/actions/components/ActionFormFieldWidget/FormSelectWidget.tsx
@@ -0,0 +1,45 @@
+import type { ReactNode, Ref } from "react";
+import { forwardRef } from "react";
+
+import type { ActionFormFieldProps } from "metabase/actions/types";
+import { FormField } from "metabase/common/components/FormField";
+import { useUniqueId } from "metabase/common/hooks/use-unique-id";
+import { FormSelect } from "metabase/forms/components/FormSelect";
+
+type FormSelectWidgetProps = ActionFormFieldProps & {
+ actions?: ReactNode;
+ disabled?: boolean;
+ nullable?: boolean;
+};
+
+export const FormSelectWidget = forwardRef(function FormSelectWidget(
+ {
+ title,
+ description,
+ actions,
+ optional,
+ options = [],
+ type,
+ field,
+ ...props
+ }: FormSelectWidgetProps,
+ ref: Ref<HTMLInputElement>,
+) {
+ const id = useUniqueId();
+ const data = options.map((option) => ({
+ value: String(option.value),
+ label: String(option.name),
+ }));
+
+ return (
+ <FormField
+ title={title}
+ actions={actions}
+ description={description}
+ htmlFor={id}
+ optional={optional}
+ >
+ <FormSelect ref={ref} id={id} size="sm" data={data} {...props} />
+ </FormField>
+ );
+});
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
index 100dbd5092e..dcf31add77a 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
@@ -2,8 +2,6 @@
import styled from "@emotion/styled";
import { EditableText as EditableTextBase } from "metabase/common/components/EditableText";
-import { Select } from "metabase/common/components/Select";
-import { SelectButton } from "metabase/common/components/SelectButton";
export const Container = styled.div`
display: flex;
@@ -29,27 +27,6 @@ export const EditableText = styled(EditableTextBase)`
color: var(--mb-color-text-secondary);
`;
-export const CompactSelect = styled(Select)`
- ${SelectButton.Root} {
- border: none;
- border-radius: 6px;
- min-width: 80px;
- color: var(--mb-color-text-secondary);
- }
- ${SelectButton.Content} {
- margin-right: 6px;
- }
- ${SelectButton.Icon} {
- margin-left: 0;
- }
-
- &:hover {
- ${SelectButton.Root} {
- background-color: var(--mb-color-background_page-secondary);
- }
- }
-`;
-
export const ActionButtons = styled.div`
/* Since the button is borderless, adding the negative margin
will make it look flush with the container */
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx
index f036f7f5c57..5749c4c7f89 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.tsx
@@ -1,10 +1,7 @@
import { t } from "ttag";
-import type { WritebackActionType } from "metabase-types/api";
-
import {
ActionButtons,
- CompactSelect,
Container,
EditableText,
LeftHeader,
@@ -12,31 +9,17 @@ import {
type Props = {
name: string;
- type: WritebackActionType;
isEditable: boolean;
canRename: boolean;
onChangeName: (name: string) => void;
- onChangeType?: (type: WritebackActionType) => void;
actionButtons: React.ReactElement[];
};
-const OPTS = [
- {
- value: "query",
- get name() {
- return t`Query`;
- },
- disabled: true,
- },
-];
-
const ActionCreatorHeader = ({
name = t`New Action`,
isEditable,
canRename,
- type,
onChangeName,
- onChangeType,
actionButtons,
}: Props) => {
return (
@@ -47,9 +30,6 @@ const ActionCreatorHeader = ({
onChange={onChangeName}
isDisabled={!isEditable || !canRename}
/>
- {!!onChangeType && (
- <CompactSelect options={OPTS} value={type} onChange={onChangeType} />
- )}
</LeftHeader>
{actionButtons.length > 0 && (
<ActionButtons>{actionButtons}</ActionButtons>
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
index 30a80398da1..305fe6ccb75 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorView.tsx
@@ -89,7 +89,6 @@ export default function ActionCreatorView({
<ActionCreatorBodyContainer>
<ModalLeft>
<ActionCreatorHeader
- type="query"
name={action.name ?? t`New Action`}
canRename={canRename}
isEditable={isEditable}
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
index 7180d736b75..f06190c0644 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx
@@ -14,11 +14,20 @@ import { useLazyLoadGeoJSONQuery } from "metabase/api/geojson";
import { useAdminSetting } from "metabase/api/utils";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { Option, Select } from "metabase/common/components/Select";
import AdminS from "metabase/css/admin.module.css";
import ButtonsS from "metabase/css/components/buttons.module.css";
import CS from "metabase/css/core/index.css";
-import { Button, Ellipsified, Image, Modal, Stack, Text } from "metabase/ui";
+import {
+ Box,
+ Button,
+ Ellipsified,
+ Image,
+ Modal,
+ Select,
+ SelectItem,
+ Stack,
+ Text,
+} from "metabase/ui";
import { uuid } from "metabase/utils/uuid";
import type {
CustomGeoJSONMap,
@@ -249,6 +258,12 @@ interface GeoJsonPropertySelectProps {
dataTestId: string;
}
+const SampleValues = ({ values }: { values: string[] }) => (
+ <Ellipsified fz="0.75rem" fw="bold">
+ {t`Sample values:`} {values.join(", ")}
+ </Ellipsified>
+);
+
const GeoJsonPropertySelect = ({
value,
onChange,
@@ -272,35 +287,43 @@ const GeoJsonPropertySelect = ({
}
}
+ const selectedValues = value !== null ? options[value] : undefined;
+
return (
- <div data-testid={dataTestId}>
+ <Stack gap="sm" data-testid={dataTestId}>
<Select
- value={value || ""}
- onChange={(e: ChangeEvent<HTMLSelectElement>) =>
- onChange(e.target.value)
- }
+ value={value}
placeholder={t`Select…`}
- >
- {Object.entries(options).map(([name, values]) => (
- <Option key={name} value={name}>
- <div>
- <div style={{ textAlign: "left" }}>{name}</div>
- <div
- className={cx(CS.mt1, CS.h6)}
- style={{
- maxWidth: 250,
- whiteSpace: "nowrap",
- overflow: "hidden",
- textOverflow: "ellipsis",
- }}
- >
- {t`Sample values:`} {values.join(", ")}
- </div>
- </div>
- </Option>
- ))}
- </Select>
- </div>
+ comboboxProps={{
+ width: 300,
+ position: "top-start",
+ withinPortal: true,
+ keepMounted: false,
+ }}
+ data={Object.keys(options).map((name) => ({
+ value: name,
+ label: name,
+ }))}
+ onChange={(newValue) => {
+ if (newValue !== null) {
+ onChange(newValue);
+ }
+ }}
+ renderOption={(item) => (
+ <SelectItem selected={item.checked} w="100%">
+ <Stack gap="sm" w="100%">
+ <Ellipsified>{item.option.label}</Ellipsified>
+ <SampleValues values={options[item.option.value] ?? []} />
+ </Stack>
+ </SelectItem>
+ )}
+ />
+ {selectedValues && (
+ <Box w={0} miw="100%">
+ <SampleValues values={selectedValues} />
+ </Box>
+ )}
+ </Stack>
);
};
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
index ed2adc1ea69..049bbcc2416 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.unit.spec.tsx
@@ -177,11 +177,11 @@ describe("CustomGeoJSONWIdget", () => {
// Select map features for key and name
const keySelect = within(screen.getByTestId("map-region-key-select"));
- await userEvent.click(await keySelect.findByTestId("select-button"));
+ await userEvent.click(await keySelect.findByPlaceholderText(/Select/));
await userEvent.click(await screen.findByText("scalerank"));
const nameSelect = within(screen.getByTestId("map-region-name-select"));
- await userEvent.click(await nameSelect.findByTestId("select-button"));
+ await userEvent.click(await nameSelect.findByPlaceholderText(/Select/));
await userEvent.click(screen.getByText("featureclass"));
// Save and check body contains data
@@ -241,11 +241,11 @@ describe("CustomGeoJSONWIdget", () => {
// Select map features for key and name
const keySelect = within(screen.getByTestId("map-region-key-select"));
- await userEvent.click(await keySelect.findByTestId("select-button"));
+ await userEvent.click(await keySelect.findByPlaceholderText(/Select/));
await userEvent.click(await screen.findByText("featureclass"));
const nameSelect = within(screen.getByTestId("map-region-name-select"));
- await userEvent.click(await nameSelect.findByTestId("select-button"));
+ await userEvent.click(await nameSelect.findByPlaceholderText(/Select/));
await userEvent.click(screen.getByText("scalerank"));
await userEvent.click(screen.getByRole("button", { name: /Save map/i }));
diff --git a/frontend/src/metabase/common/components/FormSelect/FormSelect.stories.tsx b/frontend/src/metabase/common/components/FormSelect/FormSelect.stories.tsx
deleted file mode 100644
index 5d0fce8a82d..00000000000
--- a/frontend/src/metabase/common/components/FormSelect/FormSelect.stories.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { StoryFn } from "@storybook/react";
-
-import { Form, FormProvider } from "metabase/forms";
-
-import { FormSelect } from "./FormSelect";
-
-const TEST_OPTIONS = [
- { name: "Line", value: "line" },
- { name: "Area", value: "area" },
- { name: "Bar", value: "bar" },
-];
-
-export default {
- title: "Components/Ask Before Using/FormSelect",
- component: FormSelect,
-};
-
-const Template: StoryFn<typeof FormSelect> = (args) => {
- const initialValues = { value: undefined };
- const handleSubmit = () => undefined;
-
- return (
- <FormProvider initialValues={initialValues} onSubmit={handleSubmit}>
- <Form>
- <FormSelect {...args} name="value" options={TEST_OPTIONS} />
- </Form>
- </FormProvider>
- );
-};
-
-export const Default = {
- render: Template,
-
- args: {
- title: "Title",
- placeholder: "Use default",
- },
-};
-
-export const WithDescription = {
- render: Template,
-
- args: {
- title: "Title",
- placeholder: "Use default",
- description: "Description",
- },
-};
diff --git a/frontend/src/metabase/common/components/FormSelect/FormSelect.tsx b/frontend/src/metabase/common/components/FormSelect/FormSelect.tsx
deleted file mode 100644
index 1ec24725bde..00000000000
--- a/frontend/src/metabase/common/components/FormSelect/FormSelect.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { useField } from "formik";
-import type { ReactNode, Ref } from "react";
-import { forwardRef, useCallback, useMemo } from "react";
-
-import { FormField } from "metabase/common/components/FormField";
-import type {
- SelectChangeEvent,
- SelectOption,
- SelectProps,
-} from "metabase/common/components/Select";
-import { Select } from "metabase/common/components/Select";
-import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-
-export interface FormSelectProps<
- TValue,
- TOption extends object = SelectOption<TValue>,
-> extends Omit<SelectProps<TValue, TOption>, "value"> {
- name: string;
- title?: string;
- actions?: ReactNode;
- description?: ReactNode;
- optional?: boolean;
-}
-
-/**
- * @deprecated: use FormSelect from "metabase/forms"
- */
-export const FormSelect = forwardRef(function FormSelect<
- TValue,
- TOption extends object = SelectOption<TValue>,
->(
- {
- name,
- className,
- title,
- actions,
- description,
- onChange,
- optional,
- ...props
- }: FormSelectProps<TValue, TOption>,
- ref: Ref<HTMLDivElement>,
-) {
- const id = useUniqueId();
- const [{ value, onBlur }, { error, touched }, { setValue }] = useField(name);
- const buttonProps = useMemo(() => ({ id, onBlur }), [id, onBlur]);
-
- const handleChange = useCallback(
- (event: SelectChangeEvent<TValue>) => {
- setValue(event.target.value);
- onChange?.(event);
- },
- [setValue, onChange],
- );
-
- return (
- <FormField
- ref={ref}
- className={className}
- title={title}
- actions={actions}
- description={description}
- htmlFor={id}
- error={touched ? error : undefined}
- optional={optional}
- >
- <Select
- {...props}
- name={name}
- value={value}
- onChange={handleChange}
- buttonProps={buttonProps}
- />
- </FormField>
- );
-});
diff --git a/frontend/src/metabase/common/components/FormSelect/FormSelect.unit.spec.tsx b/frontend/src/metabase/common/components/FormSelect/FormSelect.unit.spec.tsx
deleted file mode 100644
index 8415204c8fc..00000000000
--- a/frontend/src/metabase/common/components/FormSelect/FormSelect.unit.spec.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import userEvent from "@testing-library/user-event";
-import { Form, Formik } from "formik";
-import * as Yup from "yup";
-
-import { render, screen, waitFor } from "__support__/ui";
-
-import { FormSelect } from "./FormSelect";
-
-const TEST_SCHEMA = Yup.object({
- value: Yup.string().notOneOf(["bar"], "error"),
-});
-
-const TEST_OPTIONS = [
- { name: "Line", value: "line" },
- { name: "Area", value: "area" },
- { name: "Bar", value: "bar" },
-];
-
-interface TestFormSelectProps {
- initialValue?: string;
- onSubmit: () => void;
-}
-
-const TestFormSelect = ({ initialValue, onSubmit }: TestFormSelectProps) => {
- return (
- <Formik
- initialValues={{ value: initialValue }}
- validationSchema={TEST_SCHEMA}
- onSubmit={onSubmit}
- >
- <Form>
- <FormSelect
- name="value"
- title="Label"
- options={TEST_OPTIONS}
- placeholder="Choose"
- />
- <button type="submit">Submit</button>
- </Form>
- </Formik>
- );
-};
-
-describe("FormSelect", () => {
- it("should use the initial value from the form", () => {
- const onSubmit = jest.fn();
-
- render(<TestFormSelect initialValue="line" onSubmit={onSubmit} />);
-
- expect(screen.getByText("Line")).toBeInTheDocument();
- });
-
- it("should propagate the changed value to the form", async () => {
- const onSubmit = jest.fn();
-
- render(<TestFormSelect onSubmit={onSubmit} />);
- await userEvent.click(screen.getByText("Choose"));
- await userEvent.click(screen.getByText("Line"));
- await userEvent.click(screen.getByText("Submit"));
-
- await waitFor(() => {
- const values = { value: "line" };
- expect(onSubmit).toHaveBeenCalledWith(values, expect.anything());
- });
- });
-
- it("should be referenced by the label", () => {
- const onSubmit = jest.fn();
-
- render(<TestFormSelect onSubmit={onSubmit} />);
-
- expect(screen.getByLabelText("Label")).toBeInTheDocument();
- });
-
- it("should be validated on blur", async () => {
- const onSubmit = jest.fn();
-
- render(<TestFormSelect initialValue="line" onSubmit={onSubmit} />);
- await userEvent.click(screen.getByText("Line"));
- await userEvent.click(screen.getByText("Bar"));
- await userEvent.click(screen.getByText("Submit"));
-
- expect(await screen.findByText(": error")).toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/common/components/FormSelect/index.ts b/frontend/src/metabase/common/components/FormSelect/index.ts
deleted file mode 100644
index dacc881663c..00000000000
--- a/frontend/src/metabase/common/components/FormSelect/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { FormSelect } from "./FormSelect";
-export type { FormSelectProps } from "./FormSelect";
diff --git a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
index 910d343b872..24994327af2 100644
--- a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
+++ b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.tsx
@@ -26,8 +26,6 @@ import type {
ScheduleType,
} from "metabase-types/api";
-import type { SelectOption as LegacySelectOption } from "../Select";
-
import { DynamicWidthSelect } from "./DynamicWidthSelect";
import {
PickerRow,
@@ -77,7 +75,9 @@ const DEFAULT_DAY = "mon";
/**
* Transforms legacy Select data format to Mantine Select data format
*/
-function toMantineData(options: LegacySelectOption[]): SelectOption[] {
+type LegacyScheduleOption = { name?: string; value: string | number };
+
+function toMantineData(options: LegacyScheduleOption[]): SelectOption[] {
return options.map((option) => ({
label: option.name ?? "",
value: option.value.toString(),
diff --git a/frontend/src/metabase/common/components/Select/Select.stories.tsx b/frontend/src/metabase/common/components/Select/Select.stories.tsx
deleted file mode 100644
index 722f5224c45..00000000000
--- a/frontend/src/metabase/common/components/Select/Select.stories.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import type { StoryFn } from "@storybook/react";
-
-import { Select } from "./Select";
-
-export default {
- title: "Deprecated/Components/Select",
- component: Select,
-};
-
-const Template: StoryFn<typeof Select> = (args) => {
- return <Select {...args} />;
-};
-
-export const Default = {
- render: Template,
-
- args: {
- multiple: true,
- defaultValue: ["type/PK", "type/Category"],
- sections: [
- {
- items: [
- {
- description: "The primary key for this table.",
- icon: "unknown",
- name: "Entity Key",
- value: "type/PK",
- },
- {
- description:
- 'The "name" of each record. Usually a column called "name", "title", etc.',
- icon: "string",
- name: "Entity Name",
- value: "type/Name",
- },
- {
- description: "Points to another table to make a connection.",
- icon: "connections",
- name: "Foreign Key",
- value: "type/FK",
- },
- ],
- name: "Overall Row",
- },
- {
- items: [
- {
- description: undefined,
- icon: null,
- name: "Category",
- value: "type/Category",
- },
- {
- description: undefined,
- icon: null,
- name: "Comment",
- value: "type/Comment",
- },
- {
- description: undefined,
- icon: null,
- name: "Description",
- value: "type/Description",
- },
- {
- description: undefined,
- icon: null,
- name: "Title",
- value: "type/Title",
- },
- ],
- name: "Common",
- },
- {
- items: [
- {
- description: undefined,
- icon: null,
- name: "City",
- value: "type/City",
- },
- {
- description: undefined,
- icon: null,
- name: "Country",
- value: "type/Country",
- },
- {
- description: undefined,
- icon: null,
- name: "Latitude",
- value: "type/Latitude",
- },
- ],
- name: "Location",
- },
- ],
- },
-};
diff --git a/frontend/src/metabase/common/components/Select/Select.tsx b/frontend/src/metabase/common/components/Select/Select.tsx
deleted file mode 100644
index 2b7fe05ea07..00000000000
--- a/frontend/src/metabase/common/components/Select/Select.tsx
+++ /dev/null
@@ -1,398 +0,0 @@
-import { createSelector } from "@reduxjs/toolkit";
-import cx from "classnames";
-import type {
- CSSProperties,
- Key,
- ReactElement,
- ReactNode,
- RefObject,
-} from "react";
-import { Children, Component, createRef } from "react";
-import _ from "underscore";
-
-import {
- AccordionList,
- type SearchProps,
-} from "metabase/common/components/AccordionList";
-import type { SelectButtonProps } from "metabase/common/components/SelectButton";
-import { SelectButton } from "metabase/common/components/SelectButton";
-import CS from "metabase/css/core/index.css";
-import Uncontrollable from "metabase/hoc/Uncontrollable";
-import { Icon, Popover } from "metabase/ui";
-import type { IconName } from "metabase-types/api";
-
-const MIN_ICON_WIDTH = 20;
-
-export interface SelectProps<
- TValue,
- TOption extends object = SelectOption<TValue>,
-> {
- className?: string;
- containerClassName?: string;
-
- options?: TOption[];
- sections?: SelectSection<TOption>[];
- children?: ReactNode;
-
- value: TValue;
- name?: string;
- defaultValue?: TValue;
- onChange?: (event: SelectChangeEvent<TValue>) => void;
- multiple?: boolean;
- placeholder?: string;
- disabled?: boolean;
- hiddenIcons?: boolean;
-
- // Popover props
- isInitiallyOpen?: boolean;
- triggerElement?: ReactNode;
- onClose?: () => void;
-
- // SelectButton props
- buttonProps?: Partial<SelectButtonProps>;
- buttonText?: string; // will override selected options text
-
- // AccordionList props
- searchProp?: SearchProps<TOption>;
- searchPlaceholder?: string;
- globalSearch?: boolean;
- width?: number;
-
- optionNameFn?: (option: TOption) => string | undefined;
- optionValueFn?: (option: TOption) => TValue;
- optionDescriptionFn?: (option: TOption) => string | undefined;
- optionSectionFn?: (option: TOption) => string;
- optionDisabledFn?: (option: TOption) => boolean;
- optionIconFn?: (option: TOption) => IconName | undefined;
- optionClassNameFn?: (option: TOption) => string | undefined;
- optionStylesFn?: (option: TOption) => CSSProperties | undefined;
-
- footer?: ReactNode;
- "data-testid"?: string;
-}
-
-export interface SelectOption<TValue = Key> {
- value: TValue;
- name?: string;
- description?: string;
- icon?: IconName;
- iconSize?: number;
- iconColor?: string;
- disabled?: boolean;
- children?: ReactNode;
-}
-
-export interface SelectSection<TOption = SelectOption> {
- name?: string;
- icon?: IconName;
- items: TOption[];
-}
-
-export interface SelectChangeEvent<TValue> {
- target: SelectChangeTarget<TValue>;
-}
-
-export interface SelectChangeTarget<TValue> {
- name?: string;
- value: TValue;
-}
-
-interface SelectState {
- isPopoverOpen: boolean;
-}
-
-class BaseSelect<
- TValue,
- TOption extends object = SelectOption<TValue>,
-> extends Component<SelectProps<TValue, TOption>, SelectState> {
- selectButtonRef: RefObject<any>;
- _getValues: () => TValue[];
- _getValuesSet: () => Set<TValue>;
-
- static defaultProps = {
- optionNameFn: (option: SelectOption) => option.children || option.name,
- optionValueFn: (option: SelectOption) => option.value,
- optionDescriptionFn: (option: SelectOption) => option.description,
- optionDisabledFn: (option: SelectOption) => option.disabled,
- optionIconFn: (option: SelectOption) => option.icon,
- };
-
- constructor(props: SelectProps<TValue, TOption>) {
- super(props);
-
- // reselect selectors
- const _getValue = (props: SelectProps<TValue, TOption>) =>
- // If a defaultValue is passed, replace a null value with it.
- // Otherwise, allow null values since we sometimes want them.
- Object.prototype.hasOwnProperty.call(props, "defaultValue") &&
- props.value == null
- ? (props.defaultValue as any)
- : props.value;
-
- const _getValues = createSelector([_getValue], (value) =>
- Array.isArray(value) ? value : [value],
- );
- const _getValuesSet = createSelector(
- [_getValues],
- (values) => new Set(values),
- );
- this._getValues = () => _getValues(this.props);
- this._getValuesSet = () => _getValuesSet(this.props);
- this.selectButtonRef = createRef();
- this.state = {
- isPopoverOpen: props.isInitiallyOpen || false,
- };
- }
-
- _getSections(): SelectSection<TOption>[] {
- // normalize `children`/`options` into same format as `sections`
- const { children, sections, options } = this.props;
- if (children) {
- const optionToItem = (option: any) => option.props;
- const first = (Array.isArray(children) ? children[0] : children) as any;
- if (first && (first as ReactElement).type === OptionSection) {
- return Children.map(children, (child) => ({
- ...(child as ReactElement<OptionProps<TValue>>).props,
- items: Children.map((child as any).props.children, optionToItem),
- })) as any;
- } else if (first && first.type === Option) {
- return [{ items: Children.map(children, optionToItem) }] as any;
- }
- } else if (options) {
- if (this.props.optionSectionFn) {
- return _.chain(options)
- .groupBy(this.props.optionSectionFn)
- .pairs()
- .map(([section, items]) => ({ name: section, items }))
- .value();
- } else {
- return [{ items: options }];
- }
- } else if (sections) {
- return sections;
- }
- return [];
- }
-
- itemIsSelected = (option: TOption) => {
- const optionValue = this.props.optionValueFn!(option);
- return this._getValuesSet().has(optionValue);
- };
-
- itemIsClickable = (option: TOption) => !this.props.optionDisabledFn!(option);
-
- handleChange = (option: TOption) => {
- const { name, multiple, onChange } = this.props;
- const optionValue = this.props.optionValueFn!(option);
- let value: any;
- if (multiple) {
- const values = this._getValues();
- value = this.itemIsSelected(option)
- ? values.filter((value) => value !== optionValue)
- : [...values, optionValue];
- value.changedItem = optionValue;
- } else {
- value = optionValue;
- }
- onChange?.({ target: { name, value } });
- if (!multiple) {
- this.closePopover();
- this.restoreTriggerFocus();
- }
- };
-
- renderItemIcon = (item: TOption) => {
- if (this.props.hiddenIcons) {
- return null;
- }
-
- const icon = this.props.optionIconFn!(item);
- if (icon) {
- return (
- <Icon
- name={icon}
- size={(item as any).iconSize || 16}
- c={(item as any).iconColor || "text-primary"}
- style={{ minWidth: MIN_ICON_WIDTH }}
- />
- );
- }
-
- if (this.itemIsSelected(item)) {
- return (
- <Icon
- name="check"
- c="text-primary"
- style={{ minWidth: MIN_ICON_WIDTH }}
- />
- );
- }
-
- return <span style={{ minWidth: MIN_ICON_WIDTH }} />;
- };
-
- restoreTriggerFocus = () => {
- // Focusing in the next tick prevents it is from reopening
- // when closed by selecting an item with Enter
- setTimeout(() => {
- this.selectButtonRef.current?.focus();
- }, 0);
- };
-
- closePopover = () => {
- this.setState({ isPopoverOpen: false });
- };
-
- togglePopover = (event: React.MouseEvent<HTMLAnchorElement>) => {
- event.preventDefault();
- if (!this.props.disabled) {
- this.setState(({ isPopoverOpen }) => {
- if (isPopoverOpen) {
- this.restoreTriggerFocus();
- }
- return { isPopoverOpen: !isPopoverOpen };
- });
- }
- };
-
- handlePopoverDismiss = () => {
- this.props.onClose?.();
- this.closePopover();
- this.restoreTriggerFocus();
- };
-
- render() {
- const {
- buttonProps,
- className,
- containerClassName,
- placeholder,
- searchProp,
- searchPlaceholder,
- disabled,
- width,
- footer,
- "data-testid": testId,
- } = this.props;
- const { isPopoverOpen } = this.state;
- const sections = this._getSections();
- const selectedNames = sections
- .map((section) =>
- this.props.optionNameFn
- ? section.items
- .filter(this.itemIsSelected)
- .map(this.props.optionNameFn)
- : [],
- )
- .flat()
- .filter((n) => n);
-
- const triggerElement: ReactNode = this.props.triggerElement || (
- <SelectButton
- ref={this.selectButtonRef}
- hasValue={selectedNames.length > 0}
- disabled={disabled}
- {...buttonProps}
- className={CS.flexFull}
- >
- {this.props.buttonText
- ? this.props.buttonText
- : selectedNames.length > 0
- ? selectedNames.map((name, index) => (
- <span key={index}>
- {name}
- {index < selectedNames.length - 1 ? ", " : ""}
- </span>
- ))
- : placeholder}
- </SelectButton>
- );
-
- return (
- <Popover
- opened={isPopoverOpen}
- onDismiss={this.handlePopoverDismiss}
- position="bottom-start"
- offset={5}
- >
- <Popover.Target>
- <a
- onClick={this.togglePopover}
- className={cx(CS.flex, className, CS.noDecoration, {
- [CS.cursorInherit]: disabled,
- })}
- aria-disabled={disabled}
- >
- {triggerElement}
- </a>
- </Popover.Target>
- <Popover.Dropdown
- className={containerClassName}
- p={0}
- data-testid="popover"
- >
- <AccordionList<TOption>
- hasInitialFocus
- sections={sections}
- className="MB-Select"
- alwaysExpanded
- width={width}
- role="listbox"
- itemIsSelected={this.itemIsSelected}
- itemIsClickable={this.itemIsClickable}
- renderItemName={this.props.optionNameFn}
- getItemClassName={this.props.optionClassNameFn}
- getItemStyles={this.props.optionStylesFn}
- renderItemDescription={this.props.optionDescriptionFn}
- renderItemIcon={this.renderItemIcon}
- onChange={this.handleChange}
- searchable={!!searchProp}
- searchProp={searchProp}
- searchPlaceholder={searchPlaceholder}
- globalSearch={this.props.globalSearch}
- data-testid={testId ? `${testId}-list` : null}
- style={{
- color: "var(--mb-color-core-brand)",
- outline: "none",
- }}
- />
- {footer}
- </Popover.Dropdown>
- </Popover>
- );
- }
-}
-
-/**
- * @deprecated: use Select from "metabase/ui"
- */
-export const Select = Uncontrollable()(BaseSelect);
-
-export interface OptionSectionProps {
- name?: string;
- icon?: IconName;
- children?: ReactNode;
-}
-
-export class OptionSection extends Component<OptionSectionProps> {
- render() {
- return null;
- }
-}
-
-export interface OptionProps<TValue> {
- value: TValue;
-
- // one of these two is required
- name?: string;
- children?: ReactNode;
-
- icon?: IconName;
- disabled?: boolean;
-}
-
-export class Option<TValue> extends Component<OptionProps<TValue>> {
- render() {
- return null;
- }
-}
diff --git a/frontend/src/metabase/common/components/Select/Select.unit.spec.tsx b/frontend/src/metabase/common/components/Select/Select.unit.spec.tsx
deleted file mode 100644
index 175e1b9be4d..00000000000
--- a/frontend/src/metabase/common/components/Select/Select.unit.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { render, screen } from "__support__/ui";
-import { Option, Select } from "metabase/common/components/Select";
-
-describe("Select", () => {
- it("should render selected option", () => {
- render(
- <Select value="b">
- <Option value="a">option a</Option>
- <Option value="b">option b</Option>
- </Select>,
- );
-
- expect(screen.queryByText("option a")).not.toBeInTheDocument();
- expect(screen.getByText("option b")).toBeInTheDocument();
- });
-
- it("should render the defaultValue if none is selected", () => {
- render(
- <Select defaultValue="b">
- <Option value="a">option a</Option>
- <Option value="b">option b</Option>
- </Select>,
- );
-
- expect(screen.queryByText("option a")).not.toBeInTheDocument();
- expect(screen.getByText("option b")).toBeInTheDocument();
- });
-
- it("should render a placeholder if none is selected", () => {
- render(
- <Select placeholder="choose an option">
- <Option value="a">option a</Option>
- <Option value="b">option b</Option>
- </Select>,
- );
-
- expect(screen.queryByText("option a")).not.toBeInTheDocument();
- expect(screen.queryByText("option b")).not.toBeInTheDocument();
- expect(screen.getByText("choose an option")).toBeInTheDocument();
- });
-});
diff --git a/frontend/src/metabase/common/components/Select/index.ts b/frontend/src/metabase/common/components/Select/index.ts
deleted file mode 100644
index 754f663d50a..00000000000
--- a/frontend/src/metabase/common/components/Select/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { Select, Option, OptionSection } from "./Select";
-export type {
- SelectProps,
- SelectOption,
- SelectSection,
- SelectChangeEvent,
- SelectChangeTarget,
-} from "./Select";
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionDashcardSettings.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
index 7ee481aa769..446faa3417a 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionDashcardSettings.unit.spec.tsx
@@ -159,9 +159,11 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameter1.id}`,
);
- await userEvent.click(within(formSection).getByTestId("select-button"));
+ await userEvent.click(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ );
- const popover = await screen.findByRole("tree");
+ const popover = await screen.findByRole("listbox");
expect(
within(popover).getByText(dashboardParameter.name),
@@ -209,9 +211,11 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameter1.id}`,
);
- await userEvent.click(within(formSection).getByTestId("select-button"));
+ await userEvent.click(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ );
- const popover = await screen.findByRole("tree");
+ const popover = await screen.findByRole("listbox");
expect(
within(popover).queryByText("Ask the user"),
@@ -268,9 +272,11 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameter1.id}`,
);
- await userEvent.click(within(formSection).getByTestId("select-button"));
+ await userEvent.click(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ );
- const popover = await screen.findByRole("tree");
+ const popover = await screen.findByRole("listbox");
expect(within(popover).getByText("Select a value")).toBeInTheDocument();
expect(within(popover).getByText(DEFAULT_VALUE)).toBeInTheDocument();
@@ -309,9 +315,11 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameter1.id}`,
);
- await userEvent.click(within(formSection).getByTestId("select-button"));
+ await userEvent.click(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ );
- const popover = await screen.findByRole("tree");
+ const popover = await screen.findByRole("listbox");
expect(
within(popover).queryByText("Ask the user"),
@@ -345,9 +353,11 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameter1.id}`,
);
- await userEvent.click(within(formSection).getByTestId("select-button"));
+ await userEvent.click(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ );
- const popover = await screen.findByRole("tree");
+ const popover = await screen.findByRole("listbox");
expect(within(popover).getByText("Select a value")).toBeInTheDocument();
expect(
@@ -407,9 +417,9 @@ describe("ActionViz > ActionDashcardSettings", () => {
`parameter-form-section-${actionParameterRequired.id}`,
);
- expect(within(formSection).getByRole("button")).toHaveTextContent(
- "Select a value",
- );
+ expect(
+ within(formSection).getByTestId("parameter-mapping-select"),
+ ).toHaveValue("Select a value");
});
});
diff --git a/frontend/src/metabase/dashboard/components/ActionViz/ActionParameterMapping.tsx b/frontend/src/metabase/dashboard/components/ActionViz/ActionParameterMapping.tsx
index 2d71d46ba84..b0baa7b9d3c 100644
--- a/frontend/src/metabase/dashboard/components/ActionViz/ActionParameterMapping.tsx
+++ b/frontend/src/metabase/dashboard/components/ActionViz/ActionParameterMapping.tsx
@@ -3,10 +3,9 @@ import { t } from "ttag";
import { sortActionParams } from "metabase/actions/utils";
import { EmptyState } from "metabase/common/components/EmptyState";
-import type { SelectChangeEvent } from "metabase/common/components/Select";
-import { Select } from "metabase/common/components/Select";
import { setParameterMapping } from "metabase/dashboard/actions";
import { useDispatch } from "metabase/redux";
+import { Select } from "metabase/ui";
import type Question from "metabase-lib/v1/Question";
import type {
ActionDashboardCard,
@@ -106,6 +105,7 @@ interface ActionParameterMappingItemProps {
}
const DEFAULT_VALUE = "default value";
+const ASK_VALUE = "ask the user";
export const ActionParameterMappingItem = ({
action,
@@ -114,7 +114,7 @@ export const ActionParameterMappingItem = ({
dashboardParameters,
onChange,
}: ActionParameterMappingItemProps) => {
- const [value, setValue] = useState(mappedValue ?? null);
+ const [value, setValue] = useState<string>(mappedValue ?? ASK_VALUE);
const isHidden = isParameterHidden(action, actionParameter);
const isRequired = isParameterRequired(action, actionParameter);
@@ -125,19 +125,15 @@ export const ActionParameterMappingItem = ({
isHidden && isRequired && !isParameterMapped && !hasDefaultValue;
const name = actionParameter.name ?? actionParameter.id;
- const handleChange = (
- e: SelectChangeEvent<string>,
- target: ParameterTarget,
- ) => {
- const value = e.target.value;
+ const handleChange = (selected: string | null) => {
+ const nextValue = selected ?? ASK_VALUE;
- setValue(e.target.value);
+ setValue(nextValue);
- if (value !== DEFAULT_VALUE) {
- onChange(e.target.value, actionParameter.target);
- } else {
- onChange(null, target);
- }
+ const isMappedToParameter =
+ nextValue !== DEFAULT_VALUE && nextValue !== ASK_VALUE;
+
+ onChange(isMappedToParameter ? nextValue : null, actionParameter.target);
};
return (
@@ -149,9 +145,11 @@ export const ActionParameterMappingItem = ({
{isHidden && <ParameterFormBadge>{t`Hidden`}</ParameterFormBadge>}
</ParameterFormLabel>
<Select
+ data-testid="parameter-mapping-select"
value={value}
+ comboboxProps={{ width: 300, position: "bottom-start" }}
onChange={handleChange}
- options={[
+ data={[
...getDefaultOptions({
isRequired,
isHidden,
@@ -159,9 +157,8 @@ export const ActionParameterMappingItem = ({
defaultValue,
}),
...dashboardParameters.map((dashboardParam) => ({
- key: dashboardParam.id,
- name: dashboardParam.name,
value: dashboardParam.id,
+ label: dashboardParam.name,
})),
]}
/>
@@ -180,17 +177,17 @@ function getDefaultOptions({
hasDefaultValue: boolean;
defaultValue?: string | number;
}) {
- const defaultOptions = [];
-
- defaultOptions.push({
- name: isHidden ? t`Select a value` : t`Ask the user`,
- value: null,
- });
+ const defaultOptions = [
+ {
+ value: ASK_VALUE,
+ label: isHidden ? t`Select a value` : t`Ask the user`,
+ },
+ ];
if (isHidden && isRequired && hasDefaultValue) {
defaultOptions.push({
- name: defaultValue,
value: DEFAULT_VALUE,
+ label: String(defaultValue),
});
}
diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.module.css b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.module.css
index 202142ebf4a..acf13de3988 100644
--- a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.module.css
+++ b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.module.css
@@ -1,8 +1,16 @@
.TargetTrigger {
border-radius: 0.5rem;
+ cursor: pointer;
&:hover {
color: var(--mb-color-core-brand);
background-color: var(--mb-color-background_page-secondary);
}
}
+
+.groupLabel {
+ padding: var(--mantine-spacing-xs);
+ color: var(--mb-color-core-brand);
+ font-weight: 700;
+ text-transform: uppercase;
+}
diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.tsx b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.tsx
index 9c5da610d99..2789d595979 100644
--- a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappings.tsx
@@ -3,6 +3,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import CS from "metabase/css/core/index.css";
+import { Stack } from "metabase/ui";
import Question from "metabase-lib/v1/Question";
import type { DatasetColumn, Parameter } from "metabase-types/api";
@@ -116,7 +117,7 @@ export function ClickMappings(props: ClickMappingsOwnProps) {
<p className={cx(CS.mb2, CS.textMedium)}>
{getTargetsHeading(props.object, setTargets)}
</p>
- <div data-testid="unset-click-mappings">
+ <Stack data-testid="unset-click-mappings" gap="sm">
{unsetTargetsWithSourceOptions.map(
({
target,
@@ -134,7 +135,7 @@ export function ClickMappings(props: ClickMappingsOwnProps) {
/>
),
)}
- </div>
+ </Stack>
</div>
)}
</div>
diff --git a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappingsTargetWithoutSource.tsx b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappingsTargetWithoutSource.tsx
index 4b88c86a551..76337309322 100644
--- a/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappingsTargetWithoutSource.tsx
+++ b/frontend/src/metabase/dashboard/components/ClickMappings/ClickMappingsTargetWithoutSource.tsx
@@ -1,8 +1,12 @@
import { assocIn } from "icepick";
import { t } from "ttag";
-import { Select } from "metabase/common/components/Select";
-import { Flex } from "metabase/ui";
+import {
+ Combobox,
+ DefaultSelectItem,
+ UnstyledButton,
+ useCombobox,
+} from "metabase/ui";
import type { ClickBehavior } from "metabase-types/api";
import S from "./ClickMappings.module.css";
@@ -20,50 +24,78 @@ export function ClickMappingsTargetWithoutSource({
updateSettings: (settings: Partial<ClickBehavior>) => void;
}) {
const { id, name, type } = target;
+ const combobox = useCombobox();
+
+ const handleOptionSubmit = (value: string) => {
+ const source = Object.values(sourceOptions)
+ .flat()
+ .find((option) => getValueForSource(option) === value);
+
+ updateSettings(
+ assocIn(clickBehavior, ["parameterMapping", id], {
+ source,
+ target: target.target,
+ id,
+ type,
+ }),
+ );
+ combobox.closeDropdown();
+ };
return (
- <Select
+ <Combobox
key={id}
- triggerElement={
- <Flex
+ store={combobox}
+ position="bottom-start"
+ width={300}
+ classNames={{ groupLabel: S.groupLabel }}
+ onOptionSubmit={handleOptionSubmit}
+ >
+ <Combobox.Target>
+ <UnstyledButton
className={S.TargetTrigger}
+ style={{ outline: "none" }}
p="sm"
- mb="sm"
fw="bold"
- w="100%"
data-testid="click-target-column"
+ onClick={() => combobox.toggleDropdown()}
>
{name}
- </Flex>
- }
- value={null}
- sections={Object.entries(sourceOptions).map(([sourceType, items]) => ({
- name: {
- parameter: t`Dashboard filters`,
- column: t`Columns`,
- userAttribute: t`User attributes`,
- }[sourceType],
- items,
- }))}
- optionValueFn={getKeyForSource}
- optionNameFn={(option: SourceOption) =>
- option.type == null ? t`None` : option.name
- }
- onChange={({ target: { value } }: { target: { value: string } }) => {
- updateSettings(
- assocIn(clickBehavior, ["parameterMapping", id], {
- source: Object.values(sourceOptions)
- .flat()
- .find((option) => getKeyForSource(option) === value),
- target: target.target,
- id,
- type,
- }),
- );
- }}
- />
+ </UnstyledButton>
+ </Combobox.Target>
+ <Combobox.Dropdown>
+ <Combobox.Options>
+ {Object.entries(sourceOptions).map(([sourceType, items]) => (
+ <Combobox.Group
+ key={sourceType}
+ label={
+ {
+ parameter: t`Dashboard filters`,
+ column: t`Columns`,
+ userAttribute: t`User attributes`,
+ }[sourceType]
+ }
+ >
+ {items.map((option) => {
+ const value = getValueForSource(option);
+ return (
+ <Combobox.Option key={value} value={value} p={0}>
+ <DefaultSelectItem
+ pl="lg"
+ value={value}
+ fw="700"
+ label={option.type === undefined ? t`None` : option.name}
+ />
+ </Combobox.Option>
+ );
+ })}
+ </Combobox.Group>
+ ))}
+ </Combobox.Options>
+ </Combobox.Dropdown>
+ </Combobox>
);
}
-const getKeyForSource = (option: SourceOption) =>
- option.type == null ? null : `${option.type}-${option.id}`;
+const getValueForSource = (option: SourceOption) =>
+ option.type == null ? "none" : `${option.type}-${option.id}`;
diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
index 51d9154a448..c02f6de2ec7 100644
--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
@@ -1,9 +1,7 @@
import cx from "classnames";
-import type { ChangeEvent } from "react";
import { useMemo } from "react";
import { t } from "ttag";
-import { Option, Select } from "metabase/common/components/Select";
import CS from "metabase/css/core/index.css";
import type {
EmbedResourceParameter,
@@ -12,12 +10,9 @@ import type {
} from "metabase/embedding/types";
import { ParameterWidget as StaticParameterWidget } from "metabase/parameters/components/ParameterWidget";
import { getParameterIconName } from "metabase/parameters/utils/ui";
-import { Box, Divider, Icon, Stack, Text } from "metabase/ui";
+import { Box, Divider, Icon, Select, Stack, Text } from "metabase/ui";
import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
-import type {
- EmbeddingParameterVisibility,
- EmbeddingParameters,
-} from "metabase-types/api";
+import type { EmbeddingParameters } from "metabase-types/api";
import { StaticEmbedSetupPaneSettingsContentSection } from "./StaticEmbedSetupPaneSettingsContentSection";
import type { EmbedResourceParameterWithValue } from "./types";
@@ -105,15 +100,20 @@ export const ParametersSettings = ({
)}
</h3>
<Select
- buttonProps={{
- "aria-label": parameter.name,
- }}
- className={cx(CS.mlAuto, CS.bgWhite)}
+ aria-label={parameter.name}
+ ml="auto"
value={visibility}
- onChange={(e: ChangeEvent<HTMLSelectElement>) => {
- const nextVisibility = e.target
- .value as EmbeddingParameterVisibility;
-
+ data={[
+ {
+ value: "disabled",
+ label: t`Disabled`,
+ icon: "close",
+ disabled: parameter.required,
+ },
+ { value: "locked", label: t`Locked`, icon: "lock" },
+ { value: "enabled", label: t`Editable`, icon: "pencil" },
+ ]}
+ onChange={(nextVisibility) => {
onChangeEmbeddingParameters({
...embeddingParams,
[parameter.slug]: nextVisibility,
@@ -126,15 +126,7 @@ export const ParametersSettings = ({
});
}
}}
- >
- <Option
- icon="close"
- value="disabled"
- disabled={parameter.required}
- >{t`Disabled`}</Option>
- <Option icon="lock" value="locked">{t`Locked`}</Option>
- <Option icon="pencil" value="enabled">{t`Editable`}</Option>
- </Select>
+ />
</div>
);
})}
diff --git a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsx b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsx
index b221cb2a95d..fabd392f335 100644
--- a/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedModal/StaticEmbedSetupPane/tests/common.unit.spec.tsx
@@ -146,7 +146,7 @@ describe("Static Embed Setup phase", () => {
await waitFor(() => {
expect(
screen.getByTestId("embed-frontend-select-button"),
- ).toHaveTextContent("ERB");
+ ).toHaveValue("ERB");
});
});
});
@@ -215,9 +215,7 @@ describe("Static Embed Setup phase", () => {
});
expect(screen.getByText("My param")).toBeInTheDocument();
- expect(screen.getByLabelText("My param")).toHaveTextContent(
- "Disabled",
- );
+ expect(screen.getByLabelText("My param")).toHaveValue("Disabled");
});
it("should render saved parameters", async () => {
@@ -249,7 +247,7 @@ describe("Static Embed Setup phase", () => {
).toBeInTheDocument();
expect(
within(parametersSection).getByLabelText("My param"),
- ).toHaveTextContent("Locked");
+ ).toHaveValue("Locked");
});
it("should only render valid parameters", async () => {
@@ -274,9 +272,7 @@ describe("Static Embed Setup phase", () => {
});
expect(screen.getByText("My param")).toBeInTheDocument();
- expect(screen.getByLabelText("My param")).toHaveTextContent(
- "Disabled",
- );
+ expect(screen.getByLabelText("My param")).toHaveValue("Disabled");
});
it("should update a card with only valid parameters", async () => {
@@ -302,9 +298,7 @@ describe("Static Embed Setup phase", () => {
});
expect(screen.getByText("My param")).toBeInTheDocument();
- expect(screen.getByLabelText("My param")).toHaveTextContent(
- "Disabled",
- );
+ expect(screen.getByLabelText("My param")).toHaveValue("Disabled");
await userEvent.click(screen.getByLabelText("My param"));
@@ -597,7 +591,7 @@ describe("Static Embed Setup phase", () => {
}),
);
- expect(screen.getByTestId("embed-backend-select-button")).toHaveTextContent(
+ expect(screen.getByTestId("embed-backend-select-button")).toHaveValue(
"Python",
);
@@ -607,7 +601,7 @@ describe("Static Embed Setup phase", () => {
}),
);
- expect(screen.getByTestId("embed-backend-select-button")).toHaveTextContent(
+ expect(screen.getByTestId("embed-backend-select-button")).toHaveValue(
"Python",
);
});
@@ -700,7 +694,7 @@ describe("Static Embed Setup phase", () => {
);
await userEvent.click(
- within(await screen.findByRole("tree")).getByText("Locked"),
+ within(await screen.findByRole("listbox")).getByText("Locked"),
);
expect(
@@ -714,7 +708,7 @@ describe("Static Embed Setup phase", () => {
);
await userEvent.click(
- within(await screen.findByRole("tree")).getByText("Disabled"),
+ within(await screen.findByRole("listbox")).getByText("Disabled"),
);
expect(
@@ -732,9 +726,9 @@ async function selectServerCodeLanguage({
currentLanguage?: string;
newLanguage: string;
}) {
- await userEvent.click(screen.getByText(currentLanguage));
+ await userEvent.click(screen.getByDisplayValue(currentLanguage));
await userEvent.click(
- within(await screen.findByRole("tree")).getByText(newLanguage),
+ within(await screen.findByRole("listbox")).getByText(newLanguage),
);
}
diff --git a/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx b/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx
index ebdaa2802a0..8031b77164f 100644
--- a/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx
+++ b/frontend/src/metabase/embedding/components/EmbedServerSnippetLanguageSelect/EmbedServerSnippetLanguageSelect.tsx
@@ -1,8 +1,5 @@
-import type { ChangeEvent } from "react";
-
-import { Option, Select } from "metabase/common/components/Select";
-import CS from "metabase/css/core/index.css";
import type { CodeSampleOption } from "metabase/embedding/types";
+import { Select } from "metabase/ui";
type Props = {
languageOptions: CodeSampleOption[];
@@ -23,20 +20,14 @@ export const EmbedServerSnippetLanguageSelect = ({
return (
<Select
- className={CS.mlAuto}
+ data-testid={dataTestId ? `${dataTestId}-select-button` : undefined}
value={selectedOptionId}
- onChange={(e: ChangeEvent<HTMLSelectElement>) =>
- onChangeOption(e.target.value)
- }
- buttonProps={{
- dataTestId,
- }}
- >
- {languageOptions.map((option) => (
- <Option key={option.id} value={option.id}>
- {option.name}
- </Option>
- ))}
- </Select>
+ data={languageOptions.map((option) => ({
+ value: option.id,
+ label: option.name,
+ }))}
+ onChange={onChangeOption}
+ ml="auto"
+ />
);
};
diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.styled.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.styled.tsx
index bc19c7595ef..87cb179b358 100644
--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.styled.tsx
+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.styled.tsx
@@ -28,13 +28,6 @@ export const DatabaseLinkText = styled.span`
font-weight: bold;
`;
-export const SchemaTrigger = styled.span`
- display: flex;
- align-items: center;
- margin: 0 0.5rem;
- cursor: pointer;
-`;
-
export const SchemaTriggerIcon = styled(Icon)`
color: var(--mb-color-core-brand);
width: 0.625rem;
diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
index 09093bcb72d..f478f785a08 100644
--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.tsx
@@ -1,5 +1,4 @@
-import type { ChangeEvent } from "react";
-import { useCallback, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -9,9 +8,14 @@ import {
useListDatabasesQuery,
} from "metabase/api";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
-import { Select } from "metabase/common/components/Select";
import { useSelector } from "metabase/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
+import {
+ Combobox,
+ DefaultSelectItem,
+ UnstyledButton,
+ useCombobox,
+} from "metabase/ui";
import * as Urls from "metabase/urls";
import { isSyncCompleted } from "metabase/utils/syncing";
import { isNotNull } from "metabase/utils/types";
@@ -25,7 +29,6 @@ import {
DatabaseLink,
DatabaseLinkIcon,
DatabaseLinkText,
- SchemaTrigger,
SchemaTriggerIcon,
SchemaTriggerText,
SectionBody,
@@ -127,31 +130,49 @@ interface SchemaSelectProps {
}
const SchemaSelect = ({ schema, schemas, onChange }: SchemaSelectProps) => {
- const trigger = (
- <SchemaTrigger>
- <SchemaTriggerText data-testid="xray-schema-name">
- {schema}
- </SchemaTriggerText>
- <SchemaTriggerIcon name="chevrondown" />
- </SchemaTrigger>
- );
-
- const handleChange = useCallback(
- (event: ChangeEvent<HTMLSelectElement>) => {
- onChange?.(event.target.value);
- },
- [onChange],
- );
+ const combobox = useCombobox();
return (
- <Select
- value={schema}
- options={schemas}
- optionNameFn={getSchemaOption}
- optionValueFn={getSchemaOption}
- onChange={handleChange}
- triggerElement={trigger}
- />
+ <Combobox
+ store={combobox}
+ position="bottom-start"
+ width={300}
+ onOptionSubmit={(value) => {
+ onChange?.(value);
+ combobox.closeDropdown();
+ }}
+ >
+ <Combobox.Target>
+ <UnstyledButton
+ display="inline-flex"
+ mx="sm"
+ style={{ alignItems: "center", outline: "none" }}
+ onClick={() => combobox.toggleDropdown()}
+ >
+ <SchemaTriggerText data-testid="xray-schema-name">
+ {schema}
+ </SchemaTriggerText>
+ <SchemaTriggerIcon name="chevrondown" />
+ </UnstyledButton>
+ </Combobox.Target>
+ <Combobox.Dropdown>
+ <Combobox.Options>
+ {schemas.map((schemaOption) => (
+ <Combobox.Option
+ key={schemaOption}
+ value={schemaOption}
+ selected={schemaOption === schema}
+ p={0}
+ >
+ <DefaultSelectItem
+ value={schemaOption}
+ selected={schemaOption === schema}
+ />
+ </Combobox.Option>
+ ))}
+ </Combobox.Options>
+ </Combobox.Dropdown>
+ </Combobox>
);
};
@@ -192,7 +213,3 @@ const getMessages = (count: number) => {
.sample(count)
.value();
};
-
-const getSchemaOption = (schema: string) => {
- return schema;
-};
diff --git a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.unit.spec.tsx b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.unit.spec.tsx
index 59ff90108f6..c22b240c11e 100644
--- a/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.unit.spec.tsx
+++ b/frontend/src/metabase/home/components/HomeXraySection/HomeXraySection.unit.spec.tsx
@@ -1,3 +1,5 @@
+import userEvent from "@testing-library/user-event";
+
import {
setupDatabaseCandidatesEndpoint,
setupDatabasesEndpoints,
@@ -98,6 +100,40 @@ describe("HomeXraySection", () => {
expect(screen.getByTestId("xray-schema-name")).toHaveTextContent("public");
});
+ it("should allow switching between schemas", async () => {
+ await setup({
+ database: createMockDatabase({
+ name: "H2",
+ is_sample: false,
+ }),
+ candidates: [
+ createMockDatabaseCandidate({
+ id: "1/public",
+ schema: "public",
+ tables: [createMockTableCandidate({ title: "Orders" })],
+ }),
+ createMockDatabaseCandidate({
+ id: "1/internal",
+ schema: "internal",
+ tables: [createMockTableCandidate({ title: "People" })],
+ }),
+ ],
+ });
+
+ expect(screen.getByTestId("xray-schema-name")).toHaveTextContent("public");
+ expect(screen.getByText("Orders")).toBeInTheDocument();
+ expect(screen.queryByText("People")).not.toBeInTheDocument();
+
+ await userEvent.click(screen.getByTestId("xray-schema-name"));
+ await userEvent.click(screen.getByRole("option", { name: "internal" }));
+
+ expect(screen.getByTestId("xray-schema-name")).toHaveTextContent(
+ "internal",
+ );
+ expect(screen.getByText("People")).toBeInTheDocument();
+ expect(screen.queryByText("Orders")).not.toBeInTheDocument();
+ });
+
it("should not render a caption when there are no x-rays", async () => {
await setup({
database: createMockDatabase(),
diff --git a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
index 4267946b608..a26ef29f037 100644
--- a/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
+++ b/frontend/src/metabase/monitor/tools/components/Logs/Logs.tsx
@@ -10,9 +10,15 @@ import {
SettingsSection,
} from "metabase/admin/components/SettingsSection";
import { AnsiLogs } from "metabase/common/components/AnsiLogs";
-import { Option, Select } from "metabase/common/components/Select";
import { useUrlState } from "metabase/common/hooks/use-url-state";
-import { Button, Flex, Icon, TextInput } from "metabase/ui";
+import {
+ Button,
+ DefaultSelectItem,
+ Flex,
+ Icon,
+ Select,
+ TextInput,
+} from "metabase/ui";
import { openSaveDialog } from "metabase/utils/dom";
import { LogsContainer, LogsContent } from "./Logs.styled";
@@ -110,24 +116,35 @@ const LogsBase = ({
{processUUIDs.length > 1 && (
<Select
- defaultValue="ALL"
value={process}
- width={400}
- onChange={(e: { target: { value: string } }) => {
- patchUrlState({ process: e.target.value });
- refollow();
+ comboboxProps={{ width: 400, position: "bottom-start" }}
+ data={[
+ { value: "ALL", label: t`All Metabase processes` },
+ ...processUUIDs.map((uuid) => ({
+ value: uuid,
+ label: uuid,
+ })),
+ ]}
+ renderOption={(item) => (
+ <DefaultSelectItem
+ {...item.option}
+ selected={item.checked}
+ label={
+ item.option.value === "ALL" ? (
+ item.option.label
+ ) : (
+ <code>{item.option.label}</code>
+ )
+ }
+ />
+ )}
+ onChange={(value) => {
+ if (value !== null) {
+ patchUrlState({ process: value });
+ refollow();
+ }
}}
- >
- <Option
- value="ALL"
- key="ALL"
- >{t`All Metabase processes`}</Option>
- {processUUIDs.map((uuid) => (
- <Option key={uuid} value={uuid}>
- <code>{uuid}</code>
- </Option>
- ))}
- </Select>
+ />
)}
</Flex>
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
index 58ac8f22461..f14bd7933d9 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx
@@ -235,16 +235,12 @@ describe("ValuesSourceModal", () => {
],
});
- await userEvent.click(
- screen.getByRole("button", { name: /Pick a column/ }),
- );
+ await userEvent.click(screen.getByPlaceholderText(/Pick a column/));
expect(
- screen.queryByRole("heading", { name: "ID" }),
+ screen.queryByRole("option", { name: "ID" }),
).not.toBeInTheDocument();
- await userEvent.click(
- screen.getByRole("heading", { name: "Category" }),
- );
+ await userEvent.click(screen.getByRole("option", { name: "Category" }));
await userEvent.click(screen.getByRole("button", { name: "Done" }));
expect(onSubmit).toHaveBeenCalledWith("card", {
card_id: 1,
@@ -334,12 +330,12 @@ describe("ValuesSourceModal", () => {
screen.getByText("Column to supply the labels"),
).toBeInTheDocument();
- await userEvent.click(screen.getByRole("button", { name: /Title/ }));
- const categoryOption = await screen.findByRole("heading", {
+ await userEvent.click(screen.getByDisplayValue("Title"));
+ const categoryOption = await screen.findByRole("option", {
name: "Category",
});
expect(
- screen.queryByRole("heading", { name: "ID" }),
+ screen.queryByRole("option", { name: "ID" }),
).not.toBeInTheDocument();
await userEvent.click(categoryOption);
@@ -387,8 +383,8 @@ describe("ValuesSourceModal", () => {
],
});
- await userEvent.click(screen.getByRole("button", { name: /Title/ }));
- const noneOption = await screen.findByRole("heading", { name: "None" });
+ await userEvent.click(screen.getByDisplayValue("Title"));
+ const noneOption = await screen.findByRole("option", { name: "None" });
await userEvent.click(noneOption);
await userEvent.click(screen.getByRole("button", { name: "Done" }));
@@ -428,7 +424,9 @@ describe("ValuesSourceModal", () => {
],
});
- expect(screen.getByRole("textbox")).toHaveValue("A\nB\nC");
+ expect(screen.getByRole("textbox", { name: "Values" })).toHaveValue(
+ "A\nB\nC",
+ );
});
it("should display a message when the user has no access to the card", async () => {
@@ -530,7 +528,9 @@ describe("ValuesSourceModal", () => {
}),
],
});
- expect(screen.getByRole("textbox")).toHaveValue("A\nB\nC");
+ expect(screen.getByRole("textbox", { name: "Values" })).toHaveValue(
+ "A\nB\nC",
+ );
await userEvent.click(
screen.getByRole("radio", { name: "Custom list" }),
@@ -938,14 +938,12 @@ describe("ValuesSourceModal", () => {
],
});
- await userEvent.click(
- screen.getByRole("button", { name: /Pick a column/ }),
- );
+ await userEvent.click(screen.getByPlaceholderText(/Pick a column/));
expect(
- screen.queryByRole("heading", { name: "Category" }),
+ screen.queryByRole("option", { name: "Category" }),
).not.toBeInTheDocument();
- await userEvent.click(screen.getByRole("heading", { name: "ID" }));
+ await userEvent.click(screen.getByRole("option", { name: "ID" }));
await userEvent.click(screen.getByRole("button", { name: "Done" }));
expect(onSubmit).toHaveBeenCalledWith("card", {
card_id: 1,
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
index d6b9372a60d..b918b0ccc82 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx
@@ -10,14 +10,12 @@ import {
} from "metabase/api";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { ModalContent } from "metabase/common/components/ModalContent";
-import type { SelectChangeEvent } from "metabase/common/components/Select";
-import { Option, Select } from "metabase/common/components/Select";
import { SelectButton } from "metabase/common/components/SelectButton";
import { connect, useSelector } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
import { getLearnUrl } from "metabase/selectors/settings";
import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";
-import { Box, Button, Flex, Icon, Radio, Stack } from "metabase/ui";
+import { Box, Button, Flex, Icon, Radio, Select, Stack } from "metabase/ui";
import * as Lib from "metabase-lib";
import type Question from "metabase-lib/v1/Question";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
@@ -263,7 +261,12 @@ const FieldSourceModal = ({
{t`We don’t have any cached values for the connected fields. Try one of the other options, or change this widget to a search box.`}
</ModalEmptyState>
) : (
- <ModalTextArea value={valuesText} readOnly fullWidth />
+ <ModalTextArea
+ aria-label={t`Values`}
+ value={valuesText}
+ readOnly
+ fullWidth
+ />
)}
</ModalMain>
</ModalBodyWithPane>
@@ -413,7 +416,12 @@ const CardSourceModal = ({
) : isError ? (
<ModalEmptyState>{t`An error occurred in your query`}</ModalEmptyState>
) : (
- <ModalTextArea value={valuesText} readOnly fullWidth />
+ <ModalTextArea
+ aria-label={t`Values`}
+ value={valuesText}
+ readOnly
+ fullWidth
+ />
)}
</ModalMain>
</ModalBodyWithPane>
@@ -431,6 +439,8 @@ interface ColumnSelectProps {
onChange: (column: Lib.ColumnMetadata | undefined) => void;
}
+const NONE_VALUE = "none";
+
const ColumnSelect = ({
query,
columns,
@@ -441,35 +451,36 @@ const ColumnSelect = ({
withNoneOption,
onChange,
}: ColumnSelectProps) => {
- const handleChange = useCallback(
- (event: SelectChangeEvent<Lib.ColumnMetadata | undefined>) => {
- onChange(event.target.value);
- },
- [onChange],
- );
+ const value = (() => {
+ const selectedIndex =
+ selectedColumn !== undefined ? columns.indexOf(selectedColumn) : -1;
+ if (selectedIndex >= 0) {
+ return String(selectedIndex);
+ }
+ return withNoneOption ? NONE_VALUE : null;
+ })();
+
+ const handleChange = (newValue: string | null) => {
+ const isColumnSelected = newValue !== null && newValue !== NONE_VALUE;
+ onChange(isColumnSelected ? columns[Number(newValue)] : undefined);
+ };
return (
<ModalSection>
<ModalLabel>{label}</ModalLabel>
{columns.length > 0 ? (
<Select
- value={selectedColumn}
+ value={value}
placeholder={placeholder}
- onChange={handleChange}
- >
- {[
- ...(withNoneOption
- ? [<Option key="none" name={t`None`} value={undefined} />]
- : []),
- ...columns.map((column, index) => (
- <Option
- key={index}
- name={Lib.displayInfo(query, STAGE_INDEX, column).displayName}
- value={column}
- />
- )),
+ data={[
+ ...(withNoneOption ? [{ value: NONE_VALUE, label: t`None` }] : []),
+ ...columns.map((column, index) => ({
+ value: String(index),
+ label: Lib.displayInfo(query, STAGE_INDEX, column).displayName,
+ })),
]}
- </Select>
+ onChange={handleChange}
+ />
) : emptyMessage != null ? (
<ModalErrorMessage>{emptyMessage}</ModalErrorMessage>
) : null}
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
index ab0e6a3c4a0..18c949660e6 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/common.unit.spec.tsx
@@ -194,14 +194,12 @@ describe("ValuesSourceModal", () => {
],
});
- await userEvent.click(
- screen.getByRole("button", { name: /Pick a column/ }),
- );
+ await userEvent.click(screen.getByPlaceholderText(/Pick a column/));
expect(
- screen.queryByRole("heading", { name: "ID" }),
+ screen.queryByRole("option", { name: "ID" }),
).not.toBeInTheDocument();
- await userEvent.click(screen.getByRole("heading", { name: "Category" }));
+ await userEvent.click(screen.getByRole("option", { name: "Category" }));
await userEvent.click(screen.getByRole("button", { name: "Done" }));
expect(onSubmit).toHaveBeenCalledWith("card", {
card_id: 1,
@@ -237,7 +235,9 @@ describe("ValuesSourceModal", () => {
],
});
- expect(screen.getByRole("textbox")).toHaveValue("A\nB\nC");
+ expect(screen.getByRole("textbox", { name: "Values" })).toHaveValue(
+ "A\nB\nC",
+ );
});
it("should display a message when the user has no access to the card", async () => {
@@ -335,7 +335,9 @@ describe("ValuesSourceModal", () => {
}),
],
});
- expect(screen.getByRole("textbox")).toHaveValue("A\nB\nC");
+ expect(screen.getByRole("textbox", { name: "Values" })).toHaveValue(
+ "A\nB\nC",
+ );
await userEvent.click(screen.getByRole("radio", { name: "Custom list" }));
expect(screen.getByRole("radio", { name: "Custom list" })).toBeChecked();