From 085958d53df0d5eda6e2ccbb4b69c8b117efae2e Mon Sep 17 00:00:00 2001
From: Aileen Nowak <AileenCGN@gmail.com>
Date: Thu, 4 Aug 2022 09:43:36 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20Ghost=20Explore=20integrati?=
 =?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

- bumps Ghost Explore to GA from alpha
---
 ghost/admin/app/routes/explore.js                   |  9 ---------
 ghost/admin/app/services/feature.js                 |  1 -
 ghost/admin/app/templates/settings/labs.hbs         | 13 -------------
 ghost/core/core/shared/labs.js                      |  1 -
 .../admin/__snapshots__/settings.test.js.snap       |  4 ++--
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/ghost/admin/app/routes/explore.js b/ghost/admin/app/routes/explore.js
index e83c1b1e7f..467c44e18a 100644
--- a/ghost/admin/app/routes/explore.js
+++ b/ghost/admin/app/routes/explore.js
@@ -2,16 +2,7 @@ import AdminRoute from 'ghost-admin/routes/admin';
 import {inject as service} from '@ember/service';
 
 export default class ExploreRoute extends AdminRoute {
-    @service session;
     @service store;
-    @service feature;
-
-    beforeModel() {
-        super.beforeModel(...arguments);
-        if (!this.feature.explore) {
-            return this.transitionTo('home');
-        }
-    }
 
     model() {
         return this.store.findAll('integration');
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 345a04d3b4..7a1e0ec8bd 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -60,7 +60,6 @@ export default class FeatureService extends Service {
     @feature('beforeAfterCard') beforeAfterCard;
     @feature('comments') comments;
     @feature('newsletterPaywall') newsletterPaywall;
-    @feature('explore') explore;
 
     _user = null;
 
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 11466b629a..1f12c9ba56 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -226,19 +226,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Ghost Explore</h4>
-                            <p class="gh-expandable-description">
-                               Allow integration with Ghost Explore
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="explore" />
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
         {{/if}}
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 06bff7779f..c403239f71 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -28,7 +28,6 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'comments',
-    'explore',
     'freeTrial'
 ];
 
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 eadfa56722..581d350539 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
@@ -230,7 +230,7 @@ Object {
     },
     Object {
       "key": "labs",
-      "value": "{\\"activitypub\\":true,\\"urlCache\\":true,\\"beforeAfterCard\\":true,\\"comments\\":true,\\"explore\\":true,\\"freeTrial\\":true,\\"newsletterPaywall\\":true,\\"members\\":true}",
+      "value": "{\\"activitypub\\":true,\\"urlCache\\":true,\\"beforeAfterCard\\":true,\\"comments\\":true,\\"freeTrial\\":true,\\"newsletterPaywall\\":true,\\"members\\":true}",
     },
     Object {
       "key": "slack_url",
@@ -280,7 +280,7 @@ exports[`Settings API Browse Can request all settings 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": "3442",
+  "content-length": "3425",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Origin, Accept-Encoding",