Skip to content

Fix jobs page performance and enable parent/child expand UI #859

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

Merged
chubes4 merged 1 commit into from
Mar 18, 2026
Merged

Fix jobs page performance and enable parent/child expand UI #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions inc/Core/Admin/Pages/Jobs/assets/react/components/JobsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,15 @@ const formatStatus = ( status ) => {
};

/**
* Determine if a job is a batch parent from engine_data.
* Determine if a job has child jobs (batch parent or any parent).
* Uses child_count from the DB query, falls back to engine_data batch flag.
*/
const isBatchParent = ( job ) => {
const hasChildren = ( job ) => {
// Prefer the child_count from the SQL subquery (most reliable).
if ( job.child_count !== undefined && parseInt( job.child_count, 10 ) > 0 ) {
return true;
}
// Fallback: check engine_data for batch flag.
if ( ! job.engine_data ) {
return false;
}
Expand Down Expand Up @@ -207,7 +213,7 @@ const ChildRows = ( { parentJobId } ) => {
* Single job row — handles expand/collapse for batch parents.
*/
const JobRow = ( { job, isExpanded, onToggle } ) => {
const isBatch = isBatchParent( job );
const isBatch = hasChildren( job );

return (
<>
Expand Down
11 changes: 7 additions & 4 deletions inc/Core/Database/Jobs/JobsOperations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,17 +314,20 @@ public function get_jobs_for_list_table( array $args ): array {
// Build the full query
// Note: orderby is validated above, so safe to interpolate
// For direct execution jobs, LEFT JOINs will return NULL for pipeline_name/flow_name
// JOIN uses j.pipeline_id (varchar) directly against CAST of p.pipeline_id (int) to varchar
// for index-friendly matching on the jobs table side.
// phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared, WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber
$query = $this->wpdb->prepare(
"SELECT j.*, p.pipeline_name, f.flow_name
"SELECT j.*, p.pipeline_name, f.flow_name,
(SELECT COUNT(*) FROM %i c WHERE c.parent_job_id = j.job_id) AS child_count
FROM %i j
LEFT JOIN %i p ON j.pipeline_id = CAST(p.pipeline_id AS CHAR)
LEFT JOIN %i f ON j.flow_id = CAST(f.flow_id AS CHAR)
LEFT JOIN %i p ON j.pipeline_id = p.pipeline_id
LEFT JOIN %i f ON j.flow_id = f.flow_id
{$where_sql}
ORDER BY {$orderby} {$order}
LIMIT %d OFFSET %d",
array_merge(
array( $this->table_name, $pipelines_table, $flows_table ),
array( $this->table_name, $this->table_name, $pipelines_table, $flows_table ),
$where_values,
array( $per_page, $offset )
)
Expand Down
Loading