Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage Add On: Allow higher term cart item to be added via query param #98899

Merged
merged 4 commits into from
Jan 31, 2025
Merged

Storage Add On: Allow higher term cart item to be added via query param #98899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e73cfc7
Storage Add On: Allow higher term cart item to be added via query param
ddc22 Jan 24, 2025
f27725f
Allow only 350gb add on
ddc22 Jan 24, 2025
d8b8960
Review fixes
ddc22 Jan 27, 2025
c85e182
Fix: Add tracks event
ddc22 Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions client/lib/signup/step-actions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import config from '@automattic/calypso-config';
import { WPCOM_DIFM_LITE, PRODUCT_1GB_SPACE, isDomainTransfer } from '@automattic/calypso-products';
import { getUrlParts } from '@automattic/calypso-url';
import { Site, AddOns } from '@automattic/data-stores';
import { STORAGE_ADD_ONS } from '@automattic/data-stores/src/add-ons';
import { getAddOn } from '@automattic/data-stores/src/add-ons/add-ons-list';
import { isBlankCanvasDesign } from '@automattic/design-picker';
import { guessTimezone, getLanguage } from '@automattic/i18n-utils';
import { isOnboardingGuidedFlow } from '@automattic/onboarding';
Expand Down Expand Up @@ -1246,29 +1248,17 @@ export function maybeAddStorageAddonToCart( stepName, defaultDependencies, nextP
const state = store.getState();
const selectedStorage = get( getSignupDependencyStore( state ), 'storage', null );

switch ( selectedStorage ) {
case AddOns.ADD_ON_50GB_STORAGE:
cartItem.push( {
product_slug: PRODUCT_1GB_SPACE,
quantity: 50,
volume: 1,
extra: { feature_slug: AddOns.ADD_ON_50GB_STORAGE },
} );
recordTracksEvent( 'calypso_signup_storage_add_on_selected', {
add_on_slug: AddOns.ADD_ON_50GB_STORAGE,
} );
break;
case AddOns.ADD_ON_100GB_STORAGE:
cartItem.push( {
product_slug: PRODUCT_1GB_SPACE,
quantity: 100,
volume: 1,
extra: { feature_slug: AddOns.ADD_ON_100GB_STORAGE },
} );
recordTracksEvent( 'calypso_signup_storage_add_on_selected', {
add_on_slug: AddOns.ADD_ON_100GB_STORAGE,
} );
break;
if ( STORAGE_ADD_ONS.includes( selectedStorage ) ) {
ddc22 marked this conversation as resolved.
Show resolved Hide resolved
const selectedAddOn = getAddOn( selectedStorage );
cartItem.push( {
product_slug: PRODUCT_1GB_SPACE,
quantity: selectedAddOn.quantity,
volume: 1,
extra: { feature_slug: AddOns.ADD_ON_50GB_STORAGE },
} );
recordTracksEvent( 'calypso_signup_storage_add_on_selected', {
add_on_slug: selectedAddOn.addOnSlug,
} );
}

submitSignupStep( { stepName, cartItem, wasSkipped: true }, { cartItem } );
Expand Down
6 changes: 5 additions & 1 deletion packages/data-stores/src/add-ons/add-ons-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
import customDesignIcon from './icons/custom-design';
import spaceUpgradeIcon from './icons/space-upgrade';
import unlimitedThemesIcon from './icons/unlimited-themes';
import type { AddOnMeta } from './types';
import type { AddOnMeta, AddOnSlug } from './types';

export const getAddOnsList = (): AddOnMeta[] => {
const defaultAddOns: AddOnMeta[] = [
Expand Down Expand Up @@ -110,3 +110,7 @@ export const getAddOnsList = (): AddOnMeta[] => {

return defaultAddOns;
};

export const getAddOn = ( addOnSlug: AddOnSlug ): AddOnMeta | undefined => {
return getAddOnsList().find( ( addOn ) => addOn.addOnSlug === addOnSlug );
};