TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 20:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Fixed reply-to dropdown when custom address was set (#19197)

Browse Source 
fixes GRO-103

When a custom reply-to address was set using one of the new flags, and
those flags were disabled - the dropdown showed an empty value and
saving was broken because of this value.

This change automatically reverts back to 'newsletter' as a default
value when editing a newsletter with an invalid reply-to value.
This commit is contained in:
Simon Backx 2023-11-30 10:58:27 +01:00 committed by GitHub
parent 4d029c4812
commit c07218dff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
View File

@ -1,6 +1,6 @@
import NewsletterPreview from './NewsletterPreview'; import NewsletterPreview from './NewsletterPreview';
import NiceModal, {useModal} from '@ebay/nice-modal-react'; import NiceModal, {useModal} from '@ebay/nice-modal-react';
import React, {useEffect, useState} from 'react'; import React, {useEffect, useMemo, useState} from 'react';
import useFeatureFlag from '../../../../hooks/useFeatureFlag'; import useFeatureFlag from '../../../../hooks/useFeatureFlag';
import useSettingGroup from '../../../../hooks/useSettingGroup'; import useSettingGroup from '../../../../hooks/useSettingGroup';
import validator from 'validator'; import validator from 'validator';
@ -37,10 +37,10 @@ const Sidebar: React.FC<{
let newsletterAddress = renderSenderEmail(newsletter, config, defaultEmailAddress); let newsletterAddress = renderSenderEmail(newsletter, config, defaultEmailAddress);
const replyToEmails = [ const replyToEmails = useMemo(() => [
{label: `Newsletter address (${newsletterAddress})`, value: 'newsletter'}, {label: `Newsletter address (${newsletterAddress})`, value: 'newsletter'},
{label: `Support address (${supportEmailAddress})`, value: 'support'} {label: `Support address (${supportEmailAddress})`, value: 'support'}
]; ], [newsletterAddress, supportEmailAddress]);
const fontOptions: SelectOption[] = [ const fontOptions: SelectOption[] = [
{value: 'serif', label: 'Elegant serif', className: 'font-serif'}, {value: 'serif', label: 'Elegant serif', className: 'font-serif'},
@ -176,6 +176,16 @@ const Sidebar: React.FC<{
); );
}; };
useEffect(() => {
if (!isManagedEmail(config)) {
// Autocorrect invalid values
const foundValue = replyToEmails.find(option => option.value === newsletter.sender_reply_to);
if (!foundValue) {
updateNewsletter({sender_reply_to: 'newsletter'});
}
}
}, [config, replyToEmails, updateNewsletter, newsletter.sender_reply_to]);
const renderReplyToEmailField = () => { const renderReplyToEmailField = () => {
// Self-hosters, or legacy Pro users // Self-hosters, or legacy Pro users
if (!isManagedEmail(config)) { if (!isManagedEmail(config)) {