Merge pull request #1702 from wordpress-mobile/issue/selfhosted_block…

…_layouts Extends FETCH_BLOCK_LAYOUTS action for self-hosted sites
wordpress-mobile · Oct 12, 2020 · d9f29f5 · d9f29f5
2 parents 3b8f742 + 01ab9c6
commit d9f29f5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/...src/androidTest/java/org/wordpress/android/fluxc/release/ReleaseStack_SiteTestXMLRPC.java b/...src/androidTest/java/org/wordpress/android/fluxc/release/ReleaseStack_SiteTestXMLRPC.java
@@ -13,6 +13,7 @@
 import org.wordpress.android.fluxc.store.AccountStore.AuthenticationErrorType;
 import org.wordpress.android.fluxc.store.AccountStore.OnAuthenticationChanged;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.OnBlockLayoutsFetched;
 import org.wordpress.android.fluxc.store.SiteStore.OnPostFormatsChanged;
 import org.wordpress.android.fluxc.store.SiteStore.OnProfileFetched;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
@@ -30,6 +31,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -49,6 +51,7 @@ private enum TestEvents {
         SITE_CHANGED,
         POST_FORMATS_CHANGED,
         SITE_REMOVED,
+        BLOCK_LAYOUTS_FETCHED,
         FETCHED_PROFILE
     }
 
@@ -230,6 +233,19 @@ public void testFetchPostFormats() throws InterruptedException {
         assertEquals(10, postFormats.size());
     }
 
+    @Test
+    public void testFetchBlockLayouts() throws InterruptedException {
+        fetchSites(BuildConfig.TEST_WPORG_USERNAME_SH_SIMPLE,
+                BuildConfig.TEST_WPORG_PASSWORD_SH_SIMPLE,
+                BuildConfig.TEST_WPORG_URL_SH_SIMPLE_ENDPOINT);
+
+        SiteModel firstSite = mSiteStore.getSites().get(0);
+        mNextEvent = TestEvents.BLOCK_LAYOUTS_FETCHED;
+        mDispatcher.dispatch(SiteActionBuilder.newFetchBlockLayoutsAction(firstSite));
+        mCountDownLatch = new CountDownLatch(1);
+        assertTrue(mCountDownLatch.await(TestUtils.DEFAULT_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+    }
+
     @SuppressWarnings("unused")
     @Subscribe
     public void onSiteChanged(OnSiteChanged event) {
@@ -306,6 +322,19 @@ public void onPostFormatsChanged(OnPostFormatsChanged event) {
         mCountDownLatch.countDown();
     }
 
+    @SuppressWarnings("unused")
+    @Subscribe
+    public void onBlockLayoutsFetched(OnBlockLayoutsFetched event) {
+        assertEquals(mNextEvent, TestEvents.BLOCK_LAYOUTS_FETCHED);
+        assertFalse(event.isError());
+        assertEquals(TestEvents.BLOCK_LAYOUTS_FETCHED, mNextEvent);
+        assertNotNull(event.categories);
+        assertNotNull(event.layouts);
+        assertFalse(event.categories.isEmpty());
+        assertFalse(event.layouts.isEmpty());
+        mCountDownLatch.countDown();
+    }
+
     private void fetchProfile(String username, String password, String endpointUrl) throws InterruptedException {
         RefreshSitesXMLRPCPayload payload = new RefreshSitesXMLRPCPayload();
         payload.username = username;

diff --git a/fluxc-processor/src/main/resources/wp-com-v2-endpoints.txt b/fluxc-processor/src/main/resources/wp-com-v2-endpoints.txt
@@ -13,6 +13,7 @@
 /sites/$site/stats/top-earners
 
 /sites/$site/block-layouts
+/common-block-layouts
 
 /users/username/suggestions/
 

diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.java b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.java
@@ -560,9 +560,18 @@ public void onErrorResponse(@NonNull WPComGsonNetworkError error) {
         add(request);
     }
 
-    public void fetchBlockLayouts(final SiteModel site) {
-        Map<String, String> params = new HashMap<>();
+    public void fetchWpComBlockLayouts(final SiteModel site) {
         String url = WPCOMV2.sites.site(site.getSiteId()).block_layouts.getUrl();
+        fetchBlockLayouts(site, url);
+    }
+
+    public void fetchSelfHostedBlockLayouts(final SiteModel site) {
+        String url = WPCOMV2.common_block_layouts.getUrl();
+        fetchBlockLayouts(site, url);
+    }
+
+    private void fetchBlockLayouts(final SiteModel site, String url) {
+        Map<String, String> params = new HashMap<>();
         final WPComGsonRequest<BlockLayoutsResponse> request = WPComGsonRequest.buildGetRequest(url, params,
                 BlockLayoutsResponse.class,
                 new Listener<BlockLayoutsResponse>() {

diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.java b/fluxc/src/main/java/org/wordpress/android/fluxc/store/SiteStore.java
@@ -1819,7 +1819,9 @@ private void fetchSiteEditors(SiteModel site) {
 
     private void fetchBlockLayouts(SiteModel site) {
         if (site.isUsingWpComRestApi()) {
-            mSiteRestClient.fetchBlockLayouts(site);
+            mSiteRestClient.fetchWpComBlockLayouts(site);
+        } else {
+            mSiteRestClient.fetchSelfHostedBlockLayouts(site);
         }
     }