From 8774a7e4bbd90e7ef922510b5c7d44f2f58ba061 Mon Sep 17 00:00:00 2001 From: asvinb Date: Fri, 16 Aug 2024 17:09:43 +0400 Subject: [PATCH 1/7] Show campaign creation fields by default. --- .../setup-paid-ads/clientSession.js | 18 ------- .../paid-ads-features-section.js | 14 +----- .../setup-paid-ads/setup-paid-ads.js | 49 ++++--------------- 3 files changed, 10 insertions(+), 71 deletions(-) diff --git a/js/src/setup-mc/setup-stepper/setup-paid-ads/clientSession.js b/js/src/setup-mc/setup-stepper/setup-paid-ads/clientSession.js index 6cd0ca8a9a..67aeae5d96 100644 --- a/js/src/setup-mc/setup-stepper/setup-paid-ads/clientSession.js +++ b/js/src/setup-mc/setup-stepper/setup-paid-ads/clientSession.js @@ -6,29 +6,11 @@ * @property {Array} countryCodes Audience country codes of the paid ads campaign. Example: 'US'. */ -const KEY_SHOW_PAID_ADS_SETUP = 'gla-onboarding-show-paid-ads-setup'; const KEY_PAID_ADS = 'gla-onboarding-paid-ads'; const { sessionStorage } = window; const clientSession = { - /** - * @param {boolean} isShowing Whether the paid ads setup is showing. - */ - setShowPaidAdsSetup( isShowing ) { - const showing = Boolean( isShowing ).toString(); - sessionStorage.setItem( KEY_SHOW_PAID_ADS_SETUP, showing ); - }, - - /** - * @param {boolean} defaultValue The default value to be returned if stored value is not available. - * @return {boolean} Returns the stored value. It will return `defaultValue` if stored value is not available. - */ - getShowPaidAdsSetup( defaultValue ) { - const showing = sessionStorage.getItem( KEY_SHOW_PAID_ADS_SETUP ); - return showing === null ? defaultValue : showing === 'true'; - }, - /** * @param {CampaignData} data Campaign data to be stored. * @param {number|undefined} data.amount Daily average cost of the campaign. diff --git a/js/src/setup-mc/setup-stepper/setup-paid-ads/paid-ads-features-section.js b/js/src/setup-mc/setup-stepper/setup-paid-ads/paid-ads-features-section.js index 3be1cd6664..23d81af90f 100644 --- a/js/src/setup-mc/setup-stepper/setup-paid-ads/paid-ads-features-section.js +++ b/js/src/setup-mc/setup-stepper/setup-paid-ads/paid-ads-features-section.js @@ -58,16 +58,8 @@ function FeatureList( { hideBudgetContent } ) { * * @param {Object} props React props. * @param {boolean} props.hideBudgetContent Whether to hide the content about the ad budget. - * @param {boolean} props.hideFooterButtons Whether to hide the buttons at the card footer. - * @param {JSX.Element} props.skipButton Button to skip paid ads setup. - * @param {JSX.Element} props.continueButton Button to continue paid ads setup. */ -export default function PaidAdsFeaturesSection( { - hideBudgetContent, - hideFooterButtons, - skipButton, - continueButton, -} ) { +export default function PaidAdsFeaturesSection( { hideBudgetContent } ) { return (
-
); diff --git a/js/src/setup-mc/setup-stepper/setup-paid-ads/setup-paid-ads.js b/js/src/setup-mc/setup-stepper/setup-paid-ads/setup-paid-ads.js index f5dd0f9a07..f8e07fd2e6 100644 --- a/js/src/setup-mc/setup-stepper/setup-paid-ads/setup-paid-ads.js +++ b/js/src/setup-mc/setup-stepper/setup-paid-ads/setup-paid-ads.js @@ -23,7 +23,6 @@ import AppButton from '.~/components/app-button'; import PaidAdsFeaturesSection from './paid-ads-features-section'; import PaidAdsSetupSections from './paid-ads-setup-sections'; import { getProductFeedUrl } from '.~/utils/urls'; -import clientSession from './clientSession'; import { API_NAMESPACE, STORE_KEY } from '.~/data/constants'; import { GUIDE_NAMES } from '.~/constants'; @@ -71,17 +70,9 @@ export default function SetupPaidAds() { const { createNotice } = useDispatchCoreNotices(); const { googleAdsAccount, hasGoogleAdsConnection } = useGoogleAdsAccount(); const [ handleSetupComplete ] = useAdsSetupCompleteCallback(); - const [ showPaidAdsSetup, setShowPaidAdsSetup ] = useState( () => - clientSession.getShowPaidAdsSetup( false ) - ); const [ paidAds, setPaidAds ] = useState( {} ); const [ completing, setCompleting ] = useState( null ); - const handleContinuePaidAdsSetupClick = () => { - setShowPaidAdsSetup( true ); - clientSession.setShowPaidAdsSetup( true ); - }; - const finishOnboardingSetup = async ( event, onBeforeFinish = noop ) => { setCompleting( event.target.dataset.action ); @@ -129,16 +120,14 @@ export default function SetupPaidAds() { campaign_form_validation: 'unknown', }; - if ( showPaidAdsSetup ) { - const selector = select( STORE_KEY ); - const billing = selector.getGoogleAdsAccountBillingStatus(); + const selector = select( STORE_KEY ); + const billing = selector.getGoogleAdsAccountBillingStatus(); - merge( eventProps, { - opened_paid_ads_setup: 'yes', - billing_method_status: billing?.status, - campaign_form_validation: paidAds.isValid ? 'valid' : 'invalid', - } ); - } + merge( eventProps, { + opened_paid_ads_setup: 'yes', + billing_method_status: billing?.status, + campaign_form_validation: paidAds.isValid ? 'valid' : 'invalid', + } ); const disabledSkip = completing === ACTION_COMPLETE || ! hasGoogleAdsConnection; @@ -171,30 +160,10 @@ export default function SetupPaidAds() { /> - } /> - { showPaidAdsSetup && ( - - ) } + -