Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use core orders endpoint for initial orders panel query. 

Side steps the lookup table to catch order status transitions immediately.
This commit is contained in:
Jeff Stieler 2019-07-16 15:04:28 -06:00
parent bb4f067b61
commit 9bbc4fa96d
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/woocommerce-admin/client/header/activity-panel/panels/orders.js
View File

@ -9,6 +9,7 @@ import { compose } from '@wordpress/compose';
import Gridicon from 'gridicons'; import Gridicon from 'gridicons';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import interpolateComponents from 'interpolate-components'; import interpolateComponents from 'interpolate-components';
import { keyBy, map, merge } from 'lodash';
/** /**
* WooCommerce dependencies * WooCommerce dependencies
@ -256,7 +257,15 @@ OrdersPanel.defaultProps = {
export default compose( export default compose(
withSelect( ( select, props ) => { withSelect( ( select, props ) => {
const { hasActionableOrders } = props; const { hasActionableOrders } = props;
const { getReportItems, getReportItemsError, isReportItemsRequesting } = select( 'wc-api' ); const {
getItems,
getItemsTotalCount,
getItemsError,
isGetItemsRequesting,
getReportItems,
getReportItemsError,
isReportItemsRequesting,
} = select( 'wc-api' );
const orderStatuses = const orderStatuses =
wcSettings.wcAdminSettings.woocommerce_actionable_order_statuses || wcSettings.wcAdminSettings.woocommerce_actionable_order_statuses ||
DEFAULT_ACTIONABLE_STATUSES; DEFAULT_ACTIONABLE_STATUSES;
@ -265,29 +274,37 @@ export default compose(
return { orders: [], isError: true, isRequesting: false, orderStatuses }; return { orders: [], isError: true, isRequesting: false, orderStatuses };
} }
if ( hasActionableOrders ) { // Query the core Orders endpoint for the most up-to-date statuses.
const allOrdersQuery = {
page: 1,
per_page: QUERY_DEFAULTS.pageSize,
status: orderStatuses,
};
const actionableOrders = Array.from( getItems( 'orders', allOrdersQuery ).values() );
if ( hasActionableOrders && actionableOrders.length ) {
// Retrieve the Order stats data from our reporting table.
const ordersQuery = { const ordersQuery = {
page: 1, page: 1,
per_page: QUERY_DEFAULTS.pageSize, per_page: QUERY_DEFAULTS.pageSize,
status_is: orderStatuses,
extended_info: true, extended_info: true,
order_includes: map( actionableOrders, 'id' ),
}; };
const orders = getReportItems( 'orders', ordersQuery ).data; // Merge the core endpoint data with our reporting table.
const reportOrdersById = keyBy( getReportItems( 'orders', ordersQuery ).data, 'order_id' );
const actionableOrdersById = keyBy( actionableOrders, 'id' );
const orders = Object.values( merge( reportOrdersById, actionableOrdersById ) );
const isError = Boolean( getReportItemsError( 'orders', ordersQuery ) ); const isError = Boolean( getReportItemsError( 'orders', ordersQuery ) );
const isRequesting = isReportItemsRequesting( 'orders', ordersQuery ); const isRequesting = isReportItemsRequesting( 'orders', ordersQuery );
return { orders, isError, isRequesting, orderStatuses }; return { orders, isError, isRequesting, orderStatuses };
} }
const allOrdersQuery = { const totalNonActionableOrders = getItemsTotalCount( 'orders', allOrdersQuery );
page: 1, const isError = Boolean( getItemsError( 'orders', allOrdersQuery ) );
per_page: 0, const isRequesting = isGetItemsRequesting( 'orders', allOrdersQuery );
};
const totalNonActionableOrders = getReportItems( 'orders', allOrdersQuery ).totalResults;
const isError = Boolean( getReportItemsError( 'orders', allOrdersQuery ) );
const isRequesting = isReportItemsRequesting( 'orders', allOrdersQuery );
return { return {
hasNonActionableOrders: totalNonActionableOrders > 0, hasNonActionableOrders: totalNonActionableOrders > 0,