Skip to content

🐛 Refreshed cancel button state after retention offer flow #26735

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

Merged
mike182uk merged 2 commits into from
Mar 9, 2026
Merged

🐛 Refreshed cancel button state after retention offer flow #26735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a591bf4
🐛 Refreshed cancel button state after retention offer flow
mike182uk Mar 9, 2026
7819de0
Reload after resuming subscription
mike182uk Mar 9, 2026
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
2 changes: 1 addition & 1 deletion apps/portal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tryghost/portal",
"version": "2.65.4",
"version": "2.65.5",
"license": "MIT",
"repository": "https://github.com/TryGhost/Ghost",
"author": "Ghost Foundation",
Expand Down
8 changes: 6 additions & 2 deletions apps/portal/src/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ function togglePopup({state}) {
function openPopup({data}) {
return {
showPopup: true,
reloadOnPopupClose: false,
page: data.page,
...(data.pageQuery ? {pageQuery: data.pageQuery} : {}),
...(data.pageData ? {pageData: data.pageData} : {})
Expand Down Expand Up @@ -268,7 +269,8 @@ async function cancelSubscription({data, state, api}) {
return {
action,
page: 'accountHome',
member: member
member: member,
reloadOnPopupClose: true
};
} catch (e) {
return {
Expand All @@ -292,7 +294,8 @@ async function continueSubscription({data, state, api}) {
return {
action,
page: 'accountHome',
member: member
member: member,
reloadOnPopupClose: true
};
} catch (e) {
return {
Expand All @@ -319,6 +322,7 @@ async function applyOffer({data, state, api}) {
page: 'accountHome',
member: member,
offers: [],
reloadOnPopupClose: true,
popupNotification: createPopupNotification({
type: 'applyOffer:success', autoHide: true, closeable: true, state, status: 'success',
message: 'Offer applied successfully!'
Expand Down
3 changes: 3 additions & 0 deletions apps/portal/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ export default class App extends React.Component {
} else {
window.document.body.style.marginRight = this.bodyMargin;
}
if (this.state.reloadOnPopupClose) {
window.location.reload();
}
}
} catch (e) {
/** Ignore any errors for scroll handling */
Expand Down
117 changes: 117 additions & 0 deletions apps/portal/test/actions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,123 @@ describe('startSigninOTCFromCustomForm action', () => {
});
});

describe('continueSubscription action', () => {
test('returns reloadOnPopupClose on success', async () => {
const mockApi = {
member: {
updateSubscription: vi.fn(() => Promise.resolve()),
sessionData: vi.fn(() => Promise.resolve({name: 'Test', email: 'test@example.com'}))
}
};

const result = await ActionHandler({
action: 'continueSubscription',
data: {subscriptionId: 'sub_123'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBe(true);
expect(result.action).toBe('continueSubscription:success');
});

test('does not return reloadOnPopupClose on failure', async () => {
const mockApi = {
member: {
updateSubscription: vi.fn(() => Promise.reject(new Error('API error')))
}
};

const result = await ActionHandler({
action: 'continueSubscription',
data: {subscriptionId: 'sub_123'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBeUndefined();
expect(result.action).toBe('continueSubscription:failed');
});
});

describe('cancelSubscription action', () => {
test('returns reloadOnPopupClose on success', async () => {
const mockApi = {
member: {
updateSubscription: vi.fn(() => Promise.resolve()),
sessionData: vi.fn(() => Promise.resolve({name: 'Test', email: 'test@example.com'}))
}
};

const result = await ActionHandler({
action: 'cancelSubscription',
data: {subscriptionId: 'sub_123', cancellationReason: 'Too expensive'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBe(true);
expect(result.action).toBe('cancelSubscription:success');
});

test('does not return reloadOnPopupClose on failure', async () => {
const mockApi = {
member: {
updateSubscription: vi.fn(() => Promise.reject(new Error('API error')))
}
};

const result = await ActionHandler({
action: 'cancelSubscription',
data: {subscriptionId: 'sub_123'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBeUndefined();
expect(result.action).toBe('cancelSubscription:failed');
});
});

describe('applyOffer action', () => {
test('returns reloadOnPopupClose on success', async () => {
const mockApi = {
member: {
applyOffer: vi.fn(() => Promise.resolve()),
sessionData: vi.fn(() => Promise.resolve({name: 'Test', email: 'test@example.com'}))
}
};

const result = await ActionHandler({
action: 'applyOffer',
data: {offerId: 'offer_123', subscriptionId: 'sub_123'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBe(true);
expect(result.action).toBe('applyOffer:success');
});

test('does not return reloadOnPopupClose on failure', async () => {
const mockApi = {
member: {
applyOffer: vi.fn(() => Promise.reject(new Error('API error')))
}
};

const result = await ActionHandler({
action: 'applyOffer',
data: {offerId: 'offer_123', subscriptionId: 'sub_123'},
state: {},
api: mockApi
});

expect(result.reloadOnPopupClose).toBeUndefined();
expect(result.action).toBe('applyOffer:failed');
});
});

describe('verifyOTC action', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let originalLocation: any;
Expand Down
34 changes: 34 additions & 0 deletions apps/portal/test/app.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,40 @@ describe('App', function () {
});
});

test('reloads page when popup closes with reloadOnPopupClose flag', () => {
const app = new App({siteUrl: 'http://example.com'});

window.location.reload = vi.fn();

app.state = {...app.state, showPopup: false, reloadOnPopupClose: true};
app.componentDidUpdate({}, {showPopup: true});

expect(window.location.reload).toHaveBeenCalledTimes(1);
});

test('does not reload when popup closes without reloadOnPopupClose flag', () => {
const app = new App({siteUrl: 'http://example.com'});

window.location.reload = vi.fn();

app.state = {...app.state, showPopup: false};
app.componentDidUpdate({}, {showPopup: true});

expect(window.location.reload).not.toHaveBeenCalled();
});

test('does not reload when reloadOnPopupClose is false', () => {
const app = new App({siteUrl: 'http://example.com'});

window.location.reload = vi.fn();

// Set reloadOnPopupClose to false explicitly and close the popup
app.state = {...app.state, showPopup: false, reloadOnPopupClose: false};
app.componentDidUpdate({}, {showPopup: true});

expect(window.location.reload).not.toHaveBeenCalled();
});

test('parses retention offer preview query data into account cancellation flow', () => {
const app = new App({siteUrl: 'http://example.com'});
const previewData = app.fetchOfferQueryStrData('redemption_type=retention&display_title=Before%2520you%2520go&display_description=Please%2520stay&type=percent&amount=100&duration=repeating&duration_in_months=2&cadence=month&tier_id=product_123&enabled=false');
Expand Down