From 100e7b70c68155a47fc210962117436e3ca67a72 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@ghost.org>
Date: Wed, 17 Jan 2024 09:57:35 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20TK=20Reminders=20feature=20?=
 =?UTF-8?q?(#19491)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

- keep an eye on on https://ghost.org/changelog/ for full details
---
 .../src/components/settings/advanced/labs/AlphaFeatures.tsx   | 4 ----
 ghost/admin/app/components/gh-koenig-editor-lexical.hbs       | 2 +-
 ghost/admin/app/components/koenig-lexical-editor.js           | 4 ++--
 ghost/admin/app/services/feature.js                           | 1 -
 ghost/admin/app/templates/lexical-editor.hbs                  | 2 +-
 ghost/admin/tests/acceptance/editor-test.js                   | 2 --
 ghost/core/core/shared/labs.js                                | 1 -
 7 files changed, 4 insertions(+), 12 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 eb86825113..793ae8be73 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
@@ -59,10 +59,6 @@ const features = [{
     title: 'AdminX Demo',
     description: 'Adds a navigation link to the AdminX demo app',
     flag: 'adminXDemo'
-},{
-    title: 'TK Reminders',
-    description: 'Enables the TK Reminders feature in the editor',
-    flag: 'tkReminders'
 },{
     title: 'New email addresses',
     description: 'For self hosters, forces the usage of the mail.from config as from address for all outgoing emails',
diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
index e8c702924d..ed82e5e453 100644
--- a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
+++ b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs
@@ -29,7 +29,7 @@
                 </span>
             {{/if}}
 
-            {{#if (and (feature "tkReminders") @titleHasTk)}}
+            {{#if @titleHasTk}}
                 <div
                     class="tk-indicator" data-testid="tk-indicator"
                     {{on "click" this.focusTitle}}
diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index 06765f870e..8e49be2433 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -537,7 +537,7 @@ export default class KoenigLexicalEditor extends Component {
                             multiplayerEndpoint={multiplayerEndpoint}
                             onError={this.onError}
                             darkMode={this.feature.nightShift}
-                            isTKEnabled={this.feature.tkReminders}
+                            isTKEnabled={true}
                         >
                             <KoenigEditor
                                 editorResource={this.editorResource}
@@ -548,7 +548,7 @@ export default class KoenigLexicalEditor extends Component {
                                 registerAPI={this.args.registerAPI}
                             />
                             <WordCountPlugin editorResource={this.editorResource} onChange={this.args.updateWordCount} />
-                            {this.feature.tkReminders && <TKCountPlugin editorResource={this.editorResource} onChange={this.args.updatePostTkCount} />}
+                            <TKCountPlugin editorResource={this.editorResource} onChange={this.args.updatePostTkCount} />
                         </KoenigComposer>
                     </Suspense>
                 </ErrorHandler>
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index b858fe1bbc..f4d3b37b5f 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -79,7 +79,6 @@ export default class FeatureService extends Service {
     @feature('lexicalIndicators') lexicalIndicators;
     @feature('filterEmailDisabled') filterEmailDisabled;
     @feature('adminXDemo') adminXDemo;
-    @feature('tkReminders') tkReminders;
     @feature('portalImprovements') portalImprovements;
 
     _user = null;
diff --git a/ghost/admin/app/templates/lexical-editor.hbs b/ghost/admin/app/templates/lexical-editor.hbs
index 29a48b347b..015bbe9969 100644
--- a/ghost/admin/app/templates/lexical-editor.hbs
+++ b/ghost/admin/app/templates/lexical-editor.hbs
@@ -75,7 +75,7 @@
                 @onEditorCreated={{this.setKoenigEditor}}
                 @updateWordCount={{this.updateWordCount}}
                 @updatePostTkCount={{this.updatePostTkCount}}
-                @updateFeatureImageTkCount={{if (feature "tkReminders") this.updateFeatureImageTkCount}}
+                @updateFeatureImageTkCount={{this.updateFeatureImageTkCount}}
                 @featureImage={{this.post.featureImage}}
                 @featureImageAlt={{this.post.featureImageAlt}}
                 @featureImageCaption={{this.post.featureImageCaption}}
diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index 90baaedf87..a4a2168355 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -5,7 +5,6 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-sup
 import {beforeEach, describe, it} from 'mocha';
 import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers';
 import {datepickerSelect} from 'ember-power-datepicker/test-support';
-import {enableLabsFlag} from '../helpers/labs-flag';
 import {expect} from 'chai';
 import {selectChoose} from 'ember-power-select/test-support';
 import {setupApplicationTest} from 'ember-mocha';
@@ -573,7 +572,6 @@ describe('Acceptance: Editor', function () {
         });
 
         it('handles TKs in title', async function () {
-            enableLabsFlag(this.server, 'tkReminders');
             let post = this.server.create('post', {authors: [author]});
 
             await visit(`/editor/post/${post.id}`);
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index e5847c0b3b..745bf50dd8 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -47,7 +47,6 @@ const ALPHA_FEATURES = [
     'adminXOffers',
     'filterEmailDisabled',
     'adminXDemo',
-    'tkReminders',
     'newEmailAddresses',
     'portalImprovements'
 ];