From e3bc848263dc0d3024c0ae4c88791a30a010340f Mon Sep 17 00:00:00 2001 From: saltrafael Date: Mon, 13 Sep 2021 07:38:21 -0300 Subject: [PATCH] Add cb to thumbnail upload --- dist/bundle.es.js | 10 +++++++--- src/redux/actions/publish.js | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dist/bundle.es.js b/dist/bundle.es.js index e576ba1..8a8a9d0 100644 --- a/dist/bundle.es.js +++ b/dist/bundle.es.js @@ -5628,7 +5628,7 @@ const doUpdatePublishForm = publishFormValue => dispatch => dispatch({ data: _extends$7({}, publishFormValue) }); -const doUploadThumbnail = (filePath, thumbnailBlob, fsAdapter, fs, path) => dispatch => { +const doUploadThumbnail = (filePath, thumbnailBlob, fsAdapter, fs, path, cb) => dispatch => { const downMessage = __('Thumbnail upload service may be down, try again later.'); let thumbnail, fileExt, fileName, fileType; @@ -5662,13 +5662,17 @@ const doUploadThumbnail = (filePath, thumbnailBlob, fsAdapter, fs, path) => disp method: 'POST', body: data }).then(res => res.text()).then(text => text.length ? JSON.parse(text) : {}).then(json => { - return json.success ? dispatch({ + if (!json.success) return uploadError(json.message || downMessage); + if (cb) { + cb(json.data.serveUrl); + } + return dispatch({ type: UPDATE_PUBLISH_FORM, data: { uploadThumbnailStatus: COMPLETE, thumbnail: json.data.serveUrl } - }) : uploadError(json.message || downMessage); + }); }).catch(err => { let message = err.message; diff --git a/src/redux/actions/publish.js b/src/redux/actions/publish.js index 36222c0..239a9bd 100644 --- a/src/redux/actions/publish.js +++ b/src/redux/actions/publish.js @@ -69,7 +69,8 @@ export const doUploadThumbnail = ( thumbnailBlob?: File, fsAdapter?: any, fs?: any, - path?: any + path?: any, + cb?: (string) => void ) => (dispatch: Dispatch) => { const downMessage = __('Thumbnail upload service may be down, try again later.'); let thumbnail, fileExt, fileName, fileType; @@ -112,15 +113,17 @@ export const doUploadThumbnail = ( .then(res => res.text()) .then(text => (text.length ? JSON.parse(text) : {})) .then(json => { - return json.success - ? dispatch({ - type: ACTIONS.UPDATE_PUBLISH_FORM, - data: { - uploadThumbnailStatus: THUMBNAIL_STATUSES.COMPLETE, - thumbnail: json.data.serveUrl, - }, - }) - : uploadError(json.message || downMessage); + if (!json.success) return uploadError(json.message || downMessage); + if (cb) { + cb(json.data.serveUrl); + } + return dispatch({ + type: ACTIONS.UPDATE_PUBLISH_FORM, + data: { + uploadThumbnailStatus: THUMBNAIL_STATUSES.COMPLETE, + thumbnail: json.data.serveUrl, + }, + }); }) .catch(err => { let message = err.message;