From a896e1ccb78bb0ef9775049251b0ced84ec4d35e Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Tue, 11 Jun 2024 16:13:40 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20"@"=20shortcut=20to=20trigg?=
 =?UTF-8?q?er=20internal=20linking=20search=20(beta)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

Typing "@" in the editor will immediately trigger an internal link search to make it faster to link to one of your articles. After typing "@" continue typing to search, results can be selected using Up/Down arrow keys or the mouse, then pressing Enter or clicking will insert the selected result's title pre-linked. Pressing Escape or moving the cursor out of the search box will cancel the search.

- removed labs flag
- updated Koenig feature flag for at-linking to use the same flag as our internal linking beta
---
 .../src/components/settings/advanced/labs/AlphaFeatures.tsx   | 4 ----
 ghost/admin/app/components/koenig-lexical-editor.js           | 2 +-
 ghost/admin/app/services/feature.js                           | 1 -
 ghost/core/core/shared/labs.js                                | 1 -
 4 files changed, 1 insertion(+), 7 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 3256fc4474..ede57e0236 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: 'NestJS Playground',
     description: 'Wires up the Ghost NestJS App to the Admin API',
     flag: 'NestPlayground'
-},{
-    title: 'Internal Linking @-links (internal alpha)',
-    description: 'Adds internal URL search when typing @ in the editor',
-    flag: 'internalLinkingAtLinks'
 },{
     title: 'ActivityPub',
     description: '(Highly) Experimental support for ActivityPub.',
diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index 5482c79338..af4a4e7214 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -447,7 +447,7 @@ export default class KoenigLexicalEditor extends Component {
                 collectionsCard: this.feature.collectionsCard,
                 collections: this.feature.collections,
                 internalLinking: this.feature.internalLinking,
-                internalLinkingAtLinks: this.feature.internalLinkingAtLinks,
+                internalLinkingAtLinks: this.feature.internalLinking,
                 contentVisibility: this.feature.contentVisibility
             },
             deprecated: { // todo fix typo
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index f9c6010f5d..717943baf7 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('onboardingChecklist') onboardingChecklist;
     @feature('ActivityPub') ActivityPub;
     @feature('internalLinking') internalLinking;
-    @feature('internalLinkingAtLinks') internalLinkingAtLinks;
     @feature('editorExcerpt') editorExcerpt;
     @feature('newsletterExcerpt') newsletterExcerpt;
 
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 9bad63298c..84bc349e36 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -54,7 +54,6 @@ const ALPHA_FEATURES = [
     'importMemberTier',
     'lexicalIndicators',
     'adminXDemo',
-    'internalLinkingAtLinks',
     'contentVisibility'
 ];