Prevent requesting the checklist when the launchpad is displayed (#90604

)
Automattic · May 13, 2024 · 32bdf3c · 32bdf3c
1 parent 05a48c5
commit 32bdf3c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/client/my-sites/customer-home/cards/tasks/site-setup-list/index.jsx b/client/my-sites/customer-home/cards/tasks/site-setup-list/index.jsx
@@ -7,6 +7,7 @@ import { memoize } from 'lodash';
 import { useEffect, useState } from 'react';
 import { connect, useDispatch } from 'react-redux';
 import CardHeading from 'calypso/components/card-heading';
+import QuerySiteChecklist from 'calypso/components/data/query-site-checklist';
 import useSkipCurrentViewMutation from 'calypso/data/home/use-skip-current-view-mutation';
 import withIsFSEActive from 'calypso/data/themes/with-is-fse-active';
 import { getTaskList } from 'calypso/lib/checklist';
@@ -385,4 +386,21 @@ const ConnectedSiteSetupList = connect( ( state, props ) => {
 	};
 } )( SiteSetupList );
 
-export default withIsFSEActive( ConnectedSiteSetupList );
+const WithIsFSEActiveSiteSetupList = withIsFSEActive( ConnectedSiteSetupList );
+export default WithIsFSEActiveSiteSetupList;
+
+const SiteSetupListWrapper = ( { siteId } ) => {
+	if ( ! siteId ) {
+		return null;
+	}
+	return (
+		<>
+			<QuerySiteChecklist siteId={ siteId } />
+			<WithIsFSEActiveSiteSetupList />
+		</>
+	);
+};
+
+export const ConnectedSiteSetupListWrapper = connect( ( state ) => ( {
+	siteId: getSelectedSiteId( state ),
+} ) )( SiteSetupListWrapper );
diff --git a/client/my-sites/customer-home/locations/card-components.ts b/client/my-sites/customer-home/locations/card-components.ts
@@ -80,7 +80,7 @@ import PromotePost from 'calypso/my-sites/customer-home/cards/tasks/promote-post
 import Renew from 'calypso/my-sites/customer-home/cards/tasks/renew';
 import { ReviveAutoRevertedAtomic } from 'calypso/my-sites/customer-home/cards/tasks/revive-auto-reverted-atomic';
 import SiteResumeCopy from 'calypso/my-sites/customer-home/cards/tasks/site-resume-copy';
-import SiteSetupList from 'calypso/my-sites/customer-home/cards/tasks/site-setup-list';
+import { ConnectedSiteSetupListWrapper } from 'calypso/my-sites/customer-home/cards/tasks/site-setup-list';
 import TitanBanner from 'calypso/my-sites/customer-home/cards/tasks/titan-banner';
 import UseBuiltBy from 'calypso/my-sites/customer-home/cards/tasks/use-built-by';
 import VerifyEmail from 'calypso/my-sites/customer-home/cards/tasks/verify-email';
@@ -120,7 +120,7 @@ const PRIMARY_CARD_COMPONENTS: CardComponentMap = {
 	[ TASK_REACTIVATE_EXPIRED_PLAN ]: ReviveAutoRevertedAtomic,
 	[ TASK_REACTIVATE_RESTORE_BACKUP ]: ReviveAutoRevertedAtomic,
 	[ TASK_SITE_RESUME_COPY ]: SiteResumeCopy,
-	[ TASK_SITE_SETUP_CHECKLIST ]: SiteSetupList,
+	[ TASK_SITE_SETUP_CHECKLIST ]: ConnectedSiteSetupListWrapper,
 	[ TASK_UPSELL_TITAN ]: TitanBanner,
 	[ TASK_USE_BUILT_BY ]: UseBuiltBy,
 	[ TASK_VERIFY_EMAIL ]: VerifyEmail,

diff --git a/client/my-sites/customer-home/main.jsx b/client/my-sites/customer-home/main.jsx
@@ -10,7 +10,6 @@ import { connect, useSelector } from 'react-redux';
 import SiteIcon from 'calypso/blocks/site-icon';
 import AsyncLoad from 'calypso/components/async-load';
 import DocumentHead from 'calypso/components/data/document-head';
-import QuerySiteChecklist from 'calypso/components/data/query-site-checklist';
 import EmptyContent from 'calypso/components/empty-content';
 import { JetpackConnectionHealthBanner } from 'calypso/components/jetpack/connection-health';
 import Main from 'calypso/components/main';
@@ -277,7 +276,6 @@ const Home = ( {
 		<Main wideLayout className="customer-home__main">
 			<PageViewTracker path="/home/:site" title={ translate( 'My Home' ) } />
 			<DocumentHead title={ translate( 'My Home' ) } />
-			{ siteId && <QuerySiteChecklist siteId={ siteId } /> }
 			{ siteId && isJetpack && isPossibleJetpackConnectionProblem && (
 				<JetpackConnectionHealthBanner siteId={ siteId } />
 			) }