Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update for MediaPlaceholder component: don't stack error messages when re-uploading #14721

Merged
merged 10 commits into from
Jun 10, 2019
Merged

Update for MediaPlaceholder component: don't stack error messages when re-uploading #14721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b4cab7
Used removeAllNotices in onUploadError.
nicolad Mar 30, 2019
ccf06b9
Updated GalleryEdit.
nicolad Mar 30, 2019
f778df6
Updated MediaTextEdit.
nicolad Mar 30, 2019
addfd5e
Updated VideoEdit.
nicolad Mar 30, 2019
c65c330
Updated CoverEdit.
nicolad Mar 30, 2019
39e7395
Updated FileEdit.
nicolad Mar 30, 2019
30a65be
Merge branch 'master' into mediaplaceholder-uploading-messages
nicolad Mar 31, 2019
5fbf85c
Conflicts fixed.
nicolad Apr 20, 2019
40eb5cc
Merge branch 'master' into mediaplaceholder-uploading-messages
nicolad May 25, 2019
d3c5861
Fixed tab spaces.
nicolad May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/block-library/src/audio/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class AudioEdit extends Component {

this.toggleAttribute = this.toggleAttribute.bind( this );
this.onSelectURL = this.onSelectURL.bind( this );
this.onUploadError = this.onUploadError.bind( this );
}

