Merge branch 'develop' of https://github.com/Yoast/javascript into P2…

…-786-only-render-ok-when-block-is-valid

# Conflicts:
#	packages/schema-blocks/src/functions/presenters/BlockSuggestionsPresenter.tsx
#	packages/schema-blocks/tests/functions/presenters/BlockSuggestions.test.ts

packages/schema-blocks/src/functions/presenters/BlockSuggestionsPresenter.tsx

@@ -1,9 +1,13 @@
 import { ReactElement } from "react";
 import { BlockInstance, createBlock } from "@wordpress/blocks";
 import { PanelBody } from "@wordpress/components";
-import { SuggestedBlockProperties, BlockValidationResult } from "../core/validation";
-import { getAllDescendantIssues, getValidationResult } from "../functions/validators";
-import { isResultValidForSchema } from "../functions/validators/validateResults";
+import { BlockValidationResult } from "../../core/validation";
+import { getAllDescendantIssues, getValidationResult } from "../validators";
+import { isResultValidForSchema } from "../validators/validateResults";
+import { createElement } from "@wordpress/element";
+
+import { getBlockType } from "../BlockHelper";
+import { getInnerblocksByName, insertBlock } from "../innerBlocksHelper";
 
 type BlockSuggestionAddedDto = {
 	blockTitle: string;
@@ -70,11 +74,9 @@ function BlockSuggestionAdded( { blockTitle, isValid }: BlockSuggestionAddedDto
 /**
  * Renders a list of suggested blocks.
  *
- * @param sidebarTitle    The title of the sidebar section.
- * @param block           The block to render the suggestions for.
- * @param suggestedBlocks The required/recommended blocks.
+ * @param props The props.
  *
- * @returns The rendered sidebar section with block suggestions.
+ * @returns The block suggestions element.
  */
 export default function BlockSuggestionsPresenter( { title, block, suggestions }: BlockSuggestionsProps ) {
 	const suggestedBlockNames = suggestions

packages/schema-blocks/tests/functions/presenters/BlockSuggestions.test.ts

@@ -1,18 +1,18 @@
 import { BlockInstance, createBlock } from "@wordpress/blocks";
 import * as renderer from "react-test-renderer";
 import { mount } from "enzyme";
-import { BlockValidationResult, RequiredBlock } from "../../src/core/validation";
-import BlockSuggestions from "../../src/blocks/BlockSuggestions";
-import { insertBlock } from "../../src/functions/innerBlocksHelper";
-import { BlockPresence } from "../../src/core/validation/BlockValidationResult";
+import BlockSuggestionsPresenter from "../../../src/functions/presenters/BlockSuggestionsPresenter";
+import { BlockValidationResult } from "../../../src/core/validation";
+import { insertBlock } from "../../../src/functions/innerBlocksHelper";
+import { BlockPresence } from "../../../src/core/validation/BlockValidationResult";
 
 jest.mock( "@wordpress/blocks", () => {
 	return {
 		createBlock: jest.fn(),
 	};
 } );
 
-jest.mock( "../../src/functions/validators", () => {
+jest.mock( "../../../src/functions/validators", () => {
 	return {
 		getValidationResult: jest.fn( () => {
 			return new BlockValidationResult( "1", "yoast/valid-block", -1, BlockPresence.Required, "Is not that present" );
@@ -25,7 +25,7 @@ jest.mock( "../../src/functions/validators", () => {
 	};
 } );
 
-jest.mock( "../../src/functions/BlockHelper", () => {
+jest.mock( "../../../src/functions/BlockHelper", () => {
 	return {
 		getBlockType: jest.fn( ( blockName: string )  => {
 			if ( blockName === "yoast/nonexisting" ) {
@@ -64,17 +64,8 @@ describe( "The required blocks in the sidebar", () => {
 	} );
 
 	it( "renders the required block as an added one", () => {
-		const block = { clientId: "1", innerBlocks: [] } as BlockInstance;
-		const requiredBlocks = [
-			{
-				name: "yoast/added-to-content",
-				option: "One",
-			} as RequiredBlock,
-			{
-				name: "yoast/added-to-content-valid",
-				option: "One",
-			} as RequiredBlock,
-		];
+		const block = { innerBlocks: [] } as BlockInstance;
+		const requiredBlocks = [ "yoast/added-to-content"  ];
 
 		const tree = renderer
 			.create( BlockSuggestionsPresenter( { title: "Required blocks", block, suggestions: requiredBlocks } ) )

packages/schema-blocks/tests/functions/presenters/__snapshots__/BlockSuggestions.test.ts.snap

@@ -44,17 +44,6 @@ exports[`The required blocks in the sidebar renders the required block as an add
     >
       The required block
     </li>
-    <li
-      className="yoast-block-suggestion"
-    >
-      The required block
-      <button
-        className="yoast-block-suggestion-button"
-        onClick={[Function]}
-      >
-         Add 
-      </button>
-    </li>
   </ul>
 </div>
 `;