From d96f6efb63ae90b32d0ff0512a2cf50fb798af4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= Date: Tue, 27 Oct 2020 17:32:17 +0100 Subject: [PATCH] Show next button in last import step as "Import" [MAILPOET-3073] --- .../importExport/import/previous_next_step_buttons.jsx | 5 ++++- .../importExport/import/step_data_manipulation.jsx | 1 + views/subscribers/importExport/import.html | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx b/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx index 972f672243..93bdfd014a 100644 --- a/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx +++ b/assets/js/src/subscribers/importExport/import/previous_next_step_buttons.jsx @@ -5,6 +5,7 @@ import Button from 'common/button/button'; const PreviousNextStepButtons = ({ hidePrevious, + isLastStep, canGoNext, onPreviousAction, onNextAction, @@ -25,7 +26,7 @@ const PreviousNextStepButtons = ({ } }} > - {MailPoet.I18n.t('nextStep')} + {MailPoet.I18n.t(isLastStep ? 'import' : 'nextStep')} ); @@ -33,12 +34,14 @@ const PreviousNextStepButtons = ({ PreviousNextStepButtons.propTypes = { canGoNext: PropTypes.bool, hidePrevious: PropTypes.bool, + isLastStep: PropTypes.bool, onPreviousAction: PropTypes.func, onNextAction: PropTypes.func, }; PreviousNextStepButtons.defaultProps = { hidePrevious: false, + isLastStep: false, canGoNext: true, onPreviousAction: () => {}, onNextAction: () => {}, diff --git a/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx b/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx index 25c422bec5..a1a5c11ca2 100644 --- a/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx +++ b/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx @@ -91,6 +91,7 @@ function StepDataManipulation({ ) )} onNextAction={importSubscribers} + isLastStep /> diff --git a/views/subscribers/importExport/import.html b/views/subscribers/importExport/import.html index 1535719304..a1f359043c 100644 --- a/views/subscribers/importExport/import.html +++ b/views/subscribers/importExport/import.html @@ -98,6 +98,7 @@ 'validationStepLastSentNext': __('Next'), 'previousStep': __('Previous step'), 'nextStep': __('Next step'), +'import': __('Import'), 'seeVideo': __(' See video guide'), 'importAgain': __('Import again'), 'viewSubscribers': __('View subscribers'),