From 6cb15280bbed08e9a09e3b5c03977e2b2007fb8c Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Tue, 13 Aug 2019 15:27:15 -0700 Subject: [PATCH] Wait until all chart data page requests are complete before rendering. --- plugins/woocommerce-admin/client/wc-api/reports/utils.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/woocommerce-admin/client/wc-api/reports/utils.js b/plugins/woocommerce-admin/client/wc-api/reports/utils.js index 4b70e3273ab..ede1eef4a52 100644 --- a/plugins/woocommerce-admin/client/wc-api/reports/utils.js +++ b/plugins/woocommerce-admin/client/wc-api/reports/utils.js @@ -274,6 +274,7 @@ export function getReportChartData( options ) { let isError = false; const pagedData = []; const totalPages = Math.ceil( stats.totalResults / MAX_PER_PAGE ); + let pagesFetched = 1; for ( let i = 2; i <= totalPages; i++ ) { const nextQuery = { ...requestQuery, page: i }; @@ -288,7 +289,9 @@ export function getReportChartData( options ) { } pagedData.push( _data ); - if ( i === totalPages ) { + pagesFetched++; + + if ( pagesFetched === totalPages ) { isFetching = false; break; }