Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

SSR: Fix loading state in campaign test email popover.

Kailash Nadhfbf32f026986
diff --git a/static/admin/assets/js/views/campaign.js b/static/admin/assets/js/views/campaign.js
index 97d7f309..3268639d 100644
--- a/static/admin/assets/js/views/campaign.js
+++ b/static/admin/assets/js/views/campaign.js
@@ -330,7 +330,7 @@ function component(camp, sel) {
return;
}
- await api('campaigns', `/campaigns/${this.form.id}/test`, 'POST', {
+ await api('campaigns.test', `/campaigns/${this.form.id}/test`, 'POST', {
...p,
id: this.form.id,
subscribers: this.form.testEmails,
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index 429581b1..3c8d555a 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -42,11 +42,11 @@
<button type="button" class="outline campaign-test-btn dot-indicator" :class="{ 'is-active': form.testEmails.length > 0 }" popovertarget="campaign-test" :disabled="isNew" data-cy="btn-test">{{ Icon "mail" }} {{ .L.T "campaigns.sendTest" }}</button>
<div popover id="campaign-test" class="campaign-test">
<label data-field>
- <ot-taginput x-model="form.testEmails"><input type="email" placeholder="{{ .L.T "campaigns.testEmails" }}" :disabled="isNew" autofocus /></ot-taginput>
+ <ot-taginput x-model="form.testEmails"><input type="email" placeholder="{{ .L.T "campaigns.testEmails" }}" :disabled="isNew" @blur="$el.value !== '' && $el.closest('ot-taginput').add($el.value)" autofocus /></ot-taginput>
<small data-hint>{{ .L.T "campaigns.sendTestHelp" }}</small>
</label>
<div class="hstack justify-end">
- <button type="button" data-variant="primary" @click="onTest" :disabled="isNew || isLoading('campaigns')" data-spinner="small">{{ Icon "mail" }} {{ .L.T "campaigns.send" }}</button>
+ <button type="button" data-variant="primary" @click="onTest" :disabled="isNew || isLoading('campaigns.test')" :aria-busy="isLoading('campaigns.test')" data-spinner="small">{{ Icon "mail" }} {{ .L.T "campaigns.send" }}</button>
</div>
</div>
</ot-dropdown>