From 1701b6ce15d11948cce70a803579acce1f397ce2 Mon Sep 17 00:00:00 2001
From: Paul Sealock <psealock@gmail.com>
Date: Thu, 1 Jul 2021 11:16:11 +1200
Subject: [PATCH] Analytics Flag: Remove performance indicators when disabled
 (https://github.com/woocommerce/woocommerce-admin/pull/7234)

* remove performance indicators if analytics off

* changelog

* Hide the display option if there is only content for a single column
---
 .../activity-panel/display-options/index.js   | 113 +++++++++++-------
 .../client/homescreen/layout.js               |   8 +-
 plugins/woocommerce-admin/readme.txt          |   1 +
 3 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/plugins/woocommerce-admin/client/header/activity-panel/display-options/index.js b/plugins/woocommerce-admin/client/header/activity-panel/display-options/index.js
index 7246cc5d0ce..92694ca155f 100644
--- a/plugins/woocommerce-admin/client/header/activity-panel/display-options/index.js
+++ b/plugins/woocommerce-admin/client/header/activity-panel/display-options/index.js
@@ -47,12 +47,20 @@ const LAYOUTS = [
 ];
 
 export const DisplayOptions = () => {
-	const { defaultHomescreenLayout } = useSelect( ( select ) => {
+	const {
+		defaultHomescreenLayout,
+		taskListComplete,
+		isTaskListHidden,
+	} = useSelect( ( select ) => {
 		const { getOption } = select( OPTIONS_STORE_NAME );
 		return {
 			defaultHomescreenLayout:
 				getOption( 'woocommerce_default_homepage_layout' ) ||
 				'single_column',
+			taskListComplete:
+				getOption( 'woocommerce_task_list_complete' ) === 'yes',
+			isTaskListHidden:
+				getOption( 'woocommerce_task_list_hidden' ) === 'yes',
 		};
 	} );
 	const {
@@ -60,51 +68,70 @@ export const DisplayOptions = () => {
 		homepage_layout: layout,
 	} = useUserPreferences();
 
+	const shouldShowStoreLinks = taskListComplete || isTaskListHidden;
+	const hasTwoColumnContent =
+		shouldShowStoreLinks || window.wcAdminFeatures.analytics;
+
 	return (
 		<Slot>
-			{ ( fills ) => (
-				<DropdownMenu
-					icon={ <DisplayIcon /> }
-					/* translators: button label text should, if possible, be under 16 characters. */
-					label={ __( 'Display options', 'woocommerce-admin' ) }
-					toggleProps={ {
-						className:
-							'woocommerce-layout__activity-panel-tab display-options',
-						onClick: () =>
-							recordEvent( 'homescreen_display_click' ),
-					} }
-					popoverProps={ {
-						className: 'woocommerce-layout__activity-panel-popover',
-					} }
-				>
-					{ ( { onClose } ) => (
-						<>
-							{ fills }
-							<MenuGroup
-								className="woocommerce-layout__homescreen-display-options"
-								label={ __( 'Layout', 'woocommerce-admin' ) }
-							>
-								<MenuItemsChoice
-									choices={ LAYOUTS }
-									onSelect={ ( newLayout ) => {
-										updateUserPreferences( {
-											homepage_layout: newLayout,
-										} );
-										onClose();
-										recordEvent(
-											'homescreen_display_option',
-											{
-												display_option: newLayout,
+			{ ( fills ) => {
+				// If there is no fill to render and only single column content, don't render the display.
+				if ( fills.length === 0 && ! hasTwoColumnContent ) {
+					return null;
+				}
+				return (
+					<DropdownMenu
+						icon={ <DisplayIcon /> }
+						/* translators: button label text should, if possible, be under 16 characters. */
+						label={ __( 'Display options', 'woocommerce-admin' ) }
+						toggleProps={ {
+							className:
+								'woocommerce-layout__activity-panel-tab display-options',
+							onClick: () =>
+								recordEvent( 'homescreen_display_click' ),
+						} }
+						popoverProps={ {
+							className:
+								'woocommerce-layout__activity-panel-popover',
+						} }
+					>
+						{ ( { onClose } ) => (
+							<>
+								{ fills }
+								{ hasTwoColumnContent ? (
+									<MenuGroup
+										className="woocommerce-layout__homescreen-display-options"
+										label={ __(
+											'Layout',
+											'woocommerce-admin'
+										) }
+									>
+										<MenuItemsChoice
+											choices={ LAYOUTS }
+											onSelect={ ( newLayout ) => {
+												updateUserPreferences( {
+													homepage_layout: newLayout,
+												} );
+												onClose();
+												recordEvent(
+													'homescreen_display_option',
+													{
+														display_option: newLayout,
+													}
+												);
+											} }
+											value={
+												layout ||
+												defaultHomescreenLayout
 											}
-										);
-									} }
-									value={ layout || defaultHomescreenLayout }
-								/>
-							</MenuGroup>
-						</>
-					) }
-				</DropdownMenu>
-			) }
+										/>
+									</MenuGroup>
+								) : null }
+							</>
+						) }
+					</DropdownMenu>
+				);
+			} }
 		</Slot>
 	);
 };
diff --git a/plugins/woocommerce-admin/client/homescreen/layout.js b/plugins/woocommerce-admin/client/homescreen/layout.js
index a791613698c..5692c6cc9ed 100644
--- a/plugins/woocommerce-admin/client/homescreen/layout.js
+++ b/plugins/woocommerce-admin/client/homescreen/layout.js
@@ -57,9 +57,12 @@ export const Layout = ( {
 	updateOptions,
 } ) => {
 	const userPrefs = useUserPreferences();
+	const shouldShowStoreLinks = taskListComplete || isTaskListHidden;
+	const hasTwoColumnContent =
+		shouldShowStoreLinks || window.wcAdminFeatures.analytics;
 	const twoColumns =
 		( userPrefs.homepage_layout || defaultHomescreenLayout ) ===
-		'two_columns';
+			'two_columns' && hasTwoColumnContent;
 	const [ showInbox, setShowInbox ] = useState( true );
 
 	const isTaskListEnabled = bothTaskListsHidden === false;
@@ -84,7 +87,6 @@ export const Layout = ( {
 	}, [ maybeToggleColumns ] );
 
 	const shouldStickColumns = isWideViewport.current && twoColumns;
-	const shouldShowStoreLinks = taskListComplete || isTaskListHidden;
 
 	const renderColumns = () => {
 		return (
@@ -103,7 +105,7 @@ export const Layout = ( {
 					<InboxPanel />
 				</Column>
 				<Column shouldStick={ shouldStickColumns }>
-					<StatsOverview />
+					{ window.wcAdminFeatures.analytics && <StatsOverview /> }
 					{ shouldShowStoreLinks && <StoreManagementLinks /> }
 				</Column>
 			</>
diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt
index 98ca0242e15..2c5e835508c 100644
--- a/plugins/woocommerce-admin/readme.txt
+++ b/plugins/woocommerce-admin/readme.txt
@@ -100,6 +100,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt
 - Fix: Currency display on Orders activity card on homescreen #7181
 - Fix: Report export filtering bug. #7165
 - Fix:  Use tab char for the CSV injection prevention. #7154
+- Tweak: Remove performance indicators when Analytics Flag disabled #7234
 - Tweak: Revert Card component removal #7167
 - Tweak: Removed unused feature flags #7233
 - Update: Notes to use a date range. #7222