Remove orderCount and publishedProductCount setting and make use of data stores

louwie17 · louwie17 · commit 8c2e6e881778 · 2022-05-16T15:21:44.000-03:00
diff --git a/plugins/woocommerce-admin/client/homescreen/activity-panel/index.js b/plugins/woocommerce-admin/client/homescreen/activity-panel/index.js
@@ -10,7 +10,11 @@ import {
 	PanelRow,
 	__experimentalText as Text,
 } from '@wordpress/components';
-import { ONBOARDING_STORE_NAME } from '@woocommerce/data';
+import {
+	ONBOARDING_STORE_NAME,
+	ORDERS_STORE_NAME,
+	PRODUCTS_STORE_NAME,
+} from '@woocommerce/data';
 import { recordEvent } from '@woocommerce/tracks';
 import { useEffect } from '@wordpress/element';
 import { snakeCase } from 'lodash';
@@ -29,22 +33,46 @@ import { getUnapprovedReviews } from './reviews/utils';
 import { getUrlParams } from '../../utils';
 import { getAdminSetting } from '~/utils/admin-settings';
 
+const ORDERS_QUERY_PARAMS = { _fields: [ 'id' ] };
+const PUBLISHED_PRODUCTS_QUERY_PARAMS = {
+	status: 'publish',
+	_fields: [ 'id' ],
+};
+
 export const ActivityPanel = () => {
 	const panelsData = useSelect( ( select ) => {
-		const totalOrderCount = getAdminSetting( 'orderCount', 0 );
+		const {
+			getOrdersTotalCount,
+			hasFinishedResolution: hasFinishedOrdersResolution,
+		} = select( ORDERS_STORE_NAME );
+		const {
+			getProductsTotalCount,
+			hasFinishedResolution: hasFinishedProductsResolution,
+		} = select( PRODUCTS_STORE_NAME );
+		const totalOrderCount = getOrdersTotalCount( ORDERS_QUERY_PARAMS, 0 );
 		const orderStatuses = getOrderStatuses( select );
 		const reviewsEnabled = getAdminSetting( 'reviewsEnabled', 'no' );
 		const unreadOrdersCount = getUnreadOrders( select, orderStatuses );
 		const manageStock = getAdminSetting( 'manageStock', 'no' );
 		const lowStockProductsCount = getLowStockCount( select );
 		const unapprovedReviewsCount = getUnapprovedReviews( select );
-		const publishedProductCount = getAdminSetting(
-			'publishedProductCount',
+		const publishedProductCount = getProductsTotalCount(
+			PUBLISHED_PRODUCTS_QUERY_PARAMS,
 			0
 		);
+		const loadingOrderAndProductCount =
+			! hasFinishedOrdersResolution( 'getOrdersTotalCount', [
+				ORDERS_QUERY_PARAMS,
+				0,
+			] ) ||
+			! hasFinishedProductsResolution( 'getProductsTotalCount', [
+				PUBLISHED_PRODUCTS_QUERY_PARAMS,
+				0,
+			] );
 		const taskList = select( ONBOARDING_STORE_NAME ).getTaskList( 'setup' );
 
 		return {
+			loadingOrderAndProductCount,
 			lowStockProductsCount,
 			unapprovedReviewsCount,
 			unreadOrdersCount,
@@ -57,7 +85,9 @@ export const ActivityPanel = () => {
 		};
 	} );
 
-	const panels = getAllPanels( panelsData );
+	const panels = panelsData.loadingOrderAndProductCount
+		? []
+		: getAllPanels( panelsData );
 
 	useEffect( () => {
 		if ( panelsData.isTaskListHidden !== undefined ) {
diff --git a/plugins/woocommerce/src/Internal/Admin/Homescreen.php b/plugins/woocommerce/src/Internal/Admin/Homescreen.php
@@ -50,8 +50,6 @@ public function __construct() {
 			add_action( 'admin_head', array( $this, 'update_link_structure' ), 20 );
 		}
 		add_filter( 'woocommerce_admin_preload_options', array( $this, 'preload_options' ) );
-
-		add_filter( 'woocommerce_admin_shared_settings', array( $this, 'component_settings' ), 20 );
 	}
 
 	/**
@@ -179,23 +177,4 @@ public function preload_options( $options ) {
 
 		return $options;
 	}
-
-	/**
-	 * Add data to the shared component settings.
-	 *
-	 * @param array $settings Shared component settings.
-	 */
-	public function component_settings( $settings ) {
-		$allowed_statuses = Settings::get_order_statuses( wc_get_order_statuses() );
-
-		// Remove the Draft Order status (from the Checkout Block).
-		unset( $allowed_statuses['checkout-draft'] );
-
-		$status_counts                     = array_map( 'wc_orders_count', array_keys( $allowed_statuses ) );
-		$product_counts                    = wp_count_posts( 'product' );
-		$settings['orderCount']            = array_sum( $status_counts );
-		$settings['publishedProductCount'] = $product_counts->publish;
-
-		return $settings;
-	}
 }
