feat: include object id in filter option data for hierarchical filter

dinhtungdu · dinhtungdu · commit 2736551338f8 · 2025-08-01T12:27:55.000+07:00
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/frontend.ts b/plugins/woocommerce/client/blocks/assets/js/blocks/product-filters/frontend.ts
@@ -52,7 +52,8 @@ type FilterItem = {
 	count: number;
 	type: string;
 	attributeQueryType?: 'and' | 'or' | undefined;
-	parent?: string;
+	id?: number;
+	parent?: number;
 	depth?: number;
 };
 
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductFilterTaxonomy.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductFilterTaxonomy.php
@@ -183,10 +183,12 @@ function ( $term ) use ( $taxonomy_counts, $selected_terms, $taxonomy ) {
 					);
 
 					if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-						if ( isset( $term['depth'] ) ) {
+						$option['id'] = $term['term_id'];
+
+						if ( isset( $term['depth'] ) && $term['depth'] > 0 ) {
 							$option['depth'] = $term['depth'];
 						}
-						if ( isset( $term['parent'] ) ) {
+						if ( isset( $term['parent'] ) && $term['parent'] > 0 ) {
 							$option['parent'] = $term['parent'];
 						}
 					}
diff --git a/plugins/woocommerce/src/Internal/ProductFilters/TaxonomyHierarchyData.php b/plugins/woocommerce/src/Internal/ProductFilters/TaxonomyHierarchyData.php
@@ -186,7 +186,7 @@ private function build_full_hierarchy_map( string $taxonomy ): array {
 	}
 
 	/**
-	 * Recursively build hierarchical term tree with depth and parent slug.
+	 * Recursively build hierarchical term tree with depth and parent.
 	 *
 	 * @param array $tree       Reference to tree array being built.
 	 * @param int   $term_id    Current term ID.
@@ -198,9 +198,7 @@ private function build_full_hierarchy_map( string $taxonomy ): array {
 	private function build_term_tree( &$tree, $term_id, $children, $temp_terms, $parent_id = 0, $depth = 0 ) {
 		$tree[ $term_id ]          = $temp_terms[ $term_id ];
 		$tree[ $term_id ]['depth'] = $depth;
-		if ( isset( $temp_terms[ $parent_id ] ) ) {
-			$tree[ $term_id ]['parent'] = $temp_terms[ $parent_id ]['slug'];
-		}
+
 		if ( ! empty( $children[ $term_id ] ) ) {
 			foreach ( $children[ $term_id ] as $child_id ) {
 				$this->build_term_tree( $tree[ $term_id ]['children'], $child_id, $children, $temp_terms, $term_id, $depth + 1 );

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,12 @@ function ( $term ) use ( $taxonomy_counts, $selected_terms, $taxonomy ) {`
`183`	`183`	`);`
`184`	`184`
`185`	`185`	`if ( is_taxonomy_hierarchical( $taxonomy ) ) {`
`186`		`- if ( isset( $term['depth'] ) ) {`
	`186`	`+ $option['id'] = $term['term_id'];`
	`187`	`+`
	`188`	`+ if ( isset( $term['depth'] ) && $term['depth'] > 0 ) {`
`187`	`189`	`$option['depth'] = $term['depth'];`
`188`	`190`	`}`
`189`		`- if ( isset( $term['parent'] ) ) {`
	`191`	`+ if ( isset( $term['parent'] ) && $term['parent'] > 0 ) {`
`190`	`192`	`$option['parent'] = $term['parent'];`
`191`	`193`	`}`
`192`	`194`	`}`