Re-implement #2611 Support for story block rendering on 1.41.1

.circleci/config.yml

@@ -266,6 +266,7 @@ workflows:
             branches:
               ignore:
                 - develop
+                - /^dependabot/submodules/.*/
       - ios-device-checks:
           name: Test iOS on Device - Full
           requires: [ "Optional UI Tests" ]
@@ -274,6 +275,18 @@ workflows:
           requires: [ "Optional UI Tests" ]
       - android-native-unit-tests:
           name: Android Native Unit Tests
+      - ios-device-checks:
+          name: Test iOS on Device - Full (Submodule Update)
+          post-to-slack: true
+          filters:
+            branches:
+              only: /^dependabot/submodules/.*/
+      - android-device-checks:
+          name: Test Android on Device - Full (Submodule Update)
+          post-to-slack: true
+          filters:
+            branches:
+              only: /^dependabot/submodules/.*/
 
   ui-tests-full-scheduled:
     jobs:

src/index.js

@@ -14,9 +14,12 @@ import correctTextFontWeight from './text-font-weight-correct';
 import setupJetpackEditor from './jetpack-editor-setup';
 import initialHtml from './initial-html';
 
-addAction( 'native.pre-render', 'gutenberg-mobile', ( props ) => {
+addAction( 'native.pre-render', 'gutenberg-mobile', () => {
 	require( './strings-overrides' );
 	correctTextFontWeight();
+} );
+
+addAction( 'native.render', 'gutenberg-mobile', ( props ) => {
 	setupJetpackEditor(
 		props.jetpackState || { blogId: 1, isJetpackActive: true }
 	);

src/initial-html.js

@@ -12,4 +12,16 @@ export default `
 <div class="wp-block-jetpack-address"><div class="jetpack-address__address jetpack-address__address1">Random Street</div></div>
 <!-- /wp:jetpack/address --></div>
 <!-- /wp:jetpack/contact-info -->
+
+<!-- wp:jetpack/story {"mediaFiles":[{"alt":"","caption":"","id":320,"link":"https://cldup.com/n48GTQmw7s.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/n48GTQmw7s.jpg"},{"alt":"","caption":"","id":321,"link":"https://cldup.com/u2kdydrlQv.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/u2kdydrlQv.jpg"},{"alt":"","caption":"","id":319,"link":"https://cldup.com/fi7gqyUrbL.jpg","mime":"image/jpeg","type":"image","url":"https://cldup.com/fi7gqyUrbL.jpg"}]} -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
+
+<!-- wp:jetpack/story -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
+
+<!-- wp:jetpack/story {"mediaFiles":[]}} -->
+<div class="wp-block-jetpack-story wp-story"></div>
+<!-- /wp:jetpack/story -->
 `;

src/jetpack-editor-setup.js

@@ -2,10 +2,17 @@
  * Internal dependencies
  */
 import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data';
+/**
+ * WordPress dependencies
+ */
+import { dispatch, select } from '@wordpress/data';
 
 // When adding new blocks to this list please also consider updating ./block-support/supported-blocks.json
 const supportedJetpackBlocks = {
 	'contact-info': {
+		available: __DEV__,
+	},
+	story: {
 		available: true,
 	},
 };
@@ -37,9 +44,27 @@ export default ( jetpackState ) => {
 
 	const jetpackData = setJetpackData( jetpackState );
 
-	if ( __DEV__ ) {
-		require( '../jetpack/extensions/editor' );
-	}
+	// Note on the use of setTimeout() here:
+	// We observed the settings may not be ready exactly when the native.render hooks get run but rather
+	// right after that execution cycle (because state hasn't changed yet). Hence, we're only checking for
+	// the actual settings to be loaded by using setTimeout without a delay parameter. This ensures the
+	// settings are loaded onto the store and we can use the core/block-editor selector by the time we do
+	// the actual check.
+
+	// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
+	setTimeout( () => {
+		const mediaFilesCollectionBlock = select(
+			'core/block-editor'
+		).getSettings( 'capabilities' ).mediaFilesCollectionBlock;
+
+		if ( mediaFilesCollectionBlock !== true ) {
+			dispatch( 'core/edit-post' ).hideBlockTypes( [ 'jetpack/story' ] );
+		} else {
+			dispatch( 'core/edit-post' ).showBlockTypes( [ 'jetpack/story' ] );
+		}
+	} );
+
+	require( '../jetpack/extensions/editor' );
 
 	return jetpackData;
 };

src/test/index.js

@@ -3,7 +3,7 @@ describe( 'Test Jetpack blocks', () => {
 		const mockRegisterBlockCollection = jest.fn();
 		jest.mock( '@wordpress/blocks', () => {
 			return {
-				getCategories: () => [],
+				getCategories: () => [ { slug: 'media' } ],
 				setCategories: jest.fn(),
 				registerBlockCollection: mockRegisterBlockCollection,
 			};
@@ -12,6 +12,9 @@ describe( 'Test Jetpack blocks', () => {
 			'../../jetpack/extensions/blocks/contact-info/editor.js',
 			() => jest.fn()
 		);
+		jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () =>
+			jest.fn()
+		);
 
 		const setupJetpackEditor = require( '../jetpack-editor-setup' ).default;
 		setupJetpackEditor( { blogId: 1, isJetpackActive: true } );