From d605ecd74e797f98b23983d53e68a3836534a50e Mon Sep 17 00:00:00 2001 From: Jeff Stieler Date: Mon, 3 Dec 2018 11:55:04 -0700 Subject: [PATCH] Order data: fix isGetOrdersRequesting() for the first request. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensure a boolean return from isGetOrdersRequesting() and handle cases where requests haven’t taken off or responses haven’t been received yet. --- .../client/wc-api/orders/selectors.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/woocommerce-admin/client/wc-api/orders/selectors.js b/plugins/woocommerce-admin/client/wc-api/orders/selectors.js index d1f01cc8e09..e1b30b0b077 100644 --- a/plugins/woocommerce-admin/client/wc-api/orders/selectors.js +++ b/plugins/woocommerce-admin/client/wc-api/orders/selectors.js @@ -1,4 +1,10 @@ /** @format */ + +/** + * External dependencies + */ +import { isNil } from 'lodash'; + /** * Internal dependencies */ @@ -26,7 +32,16 @@ const getOrdersTotalCount = ( getResource, requireResource ) => ( const isGetOrdersRequesting = getResource => ( query = {} ) => { const resourceName = getResourceName( 'order-query', query ); const { lastRequested, lastReceived } = getResource( resourceName ); - return lastRequested && lastRequested > lastReceived; + + if ( isNil( lastRequested ) ) { + return false; + } + + if ( isNil( lastReceived ) ) { + return true; + } + + return lastRequested > lastReceived; }; const isGetOrdersError = getResource => ( query = {} ) => {