From be0fb416366574791a80014d070ce5ef0418616f Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Tue, 12 Jul 2022 13:38:43 +0100
Subject: [PATCH] Updated webhook actions to dotdotdot menu

---
 .../app/templates/settings/integration.hbs    | 26 +++++++++++++++++--
 .../acceptance/settings/integrations-test.js  |  3 ++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/templates/settings/integration.hbs b/ghost/admin/app/templates/settings/integration.hbs
index 417656fa69..aa11981d94 100644
--- a/ghost/admin/app/templates/settings/integration.hbs
+++ b/ghost/admin/app/templates/settings/integration.hbs
@@ -195,14 +195,36 @@
                             <td class="gh-list-data" data-test-text="targetUrl">{{webhook.targetUrl}}</td>
                             <td class="gh-list-data" data-test-text="last-triggered">{{or webhook.lastTriggeredAtUTC "Not triggered"}}</td>
                             <td class="w1 gh-list-data nowrap">
-                                <div class="child flex items-center">
+                                {{!-- <div class="child flex items-center">
                                     <LinkTo @route="settings.integration.webhooks.edit" @models={{array this.integration webhook}} data-test-link="edit-webhook">
                                         {{svg-jar "pen" class="w6 h6 fill-midgrey pa1 mr1"}}
                                     </LinkTo>
                                     <button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}>
                                         {{svg-jar "trash" class="w6 fill-red pa1"}}
                                     </button>
-                                </div>
+                                </div> --}}
+                                <GhBasicDropdown @verticalPosition="below" @horizontalPosition="right" @renderInPlace={{true}} as |dd|>
+                                    <dd.Trigger class="gh-btn gh-btn-action-icon gh-btn-icon gh-btn-outline gh-tier-card-actions-button icon-only">
+                                        <span data-test-newsletter-menu-trigger>
+                                            {{svg-jar "dotdotdot"}}
+                                            <span class="hidden">Actions</span>
+                                        </span>
+                                    </dd.Trigger>
+                                    <dd.Content class="relative-dropdown-menu gh-newsletter-actions-menu">
+                                        <ul class="dropdown-menu dropdown-triangle-top-right" role="listbox" {{css-transition "anim-fade-in-scale"}}>
+                                            <li>
+                                                <LinkTo @route="settings.integration.webhooks.edit" @models={{array this.integration webhook}} data-test-link="edit-webhook">
+                                                    Edit
+                                                </LinkTo>                                            
+                                            </li>
+                                            <li>
+                                                <button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}>
+                                                    Delete
+                                                </button>
+                                            </li>
+                                        </ul>
+                                    </dd.Content>
+                                </GhBasicDropdown>
                             </td>
                         </tr>
                     {{else}}
diff --git a/ghost/admin/tests/acceptance/settings/integrations-test.js b/ghost/admin/tests/acceptance/settings/integrations-test.js
index 0e133619ab..d41a373f1e 100644
--- a/ghost/admin/tests/acceptance/settings/integrations-test.js
+++ b/ghost/admin/tests/acceptance/settings/integrations-test.js
@@ -468,7 +468,8 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
                 .to.have.string('Not triggered');
 
             // click edit webhook link
-            await click('[data-test-webhook-row="1"] [data-test-link="edit-webhook"]');
+            await click('[data-test-webhook-row="1"] [data-test-newsletter-menu-trigger]');
+            await click('[data-test-link="edit-webhook"]');
 
             // modal appears and has correct title
             expect(find('[data-test-modal="webhook-form"]')).to.exist;