From 59c94ce24af2cb36df25a62553b1f11f09d34f81 Mon Sep 17 00:00:00 2001 From: Gan Eng Chin Date: Wed, 22 Mar 2023 18:35:06 +0800 Subject: [PATCH] Fix build errors after merging from trunk. --- .../CreateNewCampaignModal/CreateNewCampaignModal.test.tsx | 6 +++--- .../CreateNewCampaignModal/CreateNewCampaignModal.tsx | 5 +++-- .../overview-multichannel/MarketingOverviewMultichannel.tsx | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx b/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx index 1f1e754ec4d..e2639d7b2ad 100644 --- a/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx +++ b/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.test.tsx @@ -11,7 +11,7 @@ import { useCampaignTypes, useRecommendedChannels, useRegisteredChannels, - useInstalledPlugins, + useInstalledPluginsWithoutChannels, } from '~/marketing/hooks'; import { CreateNewCampaignModal } from './CreateNewCampaignModal'; @@ -29,7 +29,7 @@ jest.mock( '~/marketing/hooks', () => ( { useCampaignTypes: jest.fn(), useRecommendedChannels: jest.fn(), useRegisteredChannels: jest.fn(), - useInstalledPlugins: jest.fn(), + useInstalledPluginsWithoutChannels: jest.fn(), } ) ); const google = { @@ -83,7 +83,7 @@ describe( 'CreateNewCampaignModal component', () => { ( useRegisteredChannels as jest.Mock ).mockReturnValue( { refetch: jest.fn(), } ); - ( useInstalledPlugins as jest.Mock ).mockReturnValue( { + ( useInstalledPluginsWithoutChannels as jest.Mock ).mockReturnValue( { loadInstalledPluginsAfterActivation: jest.fn(), } ); } ); diff --git a/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.tsx b/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.tsx index 3a3b5c20a9e..09ebf5aa7a5 100644 --- a/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.tsx +++ b/plugins/woocommerce-admin/client/marketing/components/CreateNewCampaignModal/CreateNewCampaignModal.tsx @@ -21,7 +21,7 @@ import { useRecommendedChannels, useCampaignTypes, useRegisteredChannels, - useInstalledPlugins, + useInstalledPluginsWithoutChannels, } from '~/marketing/hooks'; import { SmartPluginCardBody } from '~/marketing/components'; import './CreateNewCampaignModal.scss'; @@ -44,7 +44,8 @@ export const CreateNewCampaignModal = ( props: CreateCampaignModalProps ) => { useCampaignTypes(); const { refetch: refetchRegisteredChannels } = useRegisteredChannels(); const { data: recommendedChannels } = useRecommendedChannels(); - const { loadInstalledPluginsAfterActivation } = useInstalledPlugins(); + const { loadInstalledPluginsAfterActivation } = + useInstalledPluginsWithoutChannels(); const onInstalledAndActivated = ( pluginSlug: string ) => { refetchCampaignTypes(); diff --git a/plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx b/plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx index da01976d796..3f202877447 100644 --- a/plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx +++ b/plugins/woocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx @@ -16,7 +16,7 @@ import { useRegisteredChannels, useRecommendedChannels, useCampaignTypes, - useInstalledPlugins, + useInstalledPluginsWithoutChannels, } from '~/marketing/hooks'; import { getAdminSetting } from '~/utils/admin-settings'; import { IntroductionBanner } from './IntroductionBanner'; @@ -46,7 +46,8 @@ export const MarketingOverviewMultichannel: React.FC = () => { } = useRegisteredChannels(); const { loading: loadingRecommended, data: dataRecommended } = useRecommendedChannels(); - const { loadInstalledPluginsAfterActivation } = useInstalledPlugins(); + const { loadInstalledPluginsAfterActivation } = + useInstalledPluginsWithoutChannels(); const { currentUserCan } = useUser(); const channelsRef = useRef< ChannelsRef >( null );