Skip to content

Reduce repeated option reads during dashboard navigation URL resolution #3067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codefora-dev wants to merge 2 commits into
base: develop
Choose a base branch
from
+91 −62
Open

Reduce repeated option reads during dashboard navigation URL resolution #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c4b79
Fix: memoize dokan_get_navigation_url per request
codefora-dev Jan 9, 2026
4911c16
Perf: avoid repeated nav rebuild during react route rewrite
codefora-dev Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 66 additions & 49 deletions includes/VendorNavMenuChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ class VendorNavMenuChecker {
*/
protected array $forcefully_resolved_dependencies = [];

/**
* Request-scoped map of react_route => url for fast lookup.
*
* @since 4.0.0
*
* @var array<string,string>
*/
protected $react_route_url_map = [];

/**
* Constructor.
*/
Expand Down Expand Up @@ -72,20 +81,29 @@ public function get_template_dependencies(): array {
*
* @return array
*/

public function convert_to_react_menu( array $menu_items ): array {
return array_map(
function ( $item ) {
if ( ! empty( $item['react_route'] ) && $this->is_dependency_resolved( $item['react_route'] ) ) {
$item['url'] = $this->get_url_for_route( $item['react_route'] );
}
if ( isset( $item['submenu'] ) ) {
$item['submenu'] = $this->convert_to_react_menu( $item['submenu'] );
}

return $item;
}, $menu_items
);
return array_map(
function ( $item ) {
if ( ! empty( $item['react_route'] ) && $this->is_dependency_resolved( $item['react_route'] ) ) {
$item['url'] = $this->get_url_for_route( $item['react_route'] );
}

// Build request-scoped map for fast lookups in maybe_rewrite_to_react_route().
if ( ! empty( $item['react_route'] ) && ! empty( $item['url'] ) && is_string( $item['react_route'] ) ) {
$route = trim( (string) $item['react_route'], '/' );
if ( $route !== '' ) {
$this->react_route_url_map[ $route ] = (string) $item['url'];
}
}

if ( isset( $item['submenu'] ) ) {
$item['submenu'] = $this->convert_to_react_menu( $item['submenu'] );
}

return $item;
},
$menu_items
);
}

/**
Expand All @@ -95,46 +113,45 @@ function ( $item ) {
*
* @param string $url URL.
* @param string $name Name.
* @param bool $new_url New URL.
* @param bool $new_url New URL.
*
* @return string
*/

public function maybe_rewrite_to_react_route( string $url, $name, $new_url ): string {
$name = (string) $name;
if ( $name === '' || $name === 'new' ) {
return $url;
}
if ( $new_url ) {
return $url;
}
if ( strpos( $url, '#' ) !== false ) {
return $url;
}

remove_filter( 'dokan_get_navigation_url', [ $this, 'maybe_rewrite_to_react_route' ], 5 );
// Check if the top level menu exists and has a react route
$menus = dokan_get_dashboard_nav();

foreach ( $menus as $menu ) {
$react_route = $menu['react_route'] ?? '';
if ( $react_route === $name ) {
$url = $menu['url'];
}

if ( isset( $menu['submenu'] ) && is_array( $menu['submenu'] ) ) {
foreach ( $menu['submenu'] as $submenu ) {
$react_route = $submenu['react_route'] ?? '';
if ( $react_route === $name ) {
$url = $submenu['url'];
}
}
}
}

add_filter( 'dokan_get_navigation_url', [ $this, 'maybe_rewrite_to_react_route' ], 5, 3 );

return $url;
$name = trim( (string) $name, '/' );

if ( $name === '' || $name === 'new' ) {
return $url;
}

if ( $new_url ) {
return $url;
}

if ( strpos( $url, '#' ) !== false ) {
return $url;
}

// Fast path: if already mapped during this request, return immediately.
if ( isset( $this->react_route_url_map[ $name ] ) ) {
return $this->react_route_url_map[ $name ];
}
// If the map isn't built yet this request, build it once.
if ( empty( $this->react_route_url_map ) ) {
remove_filter( 'dokan_get_navigation_url', [ $this, 'maybe_rewrite_to_react_route' ], 5 );
// This triggers convert_to_react_menu(), which will populate $this->react_route_url_map.
dokan_get_dashboard_nav();
add_filter( 'dokan_get_navigation_url', [ $this, 'maybe_rewrite_to_react_route' ], 5, 3 );
}
if ( isset( $this->react_route_url_map[ $name ] ) ) {
return $this->react_route_url_map[ $name ];
}
return $url;
}

/**
Expand Down
38 changes: 25 additions & 13 deletions includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2022,24 +2022,36 @@ function dokan_get_avatar_url( $url, $id_or_email, $args ) {
* @return string url
*/
function dokan_get_navigation_url( $name = '', $new_url = false ) {
$page_id = (int) dokan_get_option( 'dashboard', 'dokan_pages', 0 );
static $memo = [];

if ( ! $page_id ) {
return '';
}
$name = is_scalar( $name ) ? (string) $name : '';
$new_url = (bool) $new_url;

$url = rtrim( get_permalink( $page_id ), '/' ) . '/';
$key = $name . '|' . ( $new_url ? '1' : '0' );
if ( isset( $memo[ $key ] ) ) {
return $memo[ $key ];
}

if ( ! empty( $name ) && ! $new_url ) {
$url = dokan_add_subpage_to_url( $url, $name . '/' );
}
// Page id is the key expensive option read seen in hot paths.
$page_id = (int) dokan_get_option( 'dashboard', 'dokan_pages', 0 );

if ( $new_url ) {
$url = dokan_add_subpage_to_url( $url, 'new/' );
$url = $url . '#' . $name . '/';
}
if ( ! $page_id ) {
$memo[ $key ] = '';
return '';
}

$url = rtrim( get_permalink( $page_id ), '/' ) . '/';

if ( $new_url ) {
$url = dokan_add_subpage_to_url( $url, 'new/' );
$url = $url . '#' . trim( $name, '/' ) . '/';
} elseif ( $name !== '' ) {
$url = dokan_add_subpage_to_url( $url, $name . '/' );
}

$memo[ $key ] = apply_filters( 'dokan_get_navigation_url', esc_url( $url ), $name, $new_url );

return apply_filters( 'dokan_get_navigation_url', esc_url( $url ), $name, $new_url );
return $memo[ $key ];
}

/**
Expand Down