componentDidMount() {
Expand Down Expand Up @@ -98,13 +99,19 @@ class AudioEdit extends Component {
this.setState( { editing: false } );
}

onUploadError( message ) {
nicolad marked this conversation as resolved.
Show resolved Hide resolved
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

getAutoplayHelp( checked ) {
return checked ? __( 'Note: Autoplaying audio may cause usability issues for some visitors.' ) : null;
}

render() {
const { autoplay, caption, loop, preload, src } = this.props.attributes;
const { setAttributes, isSelected, className, noticeOperations, noticeUI } = this.props;
const { setAttributes, isSelected, className, noticeUI } = this.props;
const { editing } = this.state;
const switchToEditing = () => {
this.setState( { editing: true } );
Expand Down Expand Up @@ -133,7 +140,7 @@ class AudioEdit extends Component {
allowedTypes={ ALLOWED_MEDIA_TYPES }
value={ this.props.attributes }
notices={ noticeUI }
onError={ noticeOperations.createErrorNotice }
onError={ this.onUploadError }
/>
);
}
Expand Down
10 changes: 8 additions & 2 deletions packages/block-library/src/cover/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class CoverEdit extends Component {
this.imageRef = createRef();
this.videoRef = createRef();
this.changeIsDarkIfRequired = this.changeIsDarkIfRequired.bind( this );
this.onUploadError = this.onUploadError.bind( this );
}

componentDidMount() {
Expand All @@ -82,12 +83,17 @@ class CoverEdit extends Component {
this.handleBackgroundMode( prevProps );
}

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

render() {
const {
attributes,
setAttributes,
className,
noticeOperations,
noticeUI,
overlayColor,
setOverlayColor,
Expand Down Expand Up @@ -243,7 +249,7 @@ class CoverEdit extends Component {
accept="image/*,video/*"
allowedTypes={ ALLOWED_MEDIA_TYPES }
notices={ noticeUI }
onError={ noticeOperations.createErrorNotice }
onError={ this.onUploadError }
/>
</>
);
Expand Down
10 changes: 8 additions & 2 deletions packages/block-library/src/file/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class FileEdit extends Component {
this.changeLinkDestinationOption = this.changeLinkDestinationOption.bind( this );
this.changeOpenInNewWindow = this.changeOpenInNewWindow.bind( this );
this.changeShowDownloadButton = this.changeShowDownloadButton.bind( this );
this.onUploadError = this.onUploadError.bind( this );

this.state = {
hasError: false,
Expand Down Expand Up @@ -100,6 +101,12 @@ class FileEdit extends Component {
}
}

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

confirmCopyURL() {
this.setState( { showCopyConfirmation: true } );
}
Expand Down Expand Up @@ -130,7 +137,6 @@ class FileEdit extends Component {
attributes,
setAttributes,
noticeUI,
noticeOperations,
media,
} = this.props;
const {
Expand All @@ -155,7 +161,7 @@ class FileEdit extends Component {
} }
onSelect={ this.onSelectFile }
notices={ noticeUI }
onError={ noticeOperations.createErrorNotice }
onError={ this.onUploadError }
accept="*"
/>
);
Expand Down
11 changes: 9 additions & 2 deletions packages/block-library/src/gallery/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class GalleryEdit extends Component {
this.onMoveForward = this.onMoveForward.bind( this );
this.onMoveBackward = this.onMoveBackward.bind( this );
this.onRemoveImage = this.onRemoveImage.bind( this );
this.onUploadError = this.onUploadError.bind( this );
this.setImageAttributes = this.setImageAttributes.bind( this );
this.setAttributes = this.setAttributes.bind( this );

Expand Down Expand Up @@ -133,6 +134,12 @@ class GalleryEdit extends Component {
} );
}

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

setLinkTo( value ) {
this.setAttributes( { linkTo: value } );
}
Expand Down Expand Up @@ -178,7 +185,7 @@ class GalleryEdit extends Component {
}

render() {
const { attributes, isSelected, className, noticeOperations, noticeUI } = this.props;
const { attributes, isSelected, className, noticeUI } = this.props;
const { images, columns = defaultColumnsNumber( attributes ), align, imageCrop, linkTo } = attributes;

const hasImages = !! images.length;
Expand Down Expand Up @@ -223,7 +230,7 @@ class GalleryEdit extends Component {
allowedTypes={ ALLOWED_MEDIA_TYPES }
multiple
value={ hasImages ? images : undefined }
onError={ noticeOperations.createErrorNotice }
onError={ this.onUploadError }
notices={ hasImages ? undefined : noticeUI }
/>
);
Expand Down
1 change: 1 addition & 0 deletions packages/block-library/src/image/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ class ImageEdit extends Component {

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
this.setState( {
isEditing: true,
Expand Down
19 changes: 16 additions & 3 deletions packages/block-library/src/media-text/media-container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import { IconButton, ResizableBox, Toolbar } from '@wordpress/components';
import { IconButton, ResizableBox, Toolbar, withNotices } from '@wordpress/components';
import {
BlockControls,
BlockIcon,
Expand Down Expand Up @@ -31,6 +31,17 @@ export function imageFillStyles( url, focalPoint ) {
}

class MediaContainer extends Component {
constructor() {
super( ...arguments );
this.onUploadError = this.onUploadError.bind( this );
}

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

renderToolbarEditButton() {
const { mediaId, onSelectMedia } = this.props;
return (
Expand Down Expand Up @@ -80,7 +91,7 @@ class MediaContainer extends Component {
}

renderPlaceholder() {
const { onSelectMedia, className } = this.props;
const { onSelectMedia, className, noticeUI } = this.props;
return (
<MediaPlaceholder
icon={ <BlockIcon icon={ icon } /> }
Expand All @@ -91,6 +102,8 @@ class MediaContainer extends Component {
onSelect={ onSelectMedia }
accept="image/*,video/*"
allowedTypes={ ALLOWED_MEDIA_TYPES }
notices={ noticeUI }
Copy link
Member Author

@nicolad nicolad Mar 30, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noticeUI is not fitting properly here, should be addressed in a separate PR:
image

onError={ this.onUploadError }
/>
);
}
Expand Down Expand Up @@ -137,4 +150,4 @@ class MediaContainer extends Component {
}
}

export default MediaContainer;
export default withNotices( MediaContainer );
10 changes: 8 additions & 2 deletions packages/block-library/src/video/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class VideoEdit extends Component {
this.onSelectURL = this.onSelectURL.bind( this );
this.onSelectPoster = this.onSelectPoster.bind( this );
this.onRemovePoster = this.onRemovePoster.bind( this );
this.onUploadError = this.onUploadError.bind( this );
}

componentDidMount() {
Expand Down Expand Up @@ -126,6 +127,12 @@ class VideoEdit extends Component {
this.posterImageButton.current.focus();
}

onUploadError( message ) {
const { noticeOperations } = this.props;
noticeOperations.removeAllNotices();
noticeOperations.createErrorNotice( message );
}

getAutoplayHelp( checked ) {
return checked ? __( 'Note: Autoplaying videos may cause usability issues for some visitors.' ) : null;
}
Expand All @@ -146,7 +153,6 @@ class VideoEdit extends Component {
className,
instanceId,
isSelected,
noticeOperations,
noticeUI,
setAttributes,
} = this.props;
Expand Down Expand Up @@ -179,7 +185,7 @@ class VideoEdit extends Component {
allowedTypes={ ALLOWED_MEDIA_TYPES }
value={ this.props.attributes }
notices={ noticeUI }
onError={ noticeOperations.createErrorNotice }
onError={ this.onUploadError }
/>
);
}
Expand Down