From 42bba6ec5dcebed0b99d24297400c5220fde70ca Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Tue, 21 Feb 2023 12:18:25 +0200
Subject: [PATCH] [Block Editor - Inserter]: preload media categories empty
 check - client side (#47503)

* [Block Editor - Inserter]: preload media categories empty client side

* show media tab if `enableOpenverseMediaCategory` setting is `true`
---
 lib/compat/wordpress-6.2/edit-form-blocks.php | 23 -------------
 lib/load.php                                  |  1 -
 .../src/components/inserter/menu.js           | 34 +++++++++++--------
 3 files changed, 20 insertions(+), 38 deletions(-)
 delete mode 100644 lib/compat/wordpress-6.2/edit-form-blocks.php

diff --git a/lib/compat/wordpress-6.2/edit-form-blocks.php b/lib/compat/wordpress-6.2/edit-form-blocks.php
deleted file mode 100644
index 479ade3f377634..00000000000000
--- a/lib/compat/wordpress-6.2/edit-form-blocks.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Patches resources loaded by the block editor page.
- *
- * @package gutenberg
- */
-
-/**
- * Adds the preload paths registered in Core (`edit-form-blocks.php`).
- *
- * @param array                   $preload_paths    Preload paths to be filtered.
- * @param WP_Block_Editor_Context $context The current block editor context.
- * @return array
- */
-// @codingStandardsIgnoreStart - unused $context parameter.
-function gutenberg_preload_paths_6_2( $preload_paths, $context ) {
-	// Preload initial media requests that are needed to conditionally display the media tab in the inserter.
-	foreach ( array( 'image', 'video', 'audio' ) as $media_type ) {
-		$preload_paths[] = "wp/v2/media?context=edit&per_page=1&orderBy=date&media_type={$media_type}";
-	}
-	return $preload_paths;
-}
-add_filter( 'block_editor_rest_api_preload_paths', 'gutenberg_preload_paths_6_2', 10, 2 );
diff --git a/lib/load.php b/lib/load.php
index fb9da083390d43..481956240ef7c6 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -84,7 +84,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.2/block-template-utils.php';
 require __DIR__ . '/compat/wordpress-6.2/get-global-styles-and-settings.php';
 require __DIR__ . '/compat/wordpress-6.2/default-filters.php';
-require __DIR__ . '/compat/wordpress-6.2/edit-form-blocks.php';
 require __DIR__ . '/compat/wordpress-6.2/site-editor.php';
 require __DIR__ . '/compat/wordpress-6.2/block-editor.php';
 require __DIR__ . '/compat/wordpress-6.2/block-editor-settings.php';
diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
index 51026ec939dd5e..41491696e9010e 100644
--- a/packages/block-editor/src/components/inserter/menu.js
+++ b/packages/block-editor/src/components/inserter/menu.js
@@ -67,19 +67,25 @@ function InserterMenu(
 			insertionIndex: __experimentalInsertionIndex,
 			shouldFocusBlock,
 		} );
-	const { showPatterns, inserterItems } = useSelect(
-		( select ) => {
-			const { __experimentalGetAllowedPatterns, getInserterItems } =
-				select( blockEditorStore );
-			return {
-				showPatterns: !! __experimentalGetAllowedPatterns(
-					destinationRootClientId
-				).length,
-				inserterItems: getInserterItems( destinationRootClientId ),
-			};
-		},
-		[ destinationRootClientId ]
-	);
+	const { showPatterns, inserterItems, enableOpenverseMediaCategory } =
+		useSelect(
+			( select ) => {
+				const {
+					__experimentalGetAllowedPatterns,
+					getInserterItems,
+					getSettings,
+				} = select( blockEditorStore );
+				return {
+					showPatterns: !! __experimentalGetAllowedPatterns(
+						destinationRootClientId
+					).length,
+					inserterItems: getInserterItems( destinationRootClientId ),
+					enableOpenverseMediaCategory:
+						getSettings().enableOpenverseMediaCategory,
+				};
+			},
+			[ destinationRootClientId ]
+		);
 	const hasReusableBlocks = useMemo( () => {
 		return inserterItems.some(
 			( { category } ) => category === 'reusable'
@@ -87,7 +93,7 @@ function InserterMenu(
 	}, [ inserterItems ] );
 
 	const mediaCategories = useMediaCategories( destinationRootClientId );
-	const showMedia = !! mediaCategories.length;
+	const showMedia = !! mediaCategories.length || enableOpenverseMediaCategory;
 
 	const onInsert = useCallback(
 		( blocks, meta, shouldForceFocusBlock ) => {