From 04ce1154a16b328c5d45dc2ccb663b726e49a5c1 Mon Sep 17 00:00:00 2001
From: Ronald Langeveld <hi@ronaldlangeveld.com>
Date: Thu, 10 Aug 2023 10:40:10 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20new=20enhanced=20Header=20C?=
 =?UTF-8?q?ard=20(#17654)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

- Keep an eye on Ghost's changelog (https://ghost.org/changelog/) for
the full feature announcement. 🎉

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at 8367091</samp>

This pull request removes the `headerUpgrade` feature flag and enables
the new header card by default in the editor. It also hides the old
header card from the editor menu unless the `labs.headerV1` setting is
enabled.
---
 .../admin/app/components/koenig-lexical-editor.js  |  6 ++++--
 ghost/admin/app/services/feature.js                |  1 -
 ghost/admin/app/templates/settings/labs.hbs        | 14 --------------
 ghost/core/core/shared/config/defaults.json        |  2 +-
 ghost/core/core/shared/labs.js                     |  1 -
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js
index 77e48e0f4a..8f0c66c694 100644
--- a/ghost/admin/app/components/koenig-lexical-editor.js
+++ b/ghost/admin/app/components/koenig-lexical-editor.js
@@ -323,8 +323,10 @@ export default class KoenigLexicalEditor extends Component {
             fetchLabels,
             feature: {
                 collectionsCard: this.feature.get('collectionsCard'),
-                collections: this.feature.get('collections'),
-                headerV2: this.feature.get('headerUpgrade')
+                collections: this.feature.get('collections')
+            },
+            depreciated: {
+                headerV1: true // if false, shows header v1 in the menu
             },
             membersEnabled: this.settings.get('membersSignupAccess') === 'all',
             siteTitle: this.settings.title,
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 78ecbb6fe2..1eef449923 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -75,7 +75,6 @@ export default class FeatureService extends Service {
     @feature('adminXSettings') adminXSettings;
     @feature('mailEvents') mailEvents;
     @feature('collectionsCard') collectionsCard;
-    @feature('headerUpgrade') headerUpgrade;
     @feature('importMemberTier') importMemberTier;
     @feature('tipsAndDonations') tipsAndDonations;
     @feature('convertToLexical') convertToLexical;
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index f7d00683ff..1532ec3fa2 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -325,20 +325,6 @@
                     </div>
                 </div>
 
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Header Card v2</h4>
-                            <p class="gh-expandable-description">
-                                A new enhanced version of the header card
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                            <GhFeatureFlag @flag="headerUpgrade" />
-                        </div>
-                    </div>
-                </div>
-
                 <div class="gh-expandable-block">
                     <div class="gh-expandable-header">
                         <div>
diff --git a/ghost/core/core/shared/config/defaults.json b/ghost/core/core/shared/config/defaults.json
index c95aeec64a..b02bc01186 100644
--- a/ghost/core/core/shared/config/defaults.json
+++ b/ghost/core/core/shared/config/defaults.json
@@ -200,7 +200,7 @@
     },
     "editor": {
         "url": "https://cdn.jsdelivr.net/ghost/koenig-lexical@~{version}/dist/koenig-lexical.umd.js",
-        "version": "0.3"
+        "version": "0.4"
     },
     "adminX": {
         "url": "https://cdn.jsdelivr.net/ghost/admin-x-settings@~{version}/dist/admin-x-settings.umd.js",
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index c3fef8721f..532047963e 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -40,7 +40,6 @@ const ALPHA_FEATURES = [
     'adminXSettings',
     'mailEvents',
     'collectionsCard',
-    'headerUpgrade',
     'tipsAndDonations',
     'importMemberTier',
     'convertToLexical'