Merge pull request #5617 from Automattic/add/handle-course-list-filte…

…r-added-to-non-course-list-block Fix issues for when course list filter is added to non course list blocks
Automattic · Sep 9, 2022 · a798f97 · a798f97
2 parents 68cb4e1 + 8c8c771
commit a798f97
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/assets/blocks/course-list-filter-block/course-list-filter-edit.js b/assets/blocks/course-list-filter-block/course-list-filter-edit.js
@@ -109,6 +109,10 @@ function CourseListFilter( {
 	const blockProps = useBlockProps();
 
 	if ( 'course' !== query?.postType ) {
+		setAttributes( {
+			align: false,
+			className: 'wp-block-sensei-lms-course-list-filter__warning',
+		} );
 		return (
 			<InvalidUsageError
 				message={ __(

diff --git a/assets/blocks/course-list-filter-block/course-list-filter-edit.test.js b/assets/blocks/course-list-filter-block/course-list-filter-edit.test.js
@@ -85,6 +85,7 @@ describe( 'CourseListFilterBlockEdit', () => {
 				clientId="some-client-id"
 				attributes={ { types: [ 'activity' ] } }
 				context={ { query: { postType: 'post' } } }
+				setAttributes={ jest.fn() }
 			/>
 		);
 

diff --git a/assets/blocks/course-list-filter-block/course-list-filter-editor.scss b/assets/blocks/course-list-filter-block/course-list-filter-editor.scss
@@ -3,5 +3,8 @@
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
+		&__warning {
+			display: block;
+		}
 	}
 }
diff --git a/includes/blocks/course-list/class-sensei-course-list-filter-block.php b/includes/blocks/course-list/class-sensei-course-list-filter-block.php
@@ -59,7 +59,12 @@ private function register_block() {
 	 * @return string
 	 */
 	public function render_block( $attributes, $content, WP_Block $block ): string {
-		if ( ! isset( $attributes['types'] ) || ! is_array( $attributes['types'] ) ) {
+		if (
+			! isset( $attributes['types'] ) ||
+			! is_array( $attributes['types'] ) ||
+			! isset( $block->context['queryId'] ) ||
+			'course' !== $block->context['query']['postType']
+		) {
 			return '';
 		}
 		$content = '';