From e6df014f848f0440fb47f17054e7d906ee27812b Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 3 Jul 2024 17:59:57 +0100
Subject: [PATCH] Cleaned up newsletterExcerpt flag

no issue

- feature is GA so the flag and related conditionals are no longer required
---
 .../settings/advanced/labs/AlphaFeatures.tsx     |  4 ----
 .../email/newsletters/NewsletterDetailModal.tsx  |  3 +--
 .../newsletters/NewsletterPreviewContent.tsx     |  3 +--
 ghost/admin/app/services/feature.js              |  1 -
 ghost/core/core/shared/labs.js                   |  1 -
 .../admin/__snapshots__/settings.test.js.snap    |  2 +-
 .../lib/email-templates/template.hbs             | 16 +++++++---------
 ghost/email-service/test/email-renderer.test.js  |  6 ------
 8 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
index 1d6c8e2f09..9226aa0a7e 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
@@ -60,10 +60,6 @@ const features = [{
     description: '(Highly) Experimental support for ActivityPub.',
     flag: 'ActivityPub'
 },{
-    title: 'Excerpt in newsletter',
-    description: 'Showing excerpt in newsletter',
-    flag: 'newsletterExcerpt'
-}, {
     title: 'Content Visibility',
     description: 'Enables content visibility in Emails',
     flag: 'contentVisibility'
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
index 74da1d7e4d..831c1bc43e 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
@@ -103,7 +103,6 @@ const Sidebar: React.FC<{
     const {mutateAsync: uploadImage} = useUploadImage();
     const [selectedTab, setSelectedTab] = useState('generalSettings');
     const hasEmailCustomization = useFeatureFlag('emailCustomization');
-    const hasNewsletterExcerpt = useFeatureFlag('newsletterExcerpt');
     const {localSettings} = useSettingGroup();
     const [siteTitle] = getSettingValues(localSettings, ['title']) as string[];
     const handleError = useHandleError();
@@ -418,7 +417,7 @@ const Sidebar: React.FC<{
                         onChange={color => updateNewsletter({title_color: color})}
                     />}
                     <ToggleGroup gap='lg'>
-                        {(hasNewsletterExcerpt && newsletter.show_post_title_section) &&
+                        {newsletter.show_post_title_section &&
                             <Toggle
                                 checked={newsletter.show_excerpt}
                                 direction="rtl"
diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
index e5f4642296..50dd5ea276 100644
--- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
+++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx
@@ -77,7 +77,6 @@ const NewsletterPreviewContent: React.FC<{
     const showHeader = headerIcon || headerTitle;
     const {config} = useGlobalData();
     const hasNewEmailAddresses = useFeatureFlag('newEmailAddresses');
-    const hasNewsletterExcerpt = useFeatureFlag('newsletterExcerpt');
 
     const currentDate = new Date().toLocaleDateString('default', {
         year: 'numeric',
@@ -154,7 +153,7 @@ const NewsletterPreviewContent: React.FC<{
                                     )} style={{color: titleColor}}>
                                         Your email newsletter
                                     </h2>
-                                    {(hasNewsletterExcerpt && showExcerpt) && (
+                                    {showExcerpt && (
                                         <p className={excerptClasses}>A subtitle to highlight key points and engage your readers</p>
                                     )}
                                     <div className={clsx(
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index cc71f91672..b0a2312e5f 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -83,7 +83,6 @@ export default class FeatureService extends Service {
     @feature('ActivityPub') ActivityPub;
     @feature('internalLinking') internalLinking;
     @feature('editorExcerpt') editorExcerpt;
-    @feature('newsletterExcerpt') newsletterExcerpt;
     @feature('contentVisibility') contentVisibility;
 
     _user = null;
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 61baa6eb41..f1cdb61e72 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -25,7 +25,6 @@ const GA_FEATURES = [
     'filterEmailDisabled',
     'newEmailAddresses',
     'portalImprovements',
-    'newsletterExcerpt',
     'internalLinking'
 ];
 
diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index 870409c514..cb0c1cc49b 100644
--- a/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/ghost/core/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -1155,7 +1155,7 @@ exports[`Settings API Edit Can edit a setting 2: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "4614",
+  "content-length": "4587",
   "content-type": "application/json; charset=utf-8",
   "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
diff --git a/ghost/email-service/lib/email-templates/template.hbs b/ghost/email-service/lib/email-templates/template.hbs
index 15d0b5705e..f99551134f 100644
--- a/ghost/email-service/lib/email-templates/template.hbs
+++ b/ghost/email-service/lib/email-templates/template.hbs
@@ -79,15 +79,13 @@
                                                     <a href="{{post.url}}" class="{{classes.titleLink}}">{{post.title}}</a>
                                                 </td>
                                             </tr>
-                                            {{#hasFeature 'newsletterExcerpt'}}
-                                                {{#if (and newsletter.showExcerpt post.customExcerpt)}}
-                                                    <tr>
-                                                        <td class="post-excerpt-wrapper" style="width: 100%">
-                                                            <p class="{{classes.excerpt}}">{{post.customExcerpt}}</p>
-                                                        </td>
-                                                    </tr>
-                                                {{/if}}
-                                            {{/hasFeature}}
+                                            {{#if (and newsletter.showExcerpt post.customExcerpt)}}
+                                                <tr>
+                                                    <td class="post-excerpt-wrapper" style="width: 100%">
+                                                        <p class="{{classes.excerpt}}">{{post.customExcerpt}}</p>
+                                                    </td>
+                                                </tr>
+                                            {{/if}}
                                             <tr>
                                                 <td style="width: 100%">
                                                     <table class="post-meta-wrapper" role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-bottom: 32px;">
diff --git a/ghost/email-service/test/email-renderer.test.js b/ghost/email-service/test/email-renderer.test.js
index 677a36bfaf..8a17bef600 100644
--- a/ghost/email-service/test/email-renderer.test.js
+++ b/ghost/email-service/test/email-renderer.test.js
@@ -1770,12 +1770,6 @@ describe('Email renderer', function () {
         });
 
         describe('show excerpt', function () {
-            beforeEach(function () {
-                labsEnabled = {
-                    newsletterExcerpt: true
-                };
-            });
-
             it('is rendered when enabled and customExcerpt is present', async function () {
                 const post = createModel(Object.assign({}, basePost, {custom_excerpt: 'This is an excerpt'}));
                 const newsletter = createModel({