From a8d0c05bba9d72100d7066478a7a98875eaf10bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 27 Aug 2024 11:11:46 +0100 Subject: [PATCH 1/5] Post publish upload media dialog: handle upload errors --- .../components/post-publish-panel/maybe-upload-media.js | 8 ++++++++ .../editor/src/components/post-publish-panel/style.scss | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js index 609864e01716a..47829ca58f36c 100644 --- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js +++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js @@ -61,6 +61,7 @@ function Image( block ) { export default function PostFormatPanel() { const [ isUploading, setIsUploading ] = useState( false ); const [ isAnimating, setIsAnimating ] = useState( false ); + const [ hadUploadError, setHadUploadError ] = useState( false ); const { editorBlocks, mediaUpload } = useSelect( ( select ) => ( { editorBlocks: select( blockEditorStore ).getBlocks(), @@ -89,6 +90,7 @@ export default function PostFormatPanel() { function uploadImages() { setIsUploading( true ); + setHadUploadError( false ); Promise.all( externalImages.map( ( image ) => window @@ -114,6 +116,7 @@ export default function PostFormatPanel() { resolve(); }, onError() { + setHadUploadError( true ); reject(); }, } ); @@ -154,6 +157,11 @@ export default function PostFormatPanel() { ) } + { hadUploadError && ( +

+ { __( 'Upload failed, try again.' ) } +

+ ) } ); } diff --git a/packages/editor/src/components/post-publish-panel/style.scss b/packages/editor/src/components/post-publish-panel/style.scss index bcd7c798c7e9f..24810880735d5 100644 --- a/packages/editor/src/components/post-publish-panel/style.scss +++ b/packages/editor/src/components/post-publish-panel/style.scss @@ -185,6 +185,10 @@ color: $alert-yellow; } +.post-publish-panel__error { + color: $alert-red; +} + @media screen and (max-width: 782px) { .post-publish-panel__postpublish-post-address__button-wrap { // match copy button height to the address field height in smaller screens From 8a864a16a6a43239ec16ffb5fe47c0a48ec72f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 27 Aug 2024 11:26:44 +0100 Subject: [PATCH 2/5] Change text color --- packages/editor/src/components/post-publish-panel/style.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/editor/src/components/post-publish-panel/style.scss b/packages/editor/src/components/post-publish-panel/style.scss index 24810880735d5..bcd7c798c7e9f 100644 --- a/packages/editor/src/components/post-publish-panel/style.scss +++ b/packages/editor/src/components/post-publish-panel/style.scss @@ -185,10 +185,6 @@ color: $alert-yellow; } -.post-publish-panel__error { - color: $alert-red; -} - @media screen and (max-width: 782px) { .post-publish-panel__postpublish-post-address__button-wrap { // match copy button height to the address field height in smaller screens From 2c4ad77b87f298ed589056c373282d91825c943a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 27 Aug 2024 11:48:29 +0100 Subject: [PATCH 3/5] Drop unused classname --- .../src/components/post-publish-panel/maybe-upload-media.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js index 47829ca58f36c..12870caa57a55 100644 --- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js +++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js @@ -157,11 +157,7 @@ export default function PostFormatPanel() { ) } - { hadUploadError && ( -

- { __( 'Upload failed, try again.' ) } -

- ) } + { hadUploadError &&

{ __( 'Upload failed, try again.' ) }

} ); } From e11ed354f7a14cdf24387c47b711fc8a3d3dc080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 27 Aug 2024 14:18:20 +0100 Subject: [PATCH 4/5] Add catch-all for any errors during upload --- .../src/components/post-publish-panel/maybe-upload-media.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js index 12870caa57a55..d57263367da59 100644 --- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js +++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js @@ -122,6 +122,9 @@ export default function PostFormatPanel() { } ); } ).then( () => setIsAnimating( true ) ) ) + .catch( () => { + setHadUploadError( true ); + } ) ) ).finally( () => { setIsUploading( false ); From 5340bb82f71e5aa83848bb34a85bd95a7a83e4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Gomes?= Date: Tue, 27 Aug 2024 14:19:23 +0100 Subject: [PATCH 5/5] Remove redundant setHadUploadError call --- .../src/components/post-publish-panel/maybe-upload-media.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js index d57263367da59..b740ef6f345ec 100644 --- a/packages/editor/src/components/post-publish-panel/maybe-upload-media.js +++ b/packages/editor/src/components/post-publish-panel/maybe-upload-media.js @@ -116,7 +116,6 @@ export default function PostFormatPanel() { resolve(); }, onError() { - setHadUploadError( true ); reject(); }, } );