From e326b6722c6bb4de1d1261f41c1426e383be5585 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Wed, 23 Mar 2022 15:45:12 +0000
Subject: [PATCH] Turned default email recipients dropdown into expandable
 setting

Refs https://github.com/TryGhost/Team/issues/1441
---
 ghost/admin/.lint-todo                           |  3 +++
 .../app/components/settings/members-email.hbs    | 16 +++++++++++++++-
 ghost/admin/app/styles/layouts/settings.css      |  4 ++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo
index cf19628ae1..a4d872db36 100644
--- a/ghost/admin/.lint-todo
+++ b/ghost/admin/.lint-todo
@@ -1226,3 +1226,6 @@ add|ember-template-lint|no-action|440|59|440|59|552676ca594b7e31314643aed74b61cf
 add|ember-template-lint|no-action|455|51|455|51|bdabf075c725d81a440009b6fe8d5c9f4dce1b24|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
 add|ember-template-lint|no-passed-in-event-handlers|440|52|440|52|a302b99c2a5682fd9186a16dce373578fe74a18b|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
 add|ember-template-lint|no-passed-in-event-handlers|455|44|455|44|7ca43fc52964fe52050eacf376e788422c34cf7a|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
+add|ember-template-lint|no-action|139|61|139|61|525caa6410c5001714d3891b1e99cc7c6b9aa6d2|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
+add|ember-template-lint|no-action|290|48|290|48|9ba0927837b1ab440136aff1d92f0b694752dea8|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
+add|ember-template-lint|no-action|291|45|291|45|3c80294f3c8009bf5e59ff31d44e18cbc4c0ab89|1647993600000|1650582000000|1653174000000|app/components/settings/members-email.hbs
diff --git a/ghost/admin/app/components/settings/members-email.hbs b/ghost/admin/app/components/settings/members-email.hbs
index f623802a33..0b432092ed 100644
--- a/ghost/admin/app/components/settings/members-email.hbs
+++ b/ghost/admin/app/components/settings/members-email.hbs
@@ -136,7 +136,21 @@
                             <h4 class="gh-expandable-title">Default newsletter recipients</h4>
                             <p class="gh-expandable-description">When you publish new content, who do you usually want to send it to?</p>
                         </div>
-                        <button type="button" class="gh-btn"><span>Expand</span></button>
+                        <button type="button" class="gh-btn" {{action (toggle "defaultRecipientsOpen" this)}} data-test-toggle-membersemail>
+                            <span>{{if this.defaultRecipientsOpen "Close" "Expand"}}</span>
+                        </button>
+                    </div>
+                    <div class="gh-expandable-content">
+                        {{#liquid-if this.defaultRecipientsOpen}}
+                            <div class="gh-setting-richdd-container gh-setting-rich-dropdown">
+                                <Settings::MembersEmail::DefaultRecipientsSelect
+                                    @recipients={{this.recipientsSelectValue}}
+                                    @segment={{this.settings.editorDefaultEmailRecipientsFilter}}
+                                    @onRecipientsChange={{action "setDefaultEmailRecipients"}}
+                                    @onSegmentChange={{action "setDefaultEmailRecipientsFilter"}}
+                                />
+                            </div>
+                        {{/liquid-if}}
                     </div>
                 </div>
 
diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css
index dd0ed42a13..098f10b1bf 100644
--- a/ghost/admin/app/styles/layouts/settings.css
+++ b/ghost/admin/app/styles/layouts/settings.css
@@ -2211,6 +2211,10 @@ p.theme-validation-details {
     margin: 36px 0;
 }
 
+.gh-expandable-content .gh-setting-richdd-container {
+    margin: 16px 0 32px;
+}
+
 .gh-setting-large-dropdown .ember-power-select-multiple-trigger {
     padding: 8px;
 }