[Modal Layout Picker] Filter layouts based on supported blocks by antonis · Pull Request #13018 · wordpress-mobile/WordPress-Android

antonis · 2020-09-25T20:50:55Z

Fixes: wordpress-mobile/gutenberg-mobile#2444

Related PRs:

Depends on: [Modal Layout Picker] Add support for Self-Hosted sites #13017
API call: Adds supported blocks parameter in FETCH_BLOCK_LAYOUTS action WordPress-FluxC-Android#1703

Description

This PR fetches adds supported blocks parameter in fetch block layouts call both for WPCom and self hosted site

To test:

Layout Picker should show when creating a new page from My Site or Site Pages the Modal Layout Picker appears.

WPCom Site

Select a WPcom site and ensure a valid network connection
Navigate to the Modal layout picker by either:
- Selecting the FAB icon on the site page and selecting "Site page"
- Selecting the ➕ on the Page List
Using an earlier build from [Modal Layout Picker] Add support for Self-Hosted sites #13017 validate the number of layouts has decreased
Using a network logger:
- Expect to see a network request with:

https://public-api.wordpress.com/wpcom/v2/sites/{{SITEID}}/block-layouts?locale=en&supported_blocks=core/paragraph%2Ccore/heading%2Ccore/more%2Ccore/image%2Ccore/video%2Ccore/nextpage%2Ccore/separator%2Ccore/list%2Ccore/quote%2Ccore/media-text%2Ccore/preformatted%2Ccore/gallery%2Ccore/columns%2Ccore/column%2Ccore/group%2Ccore/freeform%2Ccore/button%2Ccore/spacer%2Ccore/shortcode%2Ccore/buttons%2Ccore/latest-posts%2Ccore/verse%2Ccore/cover%2Ccore/social-link%2Ccore/social-links%2Cjetpack/contact-info%2Cjetpack/email%2Cjetpack/phone%2Cjetpack/address%2Ccore/pullquote%2Ccore/code

Self-Hosted Site

Select a Self-Hosted site and ensure a valid network connection
Navigate to the Modal layout picker by either:
- Selecting the FAB icon on the site page and selecting "Site page"
- Selecting the ➕ on the Page List
Using an earlier build from [Modal Layout Picker] Add support for Self-Hosted sites #13017 validate the number of layouts has decreased
Using a network logger:
- Expect to see a network request with:

https://public-api.wordpress.com/wpcom/v2/common-block-layouts?locale=en&supported_blocks=core/paragraph%2Ccore/heading%2Ccore/more%2Ccore/image%2Ccore/video%2Ccore/nextpage%2Ccore/separator%2Ccore/list%2Ccore/quote%2Ccore/media-text%2Ccore/preformatted%2Ccore/gallery%2Ccore/columns%2Ccore/column%2Ccore/group%2Ccore/freeform%2Ccore/button%2Ccore/spacer%2Ccore/shortcode%2Ccore/buttons%2Ccore/latest-posts%2Ccore/verse%2Ccore/cover%2Ccore/social-link%2Ccore/social-links%2Cjetpack/contact-info%2Cjetpack/email%2Cjetpack/phone%2Cjetpack/address%2Ccore/pullquote%2Ccore/code

PR submission checklist:

I have considered adding unit tests where possible.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

peril-wordpress-mobile · 2020-09-25T20:51:02Z

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

peril-wordpress-mobile · 2020-09-25T21:07:19Z

You can test the changes on this Pull Request by downloading the APK here.

…dBlocks # Conflicts: # WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt

…dBlocks

malinajirka

Thanks @antonis! I've left some minor comments. The app works as described. However, I found some issues which are probably not related to this PR.

Layouts are not cached

Click on "Create Page"
Wait for the layouts to load
Click on back
Turn on airplane mode
Click on "Create Page"
Notice the layouts are empty

Create blank page doesn't work in offline

Turn on airplane mode
Click on "Create Page"
Click on "Create blank page"
Notice nothing happens

WordPress/src/main/java/org/wordpress/android/util/ContextUtils.kt

WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt

WordPress/src/main/java/org/wordpress/android/ui/mlp/SupportedBlocks.kt

antonis · 2020-10-08T09:11:34Z

Thanks again for taking the time to review this @malinajirka 👍
I'm grateful for your feedback 🙇

Layouts are not cached

Create blank page doesn't work in offline

If that's ok, I'll try to cover both of the above with a next pr as part of this to keep this one more focused.

I'll get back to you on your code comments with fixes ASAP 🙇‍♂️

