TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

Updated webhook actions to dotdotdot menu

Browse Source
This commit is contained in:
Sanne de Vries 2022-07-12 13:38:43 +01:00
parent c7de8d3358
commit be0fb41636
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ghost/admin/app/templates/settings/integration.hbs
View File

@ -195,14 +195,36 @@
<td class="gh-list-data" data-test-text="targetUrl">{{webhook.targetUrl}}</td> <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="gh-list-data" data-test-text="last-triggered">{{or webhook.lastTriggeredAtUTC "Not triggered"}}</td>
<td class="w1 gh-list-data nowrap"> <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"> <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"}} {{svg-jar "pen" class="w6 h6 fill-midgrey pa1 mr1"}}
</LinkTo> </LinkTo>
<button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}> <button data-test-button="delete-webhook" type="button" {{on "click" (fn this.confirmWebhookDeletion webhook)}}>
{{svg-jar "trash" class="w6 fill-red pa1"}} {{svg-jar "trash" class="w6 fill-red pa1"}}
</button> </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> </td>
</tr> </tr>
{{else}} {{else}}

3
ghost/admin/tests/acceptance/settings/integrations-test.js
View File

@ -468,7 +468,8 @@ describe('Acceptance: Settings - Integrations - Custom', function () {
.to.have.string('Not triggered'); .to.have.string('Not triggered');
// click edit webhook link // 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 // modal appears and has correct title
expect(find('[data-test-modal="webhook-form"]')).to.exist; expect(find('[data-test-modal="webhook-form"]')).to.exist;