Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Handled missing support address on site

Browse source 
- the handling for non-existent support address for a site was missing, causing portal to not load in scenarios where support address is shown in UI
This commit is contained in:
Rishabh 2022-07-04 12:35:47 +02:00
parent 16d76feb3b
commit 4981a72c9f
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/portal/src/utils/helpers.js
View file

@ -589,7 +589,7 @@ export const getMemberName = ({member}) => {
export const getSupportAddress = ({site}) => { export const getSupportAddress = ({site}) => {
const {members_support_address: supportAddress} = site || {}; const {members_support_address: supportAddress} = site || {};
if (supportAddress.indexOf('@') < 0) { if (supportAddress?.indexOf('@') < 0) {
const siteDomain = getSiteDomain({site}); const siteDomain = getSiteDomain({site});
const updatedDomain = siteDomain?.replace(/^(www)\.(?=[^/]*\..{2,5})/, '') || ''; const updatedDomain = siteDomain?.replace(/^(www)\.(?=[^/]*\..{2,5})/, '') || '';
return `${supportAddress}@${updatedDomain}`; return `${supportAddress}@${updatedDomain}`;

10
ghost/portal/src/utils/helpers.test.js
View file

@ -223,6 +223,16 @@ describe('Helpers - ', () => {
expect(supportAddress).toBe('noreply@example.com'); expect(supportAddress).toBe('noreply@example.com');
}); });
test('returns empty string for missing support address', () => {
let site = {
members_support_address: null,
url: 'https://www.example.com'
};
const supportAddress = getSupportAddress({site});
expect(supportAddress).toBe('');
});
}); });
describe('getPriceIdFromPageQuery - ', () => { describe('getPriceIdFromPageQuery - ', () => {