diff --git a/assets/js/src/subscribers/importExport/import.jsx b/assets/js/src/subscribers/importExport/import.jsx index a173f8069b..bf5a2d081c 100644 --- a/assets/js/src/subscribers/importExport/import.jsx +++ b/assets/js/src/subscribers/importExport/import.jsx @@ -13,7 +13,7 @@ const container = document.getElementById('import_container'); const subscribersLimitForValidation = 500; const ImportSubscribers = () => { - const [stepMethodSelection, setStepMethodSelection] = useState(undefined); + const [stepMethodSelectionData, setStepMethodSelectionData] = useState(undefined); return ( @@ -22,7 +22,7 @@ const ImportSubscribers = () => { render={props => ( )} @@ -32,7 +32,7 @@ const ImportSubscribers = () => { render={props => ( )} /> @@ -41,7 +41,7 @@ const ImportSubscribers = () => { render={props => ( )} 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 5a77ad9fcf..cdf289c2d9 100644 --- a/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx +++ b/assets/js/src/subscribers/importExport/import/step_data_manipulation.jsx @@ -18,16 +18,16 @@ function getPreviousStepLink(importData, subscribersLimitForValidation) { function StepDataManipulation({ history, - stepMethodSelection, + stepMethodSelectionData, subscribersLimitForValidation, }) { useEffect( () => { - if (typeof (stepMethodSelection) === 'undefined') { + if (typeof (stepMethodSelectionData) === 'undefined') { history.replace('step_method_selection'); } }, - [stepMethodSelection], + [stepMethodSelectionData], ); return ( @@ -35,7 +35,7 @@ function StepDataManipulation({ ( - history.push(getPreviousStepLink(stepMethodSelection, subscribersLimitForValidation)) + history.push(getPreviousStepLink(stepMethodSelectionData, subscribersLimitForValidation)) )} onNextAction={() => history.push('todo')} /> @@ -48,7 +48,7 @@ StepDataManipulation.propTypes = { push: PropTypes.func.isRequired, replace: PropTypes.func.isRequired, }).isRequired, - stepMethodSelection: PropTypes.shape({ + stepMethodSelectionData: PropTypes.shape({ duplicate: PropTypes.arrayOf(PropTypes.string), header: PropTypes.arrayOf(PropTypes.string), invalid: PropTypes.arrayOf(PropTypes.string), @@ -60,7 +60,7 @@ StepDataManipulation.propTypes = { }; StepDataManipulation.defaultProps = { - stepMethodSelection: undefined, + stepMethodSelectionData: undefined, }; export default withRouter(StepDataManipulation); diff --git a/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx b/assets/js/src/subscribers/importExport/import/step_data_manipulation/warnings.jsx new file mode 100644 index 0000000000..e69de29bb2 diff --git a/assets/js/src/subscribers/importExport/import/step_input_validation.jsx b/assets/js/src/subscribers/importExport/import/step_input_validation.jsx index 4ac6026912..48170f7d67 100644 --- a/assets/js/src/subscribers/importExport/import/step_input_validation.jsx +++ b/assets/js/src/subscribers/importExport/import/step_input_validation.jsx @@ -50,7 +50,7 @@ class StepInputValidation extends Component { } componentDidMount() { - if (typeof (this.props.stepMethodSelection) === 'undefined') { + if (typeof (this.props.stepMethodSelectionData) === 'undefined') { this.props.history.replace('step_method_selection'); } } @@ -132,7 +132,7 @@ StepInputValidation.propTypes = { push: PropTypes.func.isRequired, replace: PropTypes.func.isRequired, }).isRequired, - stepMethodSelection: PropTypes.shape({ + stepMethodSelectionData: PropTypes.shape({ duplicate: PropTypes.arrayOf(PropTypes.string), header: PropTypes.arrayOf(PropTypes.string), invalid: PropTypes.arrayOf(PropTypes.string), @@ -143,7 +143,7 @@ StepInputValidation.propTypes = { }; StepInputValidation.defaultProps = { - stepMethodSelection: undefined, + stepMethodSelectionData: undefined, }; export default withRouter(StepInputValidation); diff --git a/assets/js/src/subscribers/importExport/import/step_method_selection.jsx b/assets/js/src/subscribers/importExport/import/step_method_selection.jsx index d2a4cdcb36..3fd91f4df5 100644 --- a/assets/js/src/subscribers/importExport/import/step_method_selection.jsx +++ b/assets/js/src/subscribers/importExport/import/step_method_selection.jsx @@ -23,7 +23,7 @@ const getNextStepLink = (importData, subscribersLimitForValidation) => { function StepMethodSelection({ history, - setStepMethodSelection, + setStepMethodSelectionData, subscribersLimitForValidation, }) { const [method, setMethod] = useState(undefined); @@ -31,7 +31,7 @@ function StepMethodSelection({ const [file, setFile] = useState(undefined); const finish = (parsedData) => { - setStepMethodSelection(parsedData); + setStepMethodSelectionData(parsedData); history.push(getNextStepLink(parsedData, subscribersLimitForValidation)); }; @@ -93,7 +93,7 @@ StepMethodSelection.propTypes = { history: PropTypes.shape({ push: PropTypes.func.isRequired, }).isRequired, - setStepMethodSelection: PropTypes.func.isRequired, + setStepMethodSelectionData: PropTypes.func.isRequired, subscribersLimitForValidation: PropTypes.number.isRequired, };