diff --git a/frontend/src/metabase/components/Confirm.jsx b/frontend/src/metabase/components/Confirm.jsx index 1ae1782008c47726cfacb18075742effe1dd2120..18a00a2f55170b674f33c2d0f100484e44e2d648 100644 --- a/frontend/src/metabase/components/Confirm.jsx +++ b/frontend/src/metabase/components/Confirm.jsx @@ -15,13 +15,25 @@ export default class Confirm extends Component { static propTypes = { action: PropTypes.func.isRequired, title: PropTypes.string.isRequired, + message: PropTypes.string, + confirmButtonText: PropTypes.string, + cancelButtonText: PropTypes.string, children: PropTypes.any, content: PropTypes.any, triggerClasses: PropTypes.string, }; render() { - const { action, children, title, content, triggerClasses } = this.props; + const { + action, + children, + title, + content, + message, + confirmButtonText, + cancelButtonText, + triggerClasses, + } = this.props; return ( <ModalWithTrigger ref={this.modal} @@ -31,6 +43,9 @@ export default class Confirm extends Component { <ConfirmContent title={title} content={content} + message={message} + confirmButtonText={confirmButtonText} + cancelButtonText={cancelButtonText} onClose={() => { this.modal.current.close(); }} diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx index 72298f8ce4b329b80f1ab21300ef1ce239001839..5b1f454e5a53d109267c25bfe423836e0ceaa92d 100644 --- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx +++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.jsx @@ -440,7 +440,9 @@ function DatasetEditor(props) { <Confirm key="cancel" action={handleCancelCreate} - title={t`Cancel creating model`} + title={t`Discard changes?`} + message={t`Your model won't be created.`} + confirmButtonText={t`Discard`} > <Button small>{t`Cancel`}</Button> </Confirm> diff --git a/frontend/test/metabase/scenarios/models/create.cy.spec.js b/frontend/test/metabase/scenarios/models/create.cy.spec.js index dcac6a4467d02d6e9ceb8db68eb90dd6d3454895..637993b1178c2fe81138177b63770c3c96a9ca66 100644 --- a/frontend/test/metabase/scenarios/models/create.cy.spec.js +++ b/frontend/test/metabase/scenarios/models/create.cy.spec.js @@ -14,7 +14,7 @@ describe("scenarios > models > create", () => { // Cancel creation with confirmation modal cy.findByText("Cancel").click(); - cy.findByText("Yes").click(); + cy.findByText("Discard").click(); // Now we will create a model goFromHomePageToNewNativeQueryModelPage();