From 8eb105c7d6d683468aea302f25568411088786cc Mon Sep 17 00:00:00 2001
From: Aleksandr Lesnenko <alxnddr@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:42:12 -0500
Subject: [PATCH] update subscription checkboxes (#49805)
* update subscription checkboxes
* update spec
---
.../sharing/subscriptions.cy.spec.js | 3 ++-
.../components/EmailAttachmentPicker.jsx | 23 ++++++-------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js b/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
index c5864298cd1..ffd7dadd033 100644
--- a/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
+++ b/e2e/test/scenarios/sharing/subscriptions.cy.spec.js
@@ -332,7 +332,8 @@ describe("scenarios > dashboard > subscriptions", () => {
// eslint-disable-next-line no-unscoped-text-selectors -- deprecated usage
cy.findByText("Questions to attach");
cy.findAllByRole("listitem")
- .contains("Orders") // yields the whole <li> element
+ .contains("Orders")
+ .closest("li")
.within(() => {
cy.findByRole("checkbox").should("be.checked");
});
diff --git a/frontend/src/metabase/sharing/components/EmailAttachmentPicker.jsx b/frontend/src/metabase/sharing/components/EmailAttachmentPicker.jsx
index cfe124c4f46..b39d590c4a1 100644
--- a/frontend/src/metabase/sharing/components/EmailAttachmentPicker.jsx
+++ b/frontend/src/metabase/sharing/components/EmailAttachmentPicker.jsx
@@ -5,11 +5,9 @@ import { t } from "ttag";
import _ from "underscore";
import { ExportSettingsWidget } from "metabase/common/components/ExportSettingsWidget";
-import { StackedCheckBox } from "metabase/components/StackedCheckBox";
-import CheckBox from "metabase/core/components/CheckBox";
import Toggle from "metabase/core/components/Toggle";
import CS from "metabase/css/core/index.css";
-import { Box, Group, Icon, Text } from "metabase/ui";
+import { Box, Checkbox, Group, Icon, Text } from "metabase/ui";
export default class EmailAttachmentPicker extends Component {
DEFAULT_ATTACHMENT_TYPE = "csv";
@@ -269,7 +267,6 @@ export default class EmailAttachmentPicker extends Component {
</Box>
<div
className={cx(
- CS.textBold,
CS.pt1,
CS.pb2,
CS.flex,
@@ -288,7 +285,8 @@ export default class EmailAttachmentPicker extends Component {
CS.borderBottom,
)}
>
- <StackedCheckBox
+ <Checkbox
+ variant="stacked"
label={t`Questions to attach`}
checked={this.areAllSelected(cards, selectedCardIds)}
indeterminate={this.areOnlySomeSelected(
@@ -299,22 +297,15 @@ export default class EmailAttachmentPicker extends Component {
/>
</li>
{cards.map(card => (
- <li
- key={card.id}
- className={cx(
- CS.pb2,
- CS.flex,
- CS.alignCenter,
- CS.cursorPointer,
- )}
- >
- <CheckBox
+ <li key={card.id}>
+ <Checkbox
+ mb="1rem"
+ mr="0.5rem"
checked={selectedCardIds.has(card.id)}
label={card.name}
onChange={() => {
this.onToggleCard(card);
}}
- className={CS.mr1}
/>
</li>
))}
--
GitLab