malinajirka · 2020-10-08T13:40:03Z

If that's ok, I'll try to cover both of the above with a next pr as part of this to keep this one more focused.

Sure thing. As long as it's recorded somewhere I don't mind merging this PR :).

antonis · 2020-10-08T14:24:04Z

Sure thing. As long as it's recorded somewhere I don't mind merging this PR :).

Ok ;)

ps. When this is approved let's keep it unmerged till #13017 and FluxC PRs are merge.

malinajirka

LGTM thanks!

…dBlocks # Conflicts: # build.gradle

# Conflicts: # build.gradle

Passes supported blocks hardcoded parameter

311a488

antonis mentioned this pull request Sep 25, 2020

Adds supported blocks parameter in FETCH_BLOCK_LAYOUTS action wordpress-mobile/WordPress-FluxC-Android#1703

Merged

antonis added [Type] Enhancement Part of a WIP Feature labels Sep 25, 2020

antonis self-assigned this Sep 25, 2020

antonis mentioned this pull request Sep 25, 2020

[Modal Layout Picker] "Create Page" button functionality #12943

Merged

3 tasks

antonis added 2 commits September 26, 2020 02:15

Loads supported blocks list from json file

d7a8dd5

Merge branch 'issue/2455-MLP_SelfHosted' into issue/2444-MLP_Supporte…

aceaac2

…dBlocks # Conflicts: # WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt

antonis marked this pull request as ready for review September 28, 2020 06:34

antonis requested review from chipsnyder and planarvoid September 28, 2020 06:34

Merge branch 'issue/2455-MLP_SelfHosted' into issue/2444-MLP_Supporte…

b00e8da

…dBlocks

antonis requested review from aforcier, ashiagr and malinajirka October 7, 2020 05:44

antonis mentioned this pull request Oct 7, 2020

[Modal Layout Picker] "Preview" button functionality #13022

Merged

3 tasks

malinajirka self-assigned this Oct 8, 2020

malinajirka reviewed Oct 8, 2020

View reviewed changes

Added error logging in case asset parsing fails

a572180

antonis added 3 commits October 8, 2020 17:14

Replaced static scope with injectable provider

47e6ba0

Refactored VM method name to imply event

27a829e

Max line length lint issue

7e8dcad

antonis mentioned this pull request Oct 9, 2020

[Android] Gutenberg changes a posts content without informing the UI wordpress-mobile/gutenberg-mobile#2701

Closed

malinajirka approved these changes Oct 9, 2020

View reviewed changes

Merge branch 'issue/2455-MLP_SelfHosted' into issue/2444-MLP_Supporte…

e4abc89

…dBlocks # Conflicts: # build.gradle

Base automatically changed from issue/2455-MLP_SelfHosted to develop October 13, 2020 05:42

antonis added this to the 16.0 milestone Oct 13, 2020

Merge branch 'develop' into issue/2444-MLP_SupportedBlocks

39e9a86

# Conflicts: # build.gradle

antonis merged commit eec8eaa into develop Oct 13, 2020

antonis deleted the issue/2444-MLP_SupportedBlocks branch October 13, 2020 06:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Modal Layout Picker] Filter layouts based on supported blocks#13018

[Modal Layout Picker] Filter layouts based on supported blocks#13018
antonis merged 10 commits intodevelopfrom
issue/2444-MLP_SupportedBlocks

antonis commented Sep 25, 2020 •

edited

Loading

Uh oh!

peril-wordpress-mobile bot commented Sep 25, 2020 •

edited

Loading

Uh oh!

peril-wordpress-mobile bot commented Sep 25, 2020 •

edited

Loading

Uh oh!

malinajirka left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

antonis commented Oct 8, 2020

Uh oh!

malinajirka commented Oct 8, 2020

Uh oh!

antonis commented Oct 8, 2020 •

edited

Loading

Uh oh!

malinajirka left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

antonis commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

To test:

WPCom Site

Self-Hosted Site

Uh oh!

peril-wordpress-mobile bot commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

peril-wordpress-mobile bot commented Sep 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

malinajirka left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

antonis commented Oct 8, 2020

Uh oh!

malinajirka commented Oct 8, 2020

Uh oh!

antonis commented Oct 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

malinajirka left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

antonis commented Sep 25, 2020 •

edited

Loading

peril-wordpress-mobile bot commented Sep 25, 2020 •

edited

Loading

peril-wordpress-mobile bot commented Sep 25, 2020 •

edited

Loading

malinajirka left a comment •

edited

Loading

antonis commented Oct 8, 2020 •

edited

Loading