From 04e24d2c454c8260aba229eba68d5cb9322c744f Mon Sep 17 00:00:00 2001
From: Nikunj Hatkar <nikunj8866@gmail.com>
Date: Tue, 1 Jul 2025 19:05:03 +0530
Subject: [PATCH 1/4] Add hash handling to site health accordions

---
 src/js/_enqueues/admin/site-health.js | 15 +++++++++++++++
 src/wp-admin/site-health-info.php     |  2 +-
 src/wp-admin/site-health.php          |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/admin/site-health.js b/src/js/_enqueues/admin/site-health.js
index 416295df69b17..dd410de097f85 100644
--- a/src/js/_enqueues/admin/site-health.js
+++ b/src/js/_enqueues/admin/site-health.js
@@ -44,6 +44,8 @@ jQuery( function( $ ) {
 	$( '.health-check-accordion' ).on( 'click', '.health-check-accordion-trigger', function() {
 		var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) );
 
+		window.location.hash = $( this ).attr( 'id' );
+
 		if ( isExpanded ) {
 			$( this ).attr( 'aria-expanded', 'false' );
 			$( '#' + $( this ).attr( 'aria-controls' ) ).attr( 'hidden', true );
@@ -53,6 +55,19 @@ jQuery( function( $ ) {
 		}
 	} );
 
+	// Get hash from query string and open the related accordion.
+	setTimeout( function() {
+		var hash = window.location.hash;
+
+		if ( hash ) {
+			var requestedPanel = $( hash );
+
+			if ( requestedPanel.length ) {
+				requestedPanel.trigger( 'click' );
+			}
+		}
+	}, 100 );
+
 	// Site Health test handling.
 
 	$( '.site-health-view-passed' ).on( 'click', function() {
diff --git a/src/wp-admin/site-health-info.php b/src/wp-admin/site-health-info.php
index bfdd77df01553..faffb21636827 100644
--- a/src/wp-admin/site-health-info.php
+++ b/src/wp-admin/site-health-info.php
@@ -73,7 +73,7 @@
 
 			?>
 			<h3 class="health-check-accordion-heading">
-				<button aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-<?php echo esc_attr( $section ); ?>" type="button">
+				<button id="health-check-section-<?php echo esc_attr( $section ); ?>" aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-<?php echo esc_attr( $section ); ?>" type="button">
 					<span class="title">
 						<?php echo esc_html( $details['label'] ); ?>
 						<?php
diff --git a/src/wp-admin/site-health.php b/src/wp-admin/site-health.php
index 0fd7fef07a00a..203acff2137fc 100644
--- a/src/wp-admin/site-health.php
+++ b/src/wp-admin/site-health.php
@@ -301,7 +301,7 @@
 
 <script id="tmpl-health-check-issue" type="text/template">
 	<h4 class="health-check-accordion-heading">
-		<button aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-{{ data.test }}" type="button">
+		<button id="health-check-section-{{ data.test }}" aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-{{ data.test }}" type="button">
 			<span class="title">{{ data.label }}</span>
 			<# if ( data.badge ) { #>
 				<span class="badge {{ data.badge.color }}">{{ data.badge.label }}</span>

From 8117bd100be9634e6faf662d209c98c73fc5b5ca Mon Sep 17 00:00:00 2001
From: Nikunj Hatkar <nikunj8866@gmail.com>
Date: Wed, 2 Jul 2025 19:29:41 +0530
Subject: [PATCH 2/4] Replace setTimeout with the wp.domReady

---
 src/js/_enqueues/admin/site-health.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/js/_enqueues/admin/site-health.js b/src/js/_enqueues/admin/site-health.js
index dd410de097f85..fe011bca6437f 100644
--- a/src/js/_enqueues/admin/site-health.js
+++ b/src/js/_enqueues/admin/site-health.js
@@ -55,8 +55,9 @@ jQuery( function( $ ) {
 		}
 	} );
 
-	// Get hash from query string and open the related accordion.
-	setTimeout( function() {
+	/* global setTimeout */
+	wp.domReady( function() {
+		// Get hash from query string and open the related accordion.
 		var hash = window.location.hash;
 
 		if ( hash ) {
@@ -66,7 +67,7 @@ jQuery( function( $ ) {
 				requestedPanel.trigger( 'click' );
 			}
 		}
-	}, 100 );
+	} );
 
 	// Site Health test handling.
 

From b29c1d3aea336ad00073651ed0cdee62e3121b0c Mon Sep 17 00:00:00 2001
From: Nikunj Hatkar <nikunj8866@gmail.com>
Date: Thu, 3 Jul 2025 14:26:04 +0530
Subject: [PATCH 3/4] Remove hash click for the Status tab

---
 src/js/_enqueues/admin/site-health.js | 4 +++-
 src/wp-admin/site-health.php          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/js/_enqueues/admin/site-health.js b/src/js/_enqueues/admin/site-health.js
index fe011bca6437f..3fd1afec64c53 100644
--- a/src/js/_enqueues/admin/site-health.js
+++ b/src/js/_enqueues/admin/site-health.js
@@ -44,7 +44,9 @@ jQuery( function( $ ) {
 	$( '.health-check-accordion' ).on( 'click', '.health-check-accordion-trigger', function() {
 		var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) );
 
-		window.location.hash = $( this ).attr( 'id' );
+		if ( 'undefined' !== typeof $( this ).attr( 'id' ) ) {
+			window.location.hash = $( this ).attr( 'id' );
+		}
 
 		if ( isExpanded ) {
 			$( this ).attr( 'aria-expanded', 'false' );
diff --git a/src/wp-admin/site-health.php b/src/wp-admin/site-health.php
index 203acff2137fc..0fd7fef07a00a 100644
--- a/src/wp-admin/site-health.php
+++ b/src/wp-admin/site-health.php
@@ -301,7 +301,7 @@
 
 <script id="tmpl-health-check-issue" type="text/template">
 	<h4 class="health-check-accordion-heading">
-		<button id="health-check-section-{{ data.test }}" aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-{{ data.test }}" type="button">
+		<button aria-expanded="false" class="health-check-accordion-trigger" aria-controls="health-check-accordion-block-{{ data.test }}" type="button">
 			<span class="title">{{ data.label }}</span>
 			<# if ( data.badge ) { #>
 				<span class="badge {{ data.badge.color }}">{{ data.badge.label }}</span>

From 44315268746d035b806d13fb7a63922eef0446a3 Mon Sep 17 00:00:00 2001
From: Nikunj Hatkar <nikunj8866@gmail.com>
Date: Tue, 21 Oct 2025 10:24:17 +0530
Subject: [PATCH 4/4] changes suggested by westonruter

---
 src/js/_enqueues/admin/site-health.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/_enqueues/admin/site-health.js b/src/js/_enqueues/admin/site-health.js
index 3fd1afec64c53..57d5c9cbcf289 100644
--- a/src/js/_enqueues/admin/site-health.js
+++ b/src/js/_enqueues/admin/site-health.js
@@ -44,8 +44,8 @@ jQuery( function( $ ) {
 	$( '.health-check-accordion' ).on( 'click', '.health-check-accordion-trigger', function() {
 		var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) );
 
-		if ( 'undefined' !== typeof $( this ).attr( 'id' ) ) {
-			window.location.hash = $( this ).attr( 'id' );
+		if ( $( this ).prop( 'id' ) ) {
+			window.location.hash = $( this ).prop( 'id' );
 		}
 
 		if ( isExpanded ) {
@@ -65,7 +65,7 @@ jQuery( function( $ ) {
 		if ( hash ) {
 			var requestedPanel = $( hash );
 
-			if ( requestedPanel.length ) {
+			if ( requestedPanel.is( '.health-check-accordion-trigger' ) ) {
 				requestedPanel.trigger( 'click' );
 			}
 		}