diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/index.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/index.js index ed9552b1c4..ae1047ce9a 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/index.js @@ -20,6 +20,7 @@ import isImageType from './utils/isImageType'; const EditForm = ({ fileToEdit, onChange, + onClickDeleteFileToUpload, onSubmitEditNewFile, setCropResult, }) => { @@ -123,6 +124,10 @@ const EditForm = ({ setIsCropping(false); }; + const handleClickDelete = () => { + onClickDeleteFileToUpload(fileToEdit.originalIndex); + }; + const handleSubmit = e => { e.preventDefault(); @@ -139,7 +144,11 @@ const EditForm = ({ {!isCropping ? ( <> - + {canCrop && ( {}, + onClickDeleteFileToUpload: () => {}, onSubmitEditNewFile: e => e.preventDefault(), setCropResult: () => {}, }; @@ -241,6 +251,7 @@ EditForm.defaultProps = { EditForm.propTypes = { fileToEdit: PropTypes.object, onChange: PropTypes.func, + onClickDeleteFileToUpload: PropTypes.func, onSubmitEditNewFile: PropTypes.func, setCropResult: PropTypes.func, }; diff --git a/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js b/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js index 2c403a8498..80c71fecbf 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js +++ b/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js @@ -55,6 +55,21 @@ const ModalStepper = ({ isOpen, onToggle }) => { }); }; + const handleClickDeleteFileToUpload = fileIndex => { + dispatch({ + type: 'REMOVE_FILE_TO_UPLOAD', + fileIndex, + }); + + if (currentStep === 'edit-new') { + dispatch({ + type: 'RESET_FILE_TO_EDIT', + }); + + goNext(); + } + }; + const handleClosed = () => { dispatch({ type: 'RESET_PROPS', @@ -198,6 +213,7 @@ const ModalStepper = ({ isOpen, onToggle }) => { fileToEdit={fileToEdit} filesToUpload={filesToUpload} onClickCancelUpload={handleCancelFileToUpload} + onClickDeleteFileToUpload={handleClickDeleteFileToUpload} onClickEditNewFile={handleGoToEditNewFile} onGoToAddBrowseFiles={handleGoToAddBrowseFiles} onSubmitEditNewFile={handleSubmitEditNewFile} diff --git a/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/reducer.js b/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/reducer.js index 1fb48f77ca..0cd589c307 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/reducer.js +++ b/packages/strapi-plugin-upload/admin/src/containers/ModalStepper/reducer.js @@ -40,6 +40,8 @@ const reducer = (state, action) => { data => data.get('originalIndex') !== action.fileIndex ); }); + case 'RESET_FILE_TO_EDIT': + return state.update('fileToEdit', () => null); case 'RESET_PROPS': return initialState; case 'SET_CROP_RESULT': {