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

Remove digisub gift references from client side #6747

Merged
merged 1 commit into from
Jan 30, 2025
+10 −109
Merged

Remove digisub gift references from client side #6747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 0 additions & 61 deletions support-frontend/assets/helpers/abTests/__tests__/abtestTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ import { _, init as abInit, getAmountsTestVariant } from '../abtest';
import type { Audience, Participations, Test, Variant } from '../abtest';

const { targetPageMatches } = _;
const { subsDigiSubPages, digiSub } = pageUrlRegexes.subscriptions;
const { nonGiftLandingNotAusNotUS, nonGiftLandingAndCheckoutWithGuest } =
digiSub;
const { allLandingPagesAndThankyouPages, genericCheckoutOnly } =
pageUrlRegexes.contributions;

Expand Down Expand Up @@ -581,65 +578,7 @@ describe('init', () => {
});

it('targetPage matching', () => {
expect(targetPageMatches('/uk/subscribe/paper', subsDigiSubPages)).toEqual(
false,
);
expect(
targetPageMatches('/uk/subscribe/digital/checkout', subsDigiSubPages),
).toEqual(false);
expect(targetPageMatches('/us/subscribe', subsDigiSubPages)).toEqual(true);
expect(targetPageMatches('/us/subscribe/digital', subsDigiSubPages)).toEqual(
true,
);
const withAcquisitionParams =
'/uk/subscribe?INTCMP=header_support_subscribe&acquisitionData=%7B"componentType"%3A"ACQUISITIONS_HEADER"%2C"componentId"%3A"header_support_subscribe"%2C"source"%3A"GUARDIAN_WEB"%2C"referrerPageviewId"%3A"k8heft91k5c3tnnnmwjd"%2C"referrerUrl"%3A"https%3A%2F%2Fwww.theguardian.com%2Fuk"%7D';
expect(targetPageMatches(withAcquisitionParams, subsDigiSubPages)).toEqual(
true,
);
expect(
targetPageMatches('/us/subscribe/digital?test=blah', subsDigiSubPages),
).toEqual(true);
// Test nonGiftLandingAndCheckout regex
expect(
targetPageMatches(
'/uk/subscribe/digital',
nonGiftLandingAndCheckoutWithGuest,
),
).toEqual(true);
expect(
targetPageMatches(
'/subscribe/digital/checkout',
nonGiftLandingAndCheckoutWithGuest,
),
).toEqual(true);
expect(
targetPageMatches(
'/subscribe/digital/checkout/guest',
nonGiftLandingAndCheckoutWithGuest,
),
).toEqual(true);
expect(
targetPageMatches(
'/uk/subscribe/digital/gift',
nonGiftLandingAndCheckoutWithGuest,
),
).toEqual(false);
// Test nonGiftLandingNotAusNotUS regex
expect(
targetPageMatches('/uk/subscribe/digital', nonGiftLandingNotAusNotUS),
).toEqual(true);
expect(
targetPageMatches('/subscribe/digital/checkout', nonGiftLandingNotAusNotUS),
).toEqual(true);
expect(
targetPageMatches('/us/subscribe/digital', nonGiftLandingNotAusNotUS),
).toEqual(false);
expect(
targetPageMatches('/au/subscribe/digital', nonGiftLandingNotAusNotUS),
).toEqual(false);
expect(
targetPageMatches('/uk/subscribe/digital/gift', nonGiftLandingNotAusNotUS),
).toEqual(false);
expect(
targetPageMatches(
'/subscribe/weekly/checkout',
Expand Down
17 changes: 0 additions & 17 deletions support-frontend/assets/helpers/abTests/abtestDefinitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@ export const pageUrlRegexes = {
genericCheckoutOnly: '(uk|us|au|ca|eu|nz|int)/checkout|thank-you(/.*)?$',
},
subscriptions: {
subsDigiSubPages: '(/??/subscribe(\\?.*)?$|/??/subscribe/digital(\\?.*)?$)',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These all are irrelevant now because the digisub page is at /subscribe/digitaledition

digiSubLandingPages:
'(/??/subscribe/digital/gift(\\?.*)?$|/??/subscribe/digital(\\?.*)?$)',
digiSubLandingPagesNotAus:
'(/(uk|us|ca|eu|nz|int)/subscribe/digital(\\?.*)?$)',
digiSub: {
// Requires /subscribe/digital, allows /checkout and/or /gift, allows any query string
allLandingAndCheckout:
/\/subscribe\/digital(\/checkout)?(\/gift)?(\?.*)?$/,
// Requires /subscribe/digital and /gift, allows /checkout before /gift, allows any query string
giftLandingAndCheckout: /\/subscribe\/digital(\/checkout)?\/gift(\?.*)?$/,
// Requires /subscribe/digital, allows /checkout, allows any query string
nonGiftLandingAndCheckoutWithGuest:
/\/subscribe\/digital(\/checkout|\/checkout\/guest)?(\?.*)?$/,
nonGiftLandingNotAusNotUS:
/((uk|ca|eu|nz|int)\/subscribe\/digital(?!\/gift).?(\\?.*)?$)|(\/subscribe\/digital\/checkout?(\\?.*)?$)/,
},
paper: {
// Requires /subscribe/paper, allows /checkout or /checkout/guest, allows any query string
paperLandingWithGuestCheckout:
Expand Down
2 changes: 0 additions & 2 deletions support-frontend/assets/helpers/subscriptionsForms/formActionCreators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import { getDeliveryAgentsThunk } from 'helpers/redux/checkout/addressMeta/thunk
import {
setEmail as setEmailGift,
setFirstName as setFirstNameGift,
setGiftDeliveryDate,
setGiftMessage,
setLastName as setLastNameGift,
setTitle as setTitleGift,
Expand Down Expand Up @@ -83,7 +82,6 @@ const formActionCreators = {
setGiftStatus: setOrderIsAGift,
setDeliveryInstructions,
setGiftMessage,
setDigitalGiftDeliveryDate: setGiftDeliveryDate,
setAddDigitalSubscription: setAddDigital,
setCsrUsername: (username: string): Action => ({
type: 'SET_CSR_USERNAME',
Expand Down
25 changes: 6 additions & 19 deletions support-frontend/assets/helpers/tracking/quantumMetric.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,13 @@ enum SendEventSubscriptionCheckoutStart {
DigiSub = 75,
PaperSub = 76,
GuardianWeeklySub = 77,
DigiSubGift = 78,
GuardianWeeklySubGift = 79,
}

enum SendEventSubscriptionCheckoutConversion {
DigiSub = 31,
PaperSub = 67,
GuardianWeeklySub = 68,
DigiSubGift = 69,
GuardianWeeklySubGift = 70,
}

Expand Down Expand Up @@ -82,13 +80,8 @@ type SendEventId =

// ---- sendEvent logic ---- //

const {
DigiSub,
PaperSub,
GuardianWeeklySub,
DigiSubGift,
GuardianWeeklySubGift,
} = SendEventSubscriptionCheckoutStart;
const { DigiSub, PaperSub, GuardianWeeklySub, GuardianWeeklySubGift } =
SendEventSubscriptionCheckoutStart;

const { SingleContribution, RecurringContribution } =
SendEventContributionAmountUpdate;
Expand All @@ -97,7 +90,6 @@ const cartValueEventIds: SendEventId[] = [
DigiSub,
PaperSub,
GuardianWeeklySub,
DigiSubGift,
GuardianWeeklySubGift,
SingleContribution,
RecurringContribution,
Expand Down Expand Up @@ -228,15 +220,10 @@ function productToCheckoutEvents(
| undefined {
switch (product) {
case 'DigitalPack':
return orderIsAGift
? checkoutEvents(
SendEventSubscriptionCheckoutStart.DigiSubGift,
SendEventSubscriptionCheckoutConversion.DigiSubGift,
)
: checkoutEvents(
SendEventSubscriptionCheckoutStart.DigiSub,
SendEventSubscriptionCheckoutConversion.DigiSub,
);
return checkoutEvents(
SendEventSubscriptionCheckoutStart.DigiSub,
SendEventSubscriptionCheckoutConversion.DigiSub,
);
case 'GuardianWeekly':
return orderIsAGift
? checkoutEvents(
Expand Down
10 changes: 2 additions & 8 deletions support-frontend/assets/helpers/urls/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const routes = {
subscriptionCreate: '/subscribe/create',
subscriptionsLanding: '/subscribe',
digitalSubscriptionLanding: '/subscribe/digitaledition',
digitalSubscriptionLandingGift: '/subscribe/digital/gift',
paperSubscriptionLanding: '/subscribe/paper',
paperSubscriptionProductChoices: '/subscribe/paper#HomeDelivery',
paperSubscriptionDeliveryProductChoices:
Expand Down Expand Up @@ -81,14 +80,9 @@ function paperSubsUrl(
return baseURL;
}

function digitalSubscriptionLanding(
countryGroupId: CountryGroupId,
gift: boolean,
) {
function digitalSubscriptionLanding(countryGroupId: CountryGroupId) {
return `${getOrigin()}/${countryPath(countryGroupId)}${
gift
? routes.digitalSubscriptionLandingGift
: routes.digitalSubscriptionLanding
routes.digitalSubscriptionLanding
}`;
}

Expand Down
2 changes: 1 addition & 1 deletion support-frontend/assets/pages/promotion-terms/DigitalPackTerms.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function DigitalPackTerms(props: PropTypes) {
'By entering the promotion you are accepting these terms and conditions.',
<div>
To enter the promotion, you must: (i) either go to{' '}
<a href={digitalSubscriptionLanding(props.countryGroupId, false)}>
<a href={digitalSubscriptionLanding(props.countryGroupId)}>
support.theguardian.com
</a>{' '}
or call +44 (0) 330 333 6767 and quote promotion code {props.promoCode}{' '}
Expand Down
2 changes: 1 addition & 1 deletion support-frontend/assets/pages/subscriptions-landing/copy/subscriptionCopy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const digital = (
buttons: [
{
ctaButtonText: 'Find out more',
link: digitalSubscriptionLanding(countryGroupId, false),
link: digitalSubscriptionLanding(countryGroupId),
analyticsTracking: sendTrackingEventsOnClick({
id: 'digipack_cta',
product: 'DigitalPack',
Expand Down