Merge pull request #5282 from Automattic/fix/woothemes-sensei-detection

Author: fjorgemota

assets/admin/editor-wizard/helpers.js

@@ -5,6 +5,12 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { useEffect, useLayoutEffect, useState } from '@wordpress/element';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
+import { applyFilters } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { EXTENSIONS_STORE } from '../../extensions/store';
 
 /**
  * Update blocks content, replacing the placeholders with a content.
@@ -149,3 +155,32 @@ export const useLogEvent = () => {
 		} );
 	};
 };
+
+/**
+ * Hook to check if Sensei Pro is enabled or not, and hide the editor wizard accordingly.
+ *
+ * @return {boolean} If the editor wizard upsell should be hidden or not.
+ */
+export const useHideEditorWizardUpsell = () => {
+	const { senseiProExtension } = useSelect(
+		( select ) => ( {
+			senseiProExtension: select(
+				EXTENSIONS_STORE
+			).getSenseiProExtension(),
+		} ),
+		[]
+	);
+
+	/**
+	 * Filters if the editor wizard upsells should show or not
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param {boolean} hideEditorWizardUpsell Whether to hide the editor wizard upsells.
+	 * @return {boolean} Whether to hide the editor wizard upsells.
+	 */
+	return applyFilters(
+		'senseiEditorWizardUpsellHide',
+		! senseiProExtension || senseiProExtension.is_activated === true
+	);
+};

assets/admin/editor-wizard/steps/lesson-patterns-step.js

@@ -2,15 +2,14 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useSelect } from '@wordpress/data';
 import { Fragment } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import PatternsStep from './patterns-step';
 import LogoTreeIcon from '../../../icons/logo-tree.svg';
-import { EXTENSIONS_STORE } from '../../../extensions/store';
+import { useHideEditorWizardUpsell } from '../helpers';
 
 /**
  * Lesson patterns step.
@@ -19,23 +18,13 @@ import { EXTENSIONS_STORE } from '../../../extensions/store';
  * @param {Object} props.wizardData Wizard data.
  */
 const LessonPatternsStep = ( { wizardData, ...props } ) => {
-	const { senseiProExtension } = useSelect(
-		( select ) => ( {
-			senseiProExtension: select(
-				EXTENSIONS_STORE
-			).getSenseiProExtension(),
-		} ),
-		[]
-	);
-
 	const replaces = {};
 
 	if ( wizardData.title ) {
 		replaces[ 'sensei-content-title' ] = wizardData.title;
 	}
 
-	const isSenseiProActivated =
-		! senseiProExtension || senseiProExtension.is_activated === true;
+	const shouldHideEditorWizardUpsell = useHideEditorWizardUpsell();
 
 	return (
 		<Fragment>
@@ -45,7 +34,7 @@ const LessonPatternsStep = ( { wizardData, ...props } ) => {
 				{ ...props }
 			/>
 			<PatternsStep.UpsellFill>
-				{ isSenseiProActivated ? null : <UpsellBlock /> }
+				{ shouldHideEditorWizardUpsell ? null : <UpsellBlock /> }
 			</PatternsStep.UpsellFill>
 		</Fragment>
 	);

assets/admin/editor-wizard/use-editor-wizard-steps.js

@@ -12,7 +12,7 @@ import CourseUpgradeStep from './steps/course-upgrade-step';
 import CoursePatternsStep from './steps/course-patterns-step';
 import LessonDetailsStep from './steps/lesson-details-step';
 import LessonPatternsStep from './steps/lesson-patterns-step';
-import { EXTENSIONS_STORE } from '../../extensions/store';
+import { useHideEditorWizardUpsell } from './helpers';
 
 /**
  * Returns the list of components (representing steps) for the Editor Wizard according to the post type and if
@@ -25,17 +25,16 @@ const useEditorWizardSteps = () => {
 		course: [ CourseDetailsStep, CourseUpgradeStep, CoursePatternsStep ],
 		lesson: [ LessonDetailsStep, LessonPatternsStep ],
 	};
-	const { postType, senseiProExtension } = useSelect(
+	const { postType } = useSelect(
 		( select ) => ( {
 			postType: select( editorStore )?.getCurrentPostType(),
-			senseiProExtension: select(
-				EXTENSIONS_STORE
-			).getSenseiProExtension(),
 		} ),
 		[]
 	);
 
-	if ( ! senseiProExtension || senseiProExtension.is_activated === true ) {
+	const shouldHideEditorWizardUpsell = useHideEditorWizardUpsell();
+
+	if ( shouldHideEditorWizardUpsell ) {
 		stepsByPostType.course = stepsByPostType.course.filter(
 			( step ) => step !== CourseUpgradeStep
 		);