@automattic/data-stores 3.1.0 → 3.1.2

package/src/newsletter-categories/test/index.tsx

@@ -0,0 +1,103 @@
+/**
+ * @jest-environment jsdom
+ */
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { renderHook, waitFor } from '@testing-library/react';
+import React from 'react';
+import request from 'wpcom-proxy-request';
+import { useNewsletterCategories } from '../index';
+
+jest.mock( 'wpcom-proxy-request', () => jest.fn() );
+
+describe( 'useNewsletterCategories', () => {
+	let queryClient: QueryClient;
+	let wrapper: React.FC< { children: React.ReactNode } >;
+
+	beforeEach( () => {
+		jest.mocked( request ).mockReset();
+
+		queryClient = new QueryClient( {
+			defaultOptions: {
+				queries: {
+					retry: false,
+				},
+			},
+		} );
+
+		wrapper = ( { children } ) => (
+			<QueryClientProvider client={ queryClient }>{ children }</QueryClientProvider>
+		);
+	} );
+
+	afterEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	it( 'should return expected data when successful', async () => {
+		jest.mocked( request ).mockResolvedValue( {
+			enabled: true,
+			newsletter_categories: [
+				{ id: 1, name: 'Category 1', slug: 'Slug 1', description: 'Description 1', parent: 1 },
+				{ id: 2, name: 'Category 2', slug: 'Slug 2', description: 'Description 2', parent: 2 },
+			],
+		} );
+
+		const { result } = renderHook( () => useNewsletterCategories( { siteId: 123 } ), { wrapper } );
+
+		await waitFor( () => expect( result.current.isSuccess ).toBe( true ) );
+
+		expect( result.current.data ).toEqual( {
+			enabled: true,
+			newsletterCategories: [
+				{ id: 1, name: 'Category 1', slug: 'Slug 1', description: 'Description 1', parent: 1 },
+				{ id: 2, name: 'Category 2', slug: 'Slug 2', description: 'Description 2', parent: 2 },
+			],
+		} );
+	} );
+
+	it( 'should handle empty response', async () => {
+		jest.mocked( request ).mockResolvedValue( {
+			enabled: false,
+			newsletter_categories: [],
+		} );
+
+		const { result } = renderHook( () => useNewsletterCategories( { siteId: 123 } ), { wrapper } );
+
+		await waitFor( () => expect( result.current.isSuccess ).toBe( true ) );
+
+		expect( result.current.data ).toEqual( { enabled: false, newsletterCategories: [] } );
+	} );
+
+	it( 'should call request with correct arguments', async () => {
+		jest.mocked( request ).mockResolvedValue( {
+			enabled: true,
+			newsletter_categories: [],
+		} );
+
+		renderHook( () => useNewsletterCategories( { siteId: 123 } ), {
+			wrapper,
+		} );
+
+		await waitFor( () => expect( request ).toHaveBeenCalled() );
+
+		expect( request ).toHaveBeenCalledWith( {
+			path: '/sites/123/newsletter-categories',
+			apiNamespace: 'wpcom/v2',
+		} );
+	} );
+
+	it( 'should handle error response', async () => {
+		const errorMessage = 'API Error';
+		jest.mocked( request ).mockRejectedValue( new Error( errorMessage ) );
+
+		const { result } = renderHook( () => useNewsletterCategories( { siteId: 123 } ), { wrapper } );
+
+		await waitFor( () => expect( result.current.isSuccess ).toBe( true ) );
+
+		expect( result.current.data ).toEqual( {
+			enabled: false,
+			newsletterCategories: [],
+			error: errorMessage,
+		} );
+	} );
+} );

package/src/onboard/actions.ts

@@ -1,9 +1,8 @@
-import config from '@automattic/calypso-config';
 import { guessTimezone, getLanguage } from '@automattic/i18n-utils';
 import { dispatch, select } from '@wordpress/data-controls';
 import { __ } from '@wordpress/i18n';
 import { STORE_KEY as SITE_STORE } from '../site';
