Refactor the bundle installation to be generic #84886
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { ProductsList } from '@automattic/data-stores'; | ||
| import { StepContainer, NextButton } from '@automattic/onboarding'; | ||
| import styled from '@emotion/styled'; | ||
| import { useSelect, useDispatch } from '@wordpress/data'; | ||
| import { useI18n } from '@wordpress/react-i18n'; | ||
|
|
@@ -11,21 +11,41 @@ import FormattedHeader from 'calypso/components/formatted-header'; | |
| import { LoadingEllipsis } from 'calypso/components/loading-ellipsis'; | ||
| import WarningCard from 'calypso/components/warning-card'; | ||
| import { useSite } from 'calypso/landing/stepper/hooks/use-site'; | ||
| import { useSitePluginSlug } from 'calypso/landing/stepper/hooks/use-site-plugin-slug'; | ||
| import { | ||
| AUTOMATED_ELIGIBILITY_STORE, | ||
| SITE_STORE, | ||
| ONBOARD_STORE, | ||
| } from 'calypso/landing/stepper/stores'; | ||
| import { recordTracksEvent } from 'calypso/lib/analytics/tracks'; | ||
| import { addQueryArgs } from 'calypso/lib/url'; | ||
| import { eligibilityHolds as eligibilityHoldsConstants } from 'calypso/state/automated-transfer/constants'; | ||
| import SupportCard from '../store-address/support-card'; | ||
| import type { Step } from '../../types'; | ||
| import type { OnboardSelect, SiteSelect } from '@automattic/data-stores'; | ||
| import type { TransferEligibilityError } from '@automattic/data-stores/src/automated-transfer-eligibility/types'; | ||
| import './style.scss'; | ||
|
|
||
| const ActionSection = styled.div` | ||
|
There was a problem hiding this comment. I moved these styles directly to this final instead of importing it from |
||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: baseline; | ||
| flex-wrap: wrap; | ||
| margin-top: 40px; | ||
| gap: 4%; | ||
|
|
||
| @media ( max-width: 320px ) { | ||
| align-items: center; | ||
| } | ||
| `; | ||
|
|
||
| const StyledNextButton = styled( NextButton )` | ||
| @media ( max-width: 320px ) { | ||
| width: 100%; | ||
| margin-bottom: 20px; | ||
| } | ||
| `; | ||
|
|
||
| const Divider = styled.hr` | ||
| border-top: 1px solid #eee; | ||
| background: none; | ||
|
|
@@ -41,11 +61,12 @@ const TRANSFERRING_NOT_BLOCKERS = [ | |
| eligibilityHoldsConstants.TRANSFER_ALREADY_EXISTS, // Already Atomic sites are handled in the install flow. | ||
| ]; | ||
|
|
||
| const BundleConfirm: Step = function BundleConfirm( { navigation } ) { | ||
| const { goBack, submit } = navigation; | ||
| const { __ } = useI18n(); | ||
| const site = useSite(); | ||
| const siteId = site && site?.ID; | ||
| const pluginSlug = useSitePluginSlug(); | ||
| const isAtomicSite = useSelect( | ||
| ( select ) => siteId && ( select( SITE_STORE ) as SiteSelect ).isSiteAtomic( siteId ), | ||
| [ siteId ] | ||
|
|
@@ -179,8 +200,8 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
| required: requiresUpgrade, | ||
| checkoutUrl: addQueryArgs( | ||
| { | ||
| redirect_to: addQueryArgs( queryArgs, '/setup/plugin-bundle/bundleTransfer' ), | ||
| cancel_to: addQueryArgs( queryArgs, '/setup/plugin-bundle/bundleConfirm' ), | ||
| }, | ||
| `/checkout/${ wpcomDomain }/${ upgradingPlan?.product_slug ?? '' }` | ||
| ), | ||
|
|
@@ -206,7 +227,7 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
| } | ||
|
|
||
| return ( | ||
| <div className="bundle-confirm__upgrade-required"> | ||
| <PlanWarning title={ __( 'Plan upgrade required' ) }> | ||
| { siteUpgrading.description } | ||
| </PlanWarning> | ||
|
|
@@ -242,8 +263,8 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
| function getContent() { | ||
| return ( | ||
| <> | ||
| <div className="bundle-confirm__info-section" /> | ||
| <div className="bundle-confirm__instructions-container"> | ||
| { getWPComSubdomainWarningContent() } | ||
| { getCheckoutContent() } | ||
| { getWarningsOrHoldsSection() } | ||
|
|
@@ -252,11 +273,24 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
| <StyledNextButton | ||
| disabled={ isTransferringBlocked || ! isDataReady } | ||
| onClick={ () => { | ||
| const eventProperties = { | ||
| site: wpcomDomain, | ||
|
There was a problem hiding this comment. it'd be good to add a property here for the bundle slug, that way we can create bundle specific funnels and stats later if necessary There was a problem hiding this comment. Good point! Added in 59878f2. |
||
| upgrade_required: siteUpgrading.required, | ||
| }; | ||
|
|
||
| recordTracksEvent( 'calypso_bundle_dashboard_confirm_submit', { | ||
| ...eventProperties, | ||
| software_set: pluginSlug, | ||
| } ); | ||
|
|
||
| // For backward compatibility with existing event. When it's not used anymore, it can be removed. | ||
| if ( 'woo-on-plans' === pluginSlug ) { | ||
| recordTracksEvent( | ||
| 'calypso_woocommerce_dashboard_confirm_submit', | ||
| eventProperties | ||
| ); | ||
| } | ||
|
|
||
| const providedDependencies = { | ||
| checkoutUrl: siteUpgrading.checkoutUrl, | ||
| }; | ||
|
|
@@ -276,7 +310,7 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
|
|
||
| if ( site === null || ! site.ID || ! isDataReady || isReadyToStart ) { | ||
| return ( | ||
| <div className="bundle-confirm__loading-container"> | ||
| <LoadingEllipsis /> | ||
| </div> | ||
| ); | ||
|
|
@@ -289,13 +323,13 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
|
|
||
| return ( | ||
| <StepContainer | ||
| stepName="bundle-confirm" | ||
| goBack={ goBack } | ||
| hideSkip | ||
| isHorizontalLayout={ true } | ||
| formattedHeader={ | ||
| <FormattedHeader | ||
| id="bundle-confirm-title-header" | ||
| headerText={ headerText } | ||
| subHeaderText={ subHeaderText } | ||
| align="left" | ||
|
|
@@ -308,4 +342,4 @@ const WooConfirm: Step = function WooCommerceConfirm( { navigation } ) { | |
| ); | ||
| }; | ||
|
|
||
| export default BundleConfirm; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added the
stepsargument here.It seems when it was created, the type already had the steps argument, but it was never used.