Merge pull request #1805 from equalizedigital/william/no-issue/fix-pro-detection-in-dismiss-panel-outside-post-editor

fix: expose pro status in edac_script_vars and widen isPro checks in DismissPanel

Author: pattonwebz

admin/class-enqueue-admin.php

@@ -93,6 +93,7 @@ public static function maybe_enqueue_admin_and_editor_app_scripts() {
 					'proUrl'                   => esc_url_raw( edac_generate_link_type( [ 'utm_content' => '__name__' ] ) ),
 					'hasDismissEndpoint'       => method_exists( \EDAC\Inc\REST_Api::class, 'dismiss_issue' ),
 					'showMetaboxInBlockEditor' => ! Helpers::is_block_editor() || (bool) get_option( 'edac_show_metabox_in_block_editor', 1 ),
+					'pro'                      => defined( 'EDACP_VERSION' ) && EDAC_KEY_VALID,
 				]
 			);
 

src/issueModal/components/DismissPanel.js

@@ -27,7 +27,15 @@ import { getDismissReasonOptions } from '../../sidebar/utils/dismissHelpers';
  * @param {boolean}  props.forceGlobal  - When true, the primary dismiss action targets all pages (global dismiss).
  * @param {boolean}  props.isPro        - Whether the current UI is running in Pro.
  */
-const DismissPanel = ( { issue, isOpen, onToggle, onIgnore, onCloseModal, forceGlobal = false, isPro = typeof window !== 'undefined' && window.edac_editor_app?.pro === '1' } ) => {
+const DismissPanel = ( {
+	issue,
+	isOpen,
+	onToggle,
+	onIgnore,
+	onCloseModal,
+	forceGlobal = false,
+	isPro = typeof window !== 'undefined' && ( window.edac_editor_app?.pro === '1' || window.edac_script_vars?.pro === '1' ),
+} ) => {
 	const panelRef = useRef( null );
 	const [ comment, setComment ] = useState( issue?.ignre_comment ? decodeEntities( issue.ignre_comment ) : '' );
 	const [ dismissReason, setDismissReason ] = useState( issue?.ignre_reason || 'accessible' );
@@ -142,7 +150,7 @@ const DismissPanel = ( { issue, isOpen, onToggle, onIgnore, onCloseModal, forceG
 						) }
 						{ isIgnored ? (
 							<>
-								{ ( issue?.user || issue?.ignre_user_name || issue?.ignre_date || issue?.ignre_global ) && (
+								{ ( issue?.user || issue?.ignre_user_name || issue?.ignre_date || isGloballyDismissed ) && (
 									<dl className="edac-analysis__dismissed-meta">
 
 										{ ( issue?.ignre_global === 1 || issue?.ignre_global === '1' ) && (

src/issueModal/components/IssueDetailsModal.js

@@ -328,7 +328,7 @@ export const IssueDetailsModal = ( { issue, rule, onClose, isOpen, focusSection,
 					) }
 
 					{ /* How to Fix - Show detailed info for Pro, or just link for Free */ }
-					{ window.edac_editor_app?.pro === '1' ? (
+					{ ( typeof window !== 'undefined' && ( window.edac_editor_app?.pro === '1' || window.edac_script_vars?.pro === '1' ) ) ? (
 						<div className="edac-analysis__issue-help-accordion">
 							<PanelBody
 								title={ __( 'Show explanation', 'accessibility-checker' ) }
@@ -406,7 +406,6 @@ export const IssueDetailsModal = ( { issue, rule, onClose, isOpen, focusSection,
 							onToggle={ () => setIsDismissPanelOpen( ! isDismissPanelOpen ) }
 							onIgnore={ onIgnore }
 							onCloseModal={ onClose }
-							isPro={ typeof window !== 'undefined' && window.edac_editor_app?.pro === '1' }
 						/>
 					</div>
 				</div>

tests/phpunit/Admin/EnqueueAdminTest.php

@@ -125,6 +125,28 @@ public function testLocalizedAdminDataIncludesFixesRestUrl(): void {
 		$this->assertStringContainsString( 'fixesRestUrl', $localized_data );
 	}
 
+	/**
+	 * The pro flag in edac_script_vars reflects defined( 'EDACP_VERSION' ) && EDAC_KEY_VALID,
+	 * so non-editor admin pages (e.g. the Issues Explorer) can gate pro-only UI without
+	 * relying on window.edac_editor_app, which is only localized on post.php/post-new.php.
+	 */
+	public function testLocalizedAdminDataIncludesProFlag(): void {
+		global $wp_scripts;
+
+		$this->enqueue_admin::maybe_enqueue_admin_and_editor_app_scripts();
+
+		$localized_data = (string) $wp_scripts->get_data( 'edac', 'data' );
+		$expected_pro   = defined( 'EDACP_VERSION' ) && EDAC_KEY_VALID;
+
+		// wp_localize_script() stringifies booleans as "1" / "" (matching the
+		// === '1' checks on the JS side), not JSON true/false.
+		$this->assertStringContainsString( '"pro"', $localized_data );
+		$this->assertMatchesRegularExpression(
+			'/"pro"\s*:\s*"' . ( $expected_pro ? '1' : '' ) . '"/',
+			$localized_data
+		);
+	}
+
 	/**
 	 * FixesRestUrl uses the edac/v1 namespace and matches rest_url().
 	 */