Mobile Stories block (part 6): rewrote StoryEdit class as a function #17549
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng to this branch" This reverts commit 34349b1.
…eProgress overlay
…to the mediaFiles attribute of a Story block once such a mediaModel is created
…uploading succesfully
…iaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount()
…ies-block-mobile-on-done
…n mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions
…n handle media picking from the StoryComposer
…ack-stories-empty-block-editing
mzorz
added
[Type] Enhancement
This was referenced Oct 20, 2020
Merged
etoledom
approved these changes
Oct 26, 2020
Comment on lines
47
to
49
| function isUrlRemote( protocolForUrl ) { | ||
| return protocolForUrl === 'http:' || protocolForUrl === 'https:'; | ||
| } |
There was a problem hiding this comment.
There is a prependHTTP function in @wordpress/url that might be used here instead.
Is isUrlRemote used at all? 🤔
There was a problem hiding this comment.
oops you're right! Removed it in d440e25 👍
Base automatically changed from
try/jetpack-stories-empty-block-editing
to
try/jetpack-stories-block-mobile
October 27, 2020 09:40
|
Thanks once more for your review @etoledom ! 🎉 🙇 😄 |
mzorz
added a commit
that referenced
this pull request
Nov 10, 2020
* basic scaffolding for the Story block on mobile editor * added flex alignment and actual mediaFiles attribute rendering * applying styles to stories block view * removed unused alignment * added StoryEditingButton and showing it when the story block is selected * connecting StoryEditingButton with bridge's requestStoryCreatorLoad * updated requestStoryCreatorLoad call to pass block's mediaFiles and clientId over the bridge * added new component StoryUpdateProgress * Revert "added new component StoryUpdateProgress", not belonging to this branch This reverts commit 86fb956. * fixed lint warnings * changed the no longer existing color dark-gray-500 removed in WordPress/gutenberg@162bc50 with gray-700 * added package-lock.json * Mobile Stories block (part 2): introduce StoryUpdateProgress (#17222) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * Mobile Stories block (part 3): rename using BlockMediaUpdateProgress (#17456) * using BlockMediaUpdateProgress * method rename * updated (automatically modified) package-lock.json * removed package-lock.json * moved condition check for http or https to helper method isUrlRemote() * calling mediaUploadSync and mediaSaveSync regardless of ids, we always will want to receive updates on all 3 stages * fixed spelling * Mobile Stories block (part 4): error handling (#17458) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * replaced for loops with map * Mobile Stories block (part 5): add empty placeholder (#17539) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * importing defined const MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO instead of re-defining * made placeholder container look as per any other media placeholder, reservign the Story style container for populated Story blocks * Mobile Stories block (part 6): rewrote StoryEdit class as a function (#17549) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * rewrote StoryEdit class as a function * removed unused imports * removed unused function * story block: set inserter support to false for web, but keep it for mobile (#17690) * renamed params to avoid name shadowing
cameronvoell
pushed a commit
that referenced
this pull request
Nov 14, 2020
* basic scaffolding for the Story block on mobile editor * added flex alignment and actual mediaFiles attribute rendering * applying styles to stories block view * removed unused alignment * added StoryEditingButton and showing it when the story block is selected * connecting StoryEditingButton with bridge's requestStoryCreatorLoad * updated requestStoryCreatorLoad call to pass block's mediaFiles and clientId over the bridge * added new component StoryUpdateProgress * Revert "added new component StoryUpdateProgress", not belonging to this branch This reverts commit 86fb956. * fixed lint warnings * changed the no longer existing color dark-gray-500 removed in WordPress/gutenberg@162bc50 with gray-700 * added package-lock.json * Mobile Stories block (part 2): introduce StoryUpdateProgress (#17222) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * Mobile Stories block (part 3): rename using BlockMediaUpdateProgress (#17456) * using BlockMediaUpdateProgress * method rename * updated (automatically modified) package-lock.json * removed package-lock.json * moved condition check for http or https to helper method isUrlRemote() * calling mediaUploadSync and mediaSaveSync regardless of ids, we always will want to receive updates on all 3 stages * fixed spelling * Mobile Stories block (part 4): error handling (#17458) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * replaced for loops with map * Mobile Stories block (part 5): add empty placeholder (#17539) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * importing defined const MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO instead of re-defining * made placeholder container look as per any other media placeholder, reservign the Story style container for populated Story blocks * Mobile Stories block (part 6): rewrote StoryEdit class as a function (#17549) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * rewrote StoryEdit class as a function * removed unused imports * removed unused function * story block: set inserter support to false for web, but keep it for mobile (#17690) * renamed params to avoid name shadowing
mzorz
added a commit
that referenced
this pull request
Nov 14, 2020
* basic scaffolding for the Story block on mobile editor * added flex alignment and actual mediaFiles attribute rendering * applying styles to stories block view * removed unused alignment * added StoryEditingButton and showing it when the story block is selected * connecting StoryEditingButton with bridge's requestStoryCreatorLoad * updated requestStoryCreatorLoad call to pass block's mediaFiles and clientId over the bridge * added new component StoryUpdateProgress * Revert "added new component StoryUpdateProgress", not belonging to this branch This reverts commit 86fb956. * fixed lint warnings * changed the no longer existing color dark-gray-500 removed in WordPress/gutenberg@162bc50 with gray-700 * added package-lock.json * Mobile Stories block (part 2): introduce StoryUpdateProgress (#17222) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * Mobile Stories block (part 3): rename using BlockMediaUpdateProgress (#17456) * using BlockMediaUpdateProgress * method rename * updated (automatically modified) package-lock.json * removed package-lock.json * moved condition check for http or https to helper method isUrlRemote() * calling mediaUploadSync and mediaSaveSync regardless of ids, we always will want to receive updates on all 3 stages * fixed spelling * Mobile Stories block (part 4): error handling (#17458) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * replaced for loops with map * Mobile Stories block (part 5): add empty placeholder (#17539) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * importing defined const MEDIA_TYPE_IMAGE, MEDIA_TYPE_VIDEO instead of re-defining * made placeholder container look as per any other media placeholder, reservign the Story style container for populated Story blocks * Mobile Stories block (part 6): rewrote StoryEdit class as a function (#17549) * Revert "Revert "added new component StoryUpdateProgress", not belonging to this branch" This reverts commit 34349b1. * added mediaSave statuses listeners definitions * moved StoryEdit to a React.Component class and implemented StoryUpdateProgress overlay * added onStorySaveResult handling to Story block * edit mode: replacing urls by id for saving process * added onMediaModelCreated() callback so we can re-assign the mediaID to the mediaFiles attribute of a Story block once such a mediaModel is created * update the mediaFile id and URL of a given story frame when finished uploading succesfully * removed commented imports * added explicit TODO comments to make sure to follow up on them for error handling * make sure to call mediaUploadSync and storySaveSync if any of the mediaFiles contained in this block is not a remote url - also call onRemoveBlockCheckUpload() action under the same conditions in componentWillUnmount() * using BlockMediaUpdateProgress * method rename * updated story block to represent error state * added cancel and retry bridge methods specific for mediaFiles collection based blocks * using a deep copy of mediaFiles when replacing ids and mediaUrl, given mediaFiles attribute needs to be replaced again and cannot be modified in place as per React conventions * added requestMediaFilesSaveCancelDialog bridge method * changed props name onMediaModelCreated to more generic onMediaIdChanged * removed commented code * added MediaPlaceholder, wrapped in a pointerEvents=none View so we can handle media picking from the StoryComposer * replaced for loops with map * rewrote StoryEdit class as a function * removed unused imports * removed unused function * story block: set inserter support to false for web, but keep it for mobile (#17690) * renamed params to avoid name shadowing Co-authored-by: mzorz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Title has it - this is just a rewrite.
This PR builds on top of #17539, comes from the suggested comment by @jeherve in #17140 (comment).
We're not adding new functionality in this PR, we just rewrote the class as a function. Decided to remove the code that otherwise previously existed in
componentWillUnMountgiven the hook referenced there wasn't being really used (and with that, also removed thedoAction,hasActionimports).To test:
Test with the PRs related to the base branch, as follows (but updating the jetpack branch pointed to by the gutenberg-mobile submodule to this one)
Gutenberg-mobile wordpress-mobile/gutenberg-mobile#2747
WPANdroid wordpress-mobile/WordPress-Android#13174