-import { CreateSiteParams, Visibility, NewSiteBlogDetails } from '../site/types';
+import { Visibility, GlobalStyles } from '../site/types';
 import { SiteGoal, STORE_KEY } from './constants';
 import { ProfilerData, ReadymadeTemplate } from './types';
 import type { DomainTransferData, State } from '.';
@@ -35,108 +34,6 @@ export const setSiteUrl = ( siteUrl: string ) => ( {
 	siteUrl,
 } );
 
-export interface CreateSiteBaseActionParameters {
-	username: string;
-	languageSlug: string;
-	visibility: number;
-}
-
-export interface CreateSiteActionParameters extends CreateSiteBaseActionParameters {
-	bearerToken?: string;
-	anchorFmPodcastId: string | null;
-	anchorFmEpisodeId: string | null;
-	anchorFmSpotifyUrl: string | null;
-}
-
-export function* createVideoPressSite( {
-	username,
-	languageSlug,
-	visibility = Visibility.PublicNotIndexed,
-}: CreateSiteBaseActionParameters ) {
-	const { domain, selectedDesign, siteTitle, selectedFeatures }: State = yield select(
-		STORE_KEY,
-		'getState'
-	);
-
-	const siteUrl = domain?.domain_name || siteTitle || username;
-	const lang_id = ( getLanguage( languageSlug ) as Language )?.value;
-	const isVideomakerTrial = config.isEnabled( 'videomaker-trial' );
-	const defaultTheme = selectedDesign?.theme || 'premium/videomaker';
-	const legacyVertical = 'premium/videomaker' === defaultTheme ? 'videomaker' : 'videomaker-white';
-	const siteVertical = isVideomakerTrial ? 'videomaker' : legacyVertical;
-	const blogTitle = siteTitle.trim() === '' ? __( 'Site Title' ) : siteTitle;
-	const themeSlug = isVideomakerTrial ? 'pub/videomaker' : 'pub/twentytwentytwo'; // NOTE: keep this a consistent, free theme so post ids during headstart re-run after premium theme switch remain consistent
-
-	const params: CreateSiteParams = {
-		blog_name: siteUrl?.split( '.wordpress' )[ 0 ],
-		blog_title: blogTitle,
-		public: visibility,
-		options: {
-			site_information: {
-				title: blogTitle,
-			},
-			lang_id: lang_id,
-			site_creation_flow: 'videopress',
-			enable_fse: true,
-			theme: themeSlug,
-			timezone_string: guessTimezone(),
-			use_patterns: true,
-			site_vertical_name: siteVertical,
-			selected_features: selectedFeatures,
-			wpcom_public_coming_soon: 1,
-			...( selectedDesign && { is_blank_canvas: isBlankCanvasDesign( selectedDesign ) } ),
-			is_videopress_initial_purchase: ! isVideomakerTrial,
-		},
-	};
-
-	const success: NewSiteBlogDetails | undefined = yield dispatch(
-		SITE_STORE,
-		'createSite',
-		params
-	);
-
-	return success;
-}
-
-export function* createVideoPressTvSite( {
-	languageSlug,
-	visibility = Visibility.PublicNotIndexed,
-}: CreateSiteBaseActionParameters ) {
-	const { selectedDesign, selectedFeatures }: State = yield select( STORE_KEY, 'getState' );
-
-	const lang_id = ( getLanguage( languageSlug ) as Language )?.value;
-	const blogTitle = 'VideoPress TV';
-
-	const params: CreateSiteParams = {
-		blog_name: '', // will be replaced on server with random domain
-		blog_title: blogTitle,
-		public: visibility,
-		options: {
-			site_information: {
-				title: blogTitle,
-			},
-			lang_id: lang_id,
-			site_creation_flow: 'videopress-tv',
-			enable_fse: true,
-			theme: 'pub/videopress-hq',
-			timezone_string: guessTimezone(),
-			use_patterns: true,
-			selected_features: selectedFeatures,
-			wpcom_public_coming_soon: 1,
-			...( selectedDesign && { is_blank_canvas: isBlankCanvasDesign( selectedDesign ) } ),
-			is_videopress_initial_purchase: true,
-		},
-	};
-
-	const success: NewSiteBlogDetails | undefined = yield dispatch(
-		SITE_STORE,
-		'createSite',
-		params
-	);
-
-	return success;
-}
-
 export function* createSenseiSite( {
 	username = '',
 	languageSlug = '',
@@ -261,6 +158,11 @@ export const setSelectedStyleVariation = (
 	selectedStyleVariation,
 } );
 
+export const setSelectedGlobalStyles = ( selectedGlobalStyles: GlobalStyles | undefined ) => ( {
+	type: 'SET_SELECTED_GLOBAL_STYLES' as const,
+	selectedGlobalStyles,
+} );
+
 export const setSelectedReadymadeTemplate = ( readymadeTemplate: ReadymadeTemplate ) => ( {
 	type: 'SET_READYMADE_TEMPLATE' as const,
 	readymadeTemplate,
@@ -370,16 +272,6 @@ export const resetSelectedDesign = () => ( {
 	type: 'RESET_SELECTED_DESIGN' as const,
 } );
 
-export const setVerticalId = ( verticalId: string ) => ( {
-	type: 'SET_VERTICAL_ID' as const,
-	verticalId,
-} );
-
-export const setStoreLocationCountryCode = ( storeLocationCountryCode: string ) => ( {
-	type: 'SET_STORE_LOCATION_COUNTRY_CODE' as const,
-	storeLocationCountryCode,
-} );
-
 export const setEcommerceFlowRecurType = ( ecommerceFlowRecurType: string ) => ( {
 	type: 'SET_ECOMMERCE_FLOW_RECUR_TYPE' as const,
 	ecommerceFlowRecurType,
@@ -451,11 +343,6 @@ export const setHidePlansFeatureComparison = ( hidePlansFeatureComparison: boole
 	hidePlansFeatureComparison,
 } );
 
-export const setIsMigrateFromWp = ( isMigrateFromWp: boolean ) => ( {
-	type: 'SET_IS_MIGRATE_FROM_WP' as const,
-	isMigrateFromWp,
-} );
-
 export const setPluginsToVerify = ( pluginSlugs: string[] ) => ( {
 	type: 'SET_PLUGIN_SLUGS_TO_VERIFY' as const,
 	pluginSlugs,
@@ -500,6 +387,7 @@ export type OnboardAction = ReturnType<
 	| typeof setRandomizedDesigns
 	| typeof setSelectedDesign
 	| typeof setSelectedStyleVariation
+	| typeof setSelectedGlobalStyles
 	| typeof setSelectedSite
 	| typeof setSelectedReadymadeTemplate
 	| typeof setShowSignupDialog
@@ -524,8 +412,6 @@ export type OnboardAction = ReturnType<
 	| typeof setSiteLogo
 	| typeof setSiteUrl
 	| typeof setSiteAccentColor
-	| typeof setVerticalId
-	| typeof setStoreLocationCountryCode
 	| typeof setEcommerceFlowRecurType
 	| typeof setCouponCode
 	| typeof setStorageAddonSlug
@@ -533,7 +419,6 @@ export type OnboardAction = ReturnType<
 	| typeof setHidePlansFeatureComparison
 	| typeof setProductCartItems
 	| typeof setPlanCartItem
-	| typeof setIsMigrateFromWp
 	| typeof setPaidSubscribers
 	| typeof setPartnerBundle
 	| typeof setSignupDomainOrigin

package/src/onboard/constants.ts

@@ -2,13 +2,27 @@ export const STORE_KEY = 'automattic/onboard';
 
 export enum SiteGoal {
 	Write = 'write',
-	Sell = 'sell',
 	Promote = 'promote',
+	CollectDonations = 'collect-donations',
+	BuildNonprofit = 'build-nonprofit',
+	SellDigital = 'sell-digital',
+	ContactForm = 'contact-form',
+	PaidSubscribers = 'paid-subscribers',
+	Engagement = 'engagement',
+	Porfolio = 'portfolio',
+	Newsletter = 'newsletter',
+	SellPhysical = 'sell-physical',
+	Courses = 'courses',
+	Videos = 'videos',
+	AnnounceEvents = 'announce-events',
+
+	// The following goals are deprecated. They are no longer availabe in the goals
+	// signup step, but existing sites still use them.
+	Sell = 'sell',
 	DIFM = 'difm', // "Do It For Me"
 	Import = 'import',
-	ImportSubscribers = 'import-subscribers',
 	Other = 'other',
-	PaidSubscribers = 'paid-subscribers',
+	ImportSubscribers = 'import-subscribers',
 }
 
 export enum SiteIntent {
@@ -19,15 +33,13 @@ export enum SiteIntent {
 	DIFM = 'difm', // "Do It For Me"
 	WpAdmin = 'wpadmin',
 	Import = 'import', // deprecated
-	WithThemeAssembler = 'with-theme-assembler',
-	AssemblerFirst = 'assembler-first',
 	ReadyMadeTemplate = 'readymade-template',
 	AIAssembler = 'ai-assembler',
 	Newsletter = 'newsletter',
+	NewsletterGoal = 'intent-newsletter-goal',
+	CreateCourseGoal = 'create-course-goal',
 	FreePostSetup = 'free-post-setup', // non-signup flow
 	SiteMigration = 'site-migration',
-	LinkInBioPostSetup = 'link-in-bio-post-setup', // non-signup flow
-	NewsletterPostSetup = 'newsletter-post-setup', // non-signup flow
 	UpdateDesign = 'update-design', // non-signup flow
 	UpdateOptions = 'update-options', // non-signup flow
 }

package/src/onboard/index.ts

@@ -46,6 +46,8 @@ export function register(): typeof STORE_KEY {
 			'planProductId',
 			'randomizedDesigns',
 			'selectedDesign',
+			'selectedStyleVariation',
+			'selectedGlobalStyles',
 			'selectedFeatures',
 			'selectedSite',
 			'readymadeTemplate',
@@ -54,14 +56,13 @@ export function register(): typeof STORE_KEY {
 			'siteLogo',
 			'siteAccentColor',
 			'storeType',
-			'verticalId',
-			'storeLocationCountryCode',
 			'ecommerceFlowRecurType',
 			'couponCode',
 			'storageAddonSlug',
 			'domainCartItem',
 			'planCartItem',
 			'productCartItems',
+			'partnerBundle',
 		],
 	} );
 	isRegistered = true;

package/src/onboard/reducer.ts

@@ -10,6 +10,7 @@ import type {
 } from './types';
 import type { DomainSuggestion } from '../domain-suggestions';
 import type { FeatureId } from '../shared-types';
+import type { GlobalStyles } from '../site';
 // somewhat hacky, but resolves the circular dependency issue
 import type { Design, StyleVariation } from '@automattic/design-picker/src/types';
 import type { MinimalRequestCartProduct } from '@automattic/shopping-cart';
@@ -111,6 +112,14 @@ const selectedDesign: Reducer< Design | undefined, OnboardAction > = ( state, ac
 	if ( action.type === 'SET_SELECTED_DESIGN' ) {
 		return action.selectedDesign;
 	}
+
+	if (
+		action.type === 'RESET_ONBOARD_STORE' &&
+		action?.skipFlags?.includes( 'skipSelectedDesign' )
+	) {
+		return state;
+	}
+
 	if ( [ 'RESET_SELECTED_DESIGN', 'RESET_ONBOARD_STORE' ].includes( action.type ) ) {
 		return undefined;
 	}
@@ -130,6 +139,22 @@ const selectedStyleVariation: Reducer< StyleVariation | undefined, OnboardAction
 	return state;
 };
 
+const selectedGlobalStyles: Reducer< GlobalStyles | undefined, OnboardAction > = (
+	state,
+	action
+) => {
+	switch ( action.type ) {
+		case 'SET_SELECTED_GLOBAL_STYLES':
+			return action.selectedGlobalStyles;
+
+		case 'RESET_ONBOARD_STORE':
+			return undefined;
+
+		default:
+			return state;
+	}
+};
+
 const readymadeTemplate: Reducer< ReadymadeTemplate | undefined, OnboardAction > = (
 	state = undefined, // Initial state is set to undefined
 	action
@@ -331,12 +356,12 @@ const pendingAction: Reducer< undefined | ( () => Promise< any > ), OnboardActio
 	return state;
 };
 
-const progress: Reducer< number, OnboardAction > = ( state = -1, action ) => {
+const progress: Reducer< number | undefined, OnboardAction > = ( state, action ) => {
 	if ( action.type === 'SET_PROGRESS' ) {
 		return action.progress;
 	}
 	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return -1;
+		return undefined;
 	}
 	return state;
 };
@@ -353,7 +378,7 @@ const progressTitle: Reducer< string | undefined, OnboardAction > = ( state, act
 
 const goals: Reducer< SiteGoal[], OnboardAction > = ( state = [], action ) => {
 	if ( action.type === 'SET_GOALS' ) {
-		return action.goals;
+		return [ ...action.goals ];
 	}
 	if ( action.type === 'CLEAR_IMPORT_GOAL' ) {
 		return state.filter( ( goal ) => goal !== SiteGoal.Import );
@@ -361,29 +386,14 @@ const goals: Reducer< SiteGoal[], OnboardAction > = ( state = [], action ) => {
 	if ( action.type === 'CLEAR_DIFM_GOAL' ) {
 		return state.filter( ( goal ) => goal !== SiteGoal.DIFM );
 	}
-	if ( [ 'RESET_GOALS', 'RESET_ONBOARD_STORE' ].includes( action.type ) ) {
-		return [];
+	if ( action.type === 'RESET_ONBOARD_STORE' && action?.skipFlags?.includes( 'skipGoals' ) ) {
+		return state;
 	}
-	return state;
-};
 
-const verticalId: Reducer< string, OnboardAction > = ( state = '', action ) => {
-	if ( action.type === 'SET_VERTICAL_ID' ) {
-		return action.verticalId;
-	}
-	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return '';
+	if ( [ 'RESET_GOALS', 'RESET_ONBOARD_STORE' ].includes( action.type ) ) {
+		return [];
 	}
-	return state;
-};
 
-const storeLocationCountryCode: Reducer< string, OnboardAction > = ( state = '', action ) => {
-	if ( action.type === 'SET_STORE_LOCATION_COUNTRY_CODE' ) {
-		return action.storeLocationCountryCode;
-	}
-	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return '';
-	}
 	return state;
 };
 
@@ -479,16 +489,6 @@ const domainCartItems: Reducer< MinimalRequestCartProduct[] | undefined, Onboard
 	return state;
 };
 
-const isMigrateFromWp: Reducer< boolean, OnboardAction > = ( state = false, action ) => {
-	if ( action.type === 'SET_IS_MIGRATE_FROM_WP' ) {
-		return action.isMigrateFromWp;
-	}
-	if ( action.type === 'RESET_ONBOARD_STORE' ) {
-		return false;
-	}
-	return state;
-};
-
 const pluginsToVerify: Reducer< string[] | undefined, OnboardAction > = ( state, action ) => {
 	if ( action.type === 'SET_PLUGIN_SLUGS_TO_VERIFY' ) {
 		return action.pluginSlugs;
@@ -629,6 +629,7 @@ const reducer = combineReducers( {
 	storeType,
 	selectedDesign,
 	selectedStyleVariation,
+	selectedGlobalStyles,
 	selectedSite,
 	siteTitle,
 	showSignupDialog,
@@ -648,14 +649,11 @@ const reducer = combineReducers( {
 	siteLogo,
 	siteAccentColor,
 	readymadeTemplate,
-	verticalId,
-	storeLocationCountryCode,
 	ecommerceFlowRecurType,
 	couponCode,
 	storageAddonSlug,
 	planCartItem,
 	productCartItems,
-	isMigrateFromWp,
 	domainCartItems,
 	pluginsToVerify,
 	profilerData,

package/src/onboard/selectors.ts

@@ -33,6 +33,7 @@ export const getLastLocation = ( state: State ) => state.lastLocation;
 export const getRandomizedDesigns = ( state: State ) => state.randomizedDesigns;
 export const getSelectedDesign = ( state: State ) => state.selectedDesign;
 export const getSelectedStyleVariation = ( state: State ) => state.selectedStyleVariation;
+export const getSelectedGlobalStyles = ( state: State ) => state.selectedGlobalStyles;
 export const getSelectedDomain = ( state: State ) => state.domain;
 export const getSelectedFeatures = ( state: State ) => state.selectedFeatures;
 export const getSelectedSite = ( state: State ) => state.selectedSite;
@@ -48,7 +49,6 @@ export const getPendingAction = ( state: State ) => state.pendingAction;
 export const getProgress = ( state: State ) => state.progress;
 export const getProgressTitle = ( state: State ) => state.progressTitle;
 export const getGoals = ( state: State ) => state.goals;
-export const getStoreLocationCountryCode = ( state: State ) => state.storeLocationCountryCode;
 export const getEcommerceFlowRecurType = ( state: State ) => state.ecommerceFlowRecurType;
 export const getCouponCode = ( state: State ) => state.couponCode;
 export const getStorageAddonSlug = ( state: State ) => state.storageAddonSlug;
@@ -77,7 +77,6 @@ export const getSignupDomainOrigin = ( state: State ) => state.signupDomainOrigi
 export const getSiteUrl = ( state: State ) => state.siteUrl;
 export const getHideFreePlan = ( state: State ) => state.hideFreePlan;
 export const getHidePlansFeatureComparison = ( state: State ) => state.hidePlansFeatureComparison;
-export const getIsMigrateFromWp = ( state: State ) => state.isMigrateFromWp;
 export const getPluginsToVerify = ( state: State ) => state.pluginsToVerify;
 export const getProfilerData = ( state: State ) => state.profilerData;
 export const getPaidSubscribers = ( state: State ) => state.paidSubscribers;

package/src/onboard/test/utils.ts

@@ -1,7 +1,18 @@
+/*
+ * @jest-environment jsdom
+ */
+
+import config from '@automattic/calypso-config';
 import { SiteGoal, SiteIntent } from '../constants';
 import { goalsToIntent } from '../utils';
 
+jest.mock( '@automattic/calypso-config' );
+
 describe( 'Test onboard utils', () => {
+	beforeEach( () => {
+		( config.isEnabled as jest.Mock ).mockReset();
+	} );
+
 	it.each( [
 		{
 			goals: [],
@@ -23,7 +34,29 @@ describe( 'Test onboard utils', () => {
 			goals: [ SiteGoal.Promote, SiteGoal.Sell, SiteGoal.Write ],
 			expectedIntent: SiteIntent.Sell,
 		},
-	] )( 'Should map the $goals to $expectedIntent intent', ( { goals, expectedIntent } ) => {
-		expect( goalsToIntent( goals ) ).toBe( expectedIntent );
-	} );
+		{
+			goals: [ SiteGoal.Write, SiteGoal.Engagement ],
+			expectedIntent: SiteIntent.Write,
+		},
+		{
+			goals: [ SiteGoal.Write, SiteGoal.Newsletter ],
+			expectedIntent: SiteIntent.NewsletterGoal,
+		},
+		{
+			goals: [ SiteGoal.Sell, SiteGoal.Courses ],
+			expectedIntent: SiteIntent.CreateCourseGoal,
+			featureFlags: {
+				isIntentCreateCourseGoalEnabled: true,
+			},
+		},
+		{
+			goals: [ SiteGoal.Sell, SiteGoal.Newsletter ],
+			expectedIntent: SiteIntent.NewsletterGoal,
+		},
+	] )(
+		'Should map the $goals to $expectedIntent intent ($featureFlags)',
+		( { goals, expectedIntent, featureFlags } ) => {
+			expect( goalsToIntent( goals, featureFlags ) ).toBe( expectedIntent );
+		}
+	);
 } );

package/src/onboard/utils.ts

@@ -1,15 +1,12 @@
 import { SiteGoal, SiteIntent } from './constants';
 
-const INTENT_DECIDING_GOALS = [ SiteGoal.Write, SiteGoal.Sell, SiteGoal.Promote ] as const;
-type IntentDecidingGoal = ( typeof INTENT_DECIDING_GOALS )[ number ];
+interface Flags {
+	isIntentCreateCourseGoalEnabled?: boolean;
+}
 
-const GOAL_TO_INTENT_MAP: { [ key in IntentDecidingGoal ]: SiteIntent } = {
-	[ SiteGoal.Write ]: SiteIntent.Write,
-	[ SiteGoal.Sell ]: SiteIntent.Sell,
-	[ SiteGoal.Promote ]: SiteIntent.Build,
-};
+export const goalsToIntent = ( goals: SiteGoal[], flags?: Flags ): SiteIntent => {
+	const { isIntentCreateCourseGoalEnabled } = flags ?? {};
 
-export const goalsToIntent = ( goals: SiteGoal[] ): SiteIntent => {
 	// When DIFM and Import goals are selected together, DIFM Intent will have the priority and will be set.
 	if ( goals.includes( SiteGoal.DIFM ) ) {
 		return SiteIntent.DIFM;
@@ -19,8 +16,21 @@ export const goalsToIntent = ( goals: SiteGoal[] ): SiteIntent => {
 		return SiteIntent.Import;
 	}
 
+	if ( goals.includes( SiteGoal.Courses ) && isIntentCreateCourseGoalEnabled ) {
+		return SiteIntent.CreateCourseGoal;
+	}
+
+	// Newsletter flow
+	if ( goals.includes( SiteGoal.Newsletter ) ) {
+		return SiteIntent.NewsletterGoal;
+	}
+
 	// Prioritize Sell over Build and Write
-	if ( goals.includes( SiteGoal.Sell ) ) {
+	if (
+		goals.some( ( goal ) =>
+			[ SiteGoal.Sell, SiteGoal.SellDigital, SiteGoal.SellPhysical ].includes( goal )
+		)
+	) {
 		return SiteIntent.Sell;
 	}
 
@@ -29,12 +39,8 @@ export const goalsToIntent = ( goals: SiteGoal[] ): SiteIntent => {
 		return SiteIntent.Build;
 	}
 
-	const intentDecidingGoal = ( goals as IntentDecidingGoal[] ).find( ( goal ) =>
-		INTENT_DECIDING_GOALS.includes( goal )
-	);
-
-	if ( intentDecidingGoal ) {
-		return GOAL_TO_INTENT_MAP[ intentDecidingGoal ];
+	if ( goals.includes( SiteGoal.Write ) ) {
+		return SiteIntent.Write;
 	}
 
 	return SiteIntent.Build;

package/src/plans/constants.ts

@@ -71,4 +71,5 @@ export const PERIOD_LIST = [
 
 export const COST_OVERRIDE_REASONS = {
 	RECENT_PLAN_PRORATION: 'recent-plan-proration',
+	RECENT_DOMAIN_PRORATION: 'recent-domain-proration',
 };