From 594ef348713fa02a7375939d60c9f63bd13cc3e3 Mon Sep 17 00:00:00 2001
From: Rishabh Garg <zrishabhgarg@gmail.com>
Date: Fri, 26 Aug 2022 09:38:12 +0530
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Enabled=20member=20email=20alerts?=
 =?UTF-8?q?=20(#15321)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Team/issues/1825
closes https://github.com/TryGhost/Team/issues/1826

- allows site owners/admins to receive email notifications when somebody signs up, becomes paid, or cancels subscription
- owners/admins can set their email preference from staff settings
---
 ghost/admin/app/templates/settings/labs.hbs         | 13 -------------
 ghost/core/core/shared/labs.js                      |  6 +++---
 .../admin/__snapshots__/settings.test.js.snap       |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 15b793a6cf..b00a152ba8 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -252,19 +252,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="gh-expandable-block">
-                    <div class="gh-expandable-header">
-                        <div>
-                            <h4 class="gh-expandable-title">Email alerts</h4>
-                            <p class="gh-expandable-description">
-                               Receive email notifications when somebody signs up, becomes paid, or cancels subscription
-                            </p>
-                        </div>
-                        <div class="for-switch">
-                           <GhFeatureFlag @flag="emailAlerts" />
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
         {{/if}}
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 5480c2f3f7..1eafa75be3 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -18,7 +18,8 @@ const GA_FEATURES = [
     'newsletterPaywall',
     'freeTrial',
     'compExpiring',
-    'searchHelper'
+    'searchHelper',
+    'emailAlerts'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -31,8 +32,7 @@ const BETA_FEATURES = [
 const ALPHA_FEATURES = [
     'auditLog',
     'urlCache',
-    'beforeAfterCard',
-    'emailAlerts'
+    'beforeAfterCard'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];
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 521e088a9c..474c647cef 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
@@ -619,7 +619,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": "3387",
+  "content-length": "3408",
   "content-type": "application/json; charset=utf-8",
   "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
   "vary": "Origin, Accept-Encoding",