High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Add explicit `Unschedule` button on campaign UI.
Kailash Nadh61c6b7e15ab8
diff --git a/frontend/src/views/Campaign.vue b/frontend/src/views/Campaign.vueindex 7fd7893d..86b9356a 100644--- a/frontend/src/views/Campaign.vue+++ b/frontend/src/views/Campaign.vue@@ -43,6 +43,12 @@{{ $t('campaigns.schedule') }}</b-button></b-field>+ <b-field expanded v-if="canUnSchedule">+ <b-button expanded @click="unscheduleCampaign" :loading="loading.campaigns" type="is-primary"+ icon-left="clock-start" data-cy="btn-unschedule">+ {{ $t('campaigns.unSchedule') }}+ </b-button>+ </b-field></b-field></div></div>@@ -593,6 +599,13 @@ export default Vue.extend({},);},++ unscheduleCampaign() {+ this.$api.changeCampaignStatus(this.data.id, 'draft').then((d) => {+ this.data = d;+ this.form.archiveSlug = d.archiveSlug;+ });+ },},computed: {@@ -607,6 +620,10 @@ export default Vue.extend({return this.data.status === 'draft' && this.data.sendAt;},+ canUnSchedule() {+ return this.data.status === 'scheduled' && this.data.sendAt;+ },+canStart() {return this.data.status === 'draft' && !this.data.sendAt;},diff --git a/i18n/ca.json b/i18n/ca.jsonindex 7315e267..0ec70136 100644--- a/i18n/ca.json+++ b/i18n/ca.json@@ -98,6 +98,7 @@"campaigns.testSent": "S'ha enviat el missatge de prova","campaigns.timestamps": "Segells de temps","campaigns.trackLink": "Enllaç de seguiment",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visualitzacions","dashboard.campaignViews": "Visualitzacions de la campanya","dashboard.linkClicks": "Clics a enllaços",diff --git a/i18n/cs-cz.json b/i18n/cs-cz.jsonindex bd14c307..50a3eabd 100644--- a/i18n/cs-cz.json+++ b/i18n/cs-cz.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testovací zpráva odeslána","campaigns.timestamps": "Časová razítka","campaigns.trackLink": "Sledovací odkaz",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Pohledy","dashboard.campaignViews": "Pohledy na kampaň","dashboard.linkClicks": "Klepnutí na odkaz",diff --git a/i18n/cy.json b/i18n/cy.jsonindex 1c7d6631..655f17d2 100644--- a/i18n/cy.json+++ b/i18n/cy.json@@ -98,6 +98,7 @@"campaigns.testSent": "Wedi anfon neges brawf","campaigns.timestamps": "Stamp amser","campaigns.trackLink": "Olrhain dolen",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Nifer y bobl sydd wedi'i gweld","dashboard.campaignViews": "Nifer y bobl sydd wedi gweld yr ymgyrch","dashboard.linkClicks": "Nifer y bobl sydd wedi clicio'r ddolen",diff --git a/i18n/da.json b/i18n/da.jsonindex aaea2d73..c2c96ed0 100644--- a/i18n/da.json+++ b/i18n/da.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testmeddelelse sendt","campaigns.timestamps": "Tidsstempler","campaigns.trackLink": "Link til spor",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Udsigt over","dashboard.campaignViews": "Kampagnevisninger","dashboard.linkClicks": "Klik på link",diff --git a/i18n/de.json b/i18n/de.jsonindex 6c334b36..906f77bf 100644--- a/i18n/de.json+++ b/i18n/de.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testnachricht gesendet","campaigns.timestamps": "Zeitstempel","campaigns.trackLink": "Track Link",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Ansichten","dashboard.campaignViews": "Kampagnenansichten","dashboard.linkClicks": "Linkklicks",diff --git a/i18n/el.json b/i18n/el.jsonindex e6489801..8423da02 100644--- a/i18n/el.json+++ b/i18n/el.json@@ -98,6 +98,7 @@"campaigns.testSent": "Το δοκιμαστικό μήνυμα στάλθηκε","campaigns.timestamps": "Χρονοσήματα","campaigns.trackLink": "Σύνδεσμος παρακολούθησης",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Προβολές","dashboard.campaignViews": "Προβολές εκστρατειών","dashboard.linkClicks": "Κλικ συνδέσμων",diff --git a/i18n/en.json b/i18n/en.jsonindex eb6eba6e..285946a2 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -98,6 +98,7 @@"campaigns.testSent": "Test message sent","campaigns.timestamps": "Timestamps","campaigns.trackLink": "Track link",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Views","dashboard.campaignViews": "Campaign views","dashboard.linkClicks": "Link clicks",diff --git a/i18n/eo.json b/i18n/eo.jsonindex 79c6cd05..7246c4fd 100644--- a/i18n/eo.json+++ b/i18n/eo.json@@ -98,6 +98,7 @@"campaigns.testSent": "S'ha enviat el missatge de prova","campaigns.timestamps": "Segells de temps","campaigns.trackLink": "Enllaç de seguiment",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visualitzacions","dashboard.campaignViews": "Visualitzacions de la campanya","dashboard.linkClicks": "Clics a enllaços",diff --git a/i18n/es.json b/i18n/es.jsonindex 6de21bb1..a8a3d339 100644--- a/i18n/es.json+++ b/i18n/es.json@@ -99,6 +99,7 @@"campaigns.testSent": "Mensaje de prueba enviado","campaigns.timestamps": "Marcas de tiempo","campaigns.trackLink": "Enlace de rastreo (Track link)",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Vistas","dashboard.campaignViews": "Vista de campaña","dashboard.linkClicks": "Enlaces cliqueados",diff --git a/i18n/fi.json b/i18n/fi.jsonindex bf053244..7437479e 100644--- a/i18n/fi.json+++ b/i18n/fi.json@@ -99,6 +99,7 @@"campaigns.testSent": "Testiviesti lähetetty","campaigns.timestamps": "Aikaleimat","campaigns.trackLink": "Seuraa linkkejä",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Katselukerrat","dashboard.campaignViews": "Kampanjan katselukerrat","dashboard.linkClicks": "Linkkiklikkaukset",diff --git a/i18n/fr-CA.json b/i18n/fr-CA.jsonindex 21f4d0f2..0241c8eb 100644--- a/i18n/fr-CA.json+++ b/i18n/fr-CA.json@@ -99,6 +99,7 @@"campaigns.testSent": "Message de test envoyé","campaigns.timestamps": "Horodatages","campaigns.trackLink": "Lien de suivi",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Vues","dashboard.campaignViews": "vues de campagne","dashboard.linkClicks": "clics sur liens",diff --git a/i18n/fr.json b/i18n/fr.jsonindex 8857d21c..b229f3c0 100644--- a/i18n/fr.json+++ b/i18n/fr.json@@ -99,6 +99,7 @@"campaigns.testSent": "Message de test envoyé","campaigns.timestamps": "Horodatages","campaigns.trackLink": "Lien de suivi",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Vues","dashboard.campaignViews": "vues de campagne","dashboard.linkClicks": "clics sur liens",diff --git a/i18n/he.json b/i18n/he.jsonindex aa01fe38..a3655a09 100644--- a/i18n/he.json+++ b/i18n/he.json@@ -98,6 +98,7 @@"campaigns.testSent": "הודעת בדיקה נשלחה","campaigns.timestamps": "חותמות זמן","campaigns.trackLink": "קישור מעקב",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "צפיות","dashboard.campaignViews": "צפיות בקמפיין","dashboard.linkClicks": "לחיצות על קישורים",diff --git a/i18n/hu.json b/i18n/hu.jsonindex 3243a37b..2088f5a5 100644--- a/i18n/hu.json+++ b/i18n/hu.json@@ -98,6 +98,7 @@"campaigns.testSent": "Tesztüzenet elküldve","campaigns.timestamps": "Időbélyegek","campaigns.trackLink": "Nyomkövetőhivatkozás",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Megtekintések","dashboard.campaignViews": "Megtekintések","dashboard.linkClicks": "Kattintások",diff --git a/i18n/it.json b/i18n/it.jsonindex 874148f5..bc113594 100644--- a/i18n/it.json+++ b/i18n/it.json@@ -98,6 +98,7 @@"campaigns.testSent": "Messaggio di prova inviato","campaigns.timestamps": "Marcatura temporale ","campaigns.trackLink": "Link di tracciamento",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visualizzazioni","dashboard.campaignViews": "Visualizzazioni della campagna","dashboard.linkClicks": "Clic sui link",diff --git a/i18n/jp.json b/i18n/jp.jsonindex 6cfe65a9..c5761cca 100644--- a/i18n/jp.json+++ b/i18n/jp.json@@ -99,6 +99,7 @@"campaigns.testSent": "テストメッセージ送信済み","campaigns.timestamps": "タイムスタンプ","campaigns.trackLink": "リンクの追跡",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "ビュー","dashboard.campaignViews": "キャンペーンビュー","dashboard.linkClicks": "リンクのクリック",diff --git a/i18n/ml.json b/i18n/ml.jsonindex 6f50117b..cef0d3e0 100644--- a/i18n/ml.json+++ b/i18n/ml.json@@ -98,6 +98,7 @@"campaigns.testSent": "പരീക്ഷണ സന്ദേശം അയച്ചു","campaigns.timestamps": "ടൈംസ്റ്റാമ്പുകൾ","campaigns.trackLink": "ട്രാക്ക് ലിങ്ക്",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "കാഴ്ചകൾ","dashboard.campaignViews": "ക്യാമ്പേയ്ൻ കാഴ്ചകൾ","dashboard.linkClicks": "ലിങ്ക് ക്ലിക്കുകൾ",diff --git a/i18n/nl.json b/i18n/nl.jsonindex 01fda046..f5183a70 100644--- a/i18n/nl.json+++ b/i18n/nl.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testbericht verzonden","campaigns.timestamps": "Tijdstippen","campaigns.trackLink": "Traceerbare link",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Bekeken","dashboard.campaignViews": "Campagneviews","dashboard.linkClicks": "Linkkliks",diff --git a/i18n/pl.json b/i18n/pl.jsonindex 12dfe0e8..49af654e 100644--- a/i18n/pl.json+++ b/i18n/pl.json@@ -98,6 +98,7 @@"campaigns.testSent": "Wiadomość testowa wysłana","campaigns.timestamps": "Sygnatury czasowe","campaigns.trackLink": "Link śledzący",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Wyświetlenia","dashboard.campaignViews": "Wyświetlenia kampanii","dashboard.linkClicks": "Kliknięcia linków",diff --git a/i18n/pt-BR.json b/i18n/pt-BR.jsonindex 83a0b7ec..60f6cab0 100644--- a/i18n/pt-BR.json+++ b/i18n/pt-BR.json@@ -98,6 +98,7 @@"campaigns.testSent": "Mensagem de teste enviada","campaigns.timestamps": "Data e hora","campaigns.trackLink": "Link de rastreamento",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visualizações","dashboard.campaignViews": "Visualizações da campanha","dashboard.linkClicks": "Links clicados",diff --git a/i18n/pt.json b/i18n/pt.jsonindex e3bbe937..5359b3ab 100644--- a/i18n/pt.json+++ b/i18n/pt.json@@ -98,6 +98,7 @@"campaigns.testSent": "Mensagem de teste enviada","campaigns.timestamps": "Carimbo de hora","campaigns.trackLink": "Link de rastreamento",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visualizações","dashboard.campaignViews": "Vista de campanhas","dashboard.linkClicks": "Cliques nos links",diff --git a/i18n/ro.json b/i18n/ro.jsonindex d8e12d9e..6cd7c654 100644--- a/i18n/ro.json+++ b/i18n/ro.json@@ -99,6 +99,7 @@"campaigns.testSent": "Mesaj de testare trimis","campaigns.timestamps": "Marcajele","campaigns.trackLink": "Track link-ul",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Vizualizări","dashboard.campaignViews": "Vizualizările campaniei","dashboard.linkClicks": "Clicuri pe link",diff --git a/i18n/ru.json b/i18n/ru.jsonindex e97fb04f..fe284730 100644--- a/i18n/ru.json+++ b/i18n/ru.json@@ -98,6 +98,7 @@"campaigns.testSent": "Тестовое сообщение отправлено","campaigns.timestamps": "Метки времени","campaigns.trackLink": "Ссылка на трек",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Просмотры","dashboard.campaignViews": "Просмотров кампаний","dashboard.linkClicks": "Кликов по ссылкам",diff --git a/i18n/se.json b/i18n/se.jsonindex a44a460b..d0ebaf27 100644--- a/i18n/se.json+++ b/i18n/se.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testmeddelande skickat","campaigns.timestamps": "Tidsstämplar","campaigns.trackLink": "Spåra länk",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Visningar","dashboard.campaignViews": "Visningar av kampanjer","dashboard.linkClicks": "Länkklickar",diff --git a/i18n/sk.json b/i18n/sk.jsonindex 40eada6b..02e22fcb 100644--- a/i18n/sk.json+++ b/i18n/sk.json@@ -98,6 +98,7 @@"campaigns.testSent": "Testovacia správa odoslaná","campaigns.timestamps": "Časové razítka","campaigns.trackLink": "Sledovací odkaz",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Zobrazenia","dashboard.campaignViews": "Zobrazenia kampane","dashboard.linkClicks": "Kliknutia na odkaz",diff --git a/i18n/sl.json b/i18n/sl.jsonindex ec67f002..add1a024 100644--- a/i18n/sl.json+++ b/i18n/sl.json@@ -98,6 +98,7 @@"campaigns.testSent": "Poslano testno sporočilo","campaigns.timestamps": "Časovni žigi","campaigns.trackLink": "Sledenje povezavi",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Ogledi","dashboard.campaignViews": "Ogledi oglaševalske akcije","dashboard.linkClicks": "Kliki povezav",diff --git a/i18n/tr.json b/i18n/tr.jsonindex 1fbee52b..8807d1d2 100644--- a/i18n/tr.json+++ b/i18n/tr.json@@ -99,6 +99,7 @@"campaigns.testSent": "Test mesajı gönderildi","campaigns.timestamps": "Zaman etiketi","campaigns.trackLink": "İzleme bağlantısı",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Görüntülenme","dashboard.campaignViews": "Kampanya görüntülenme Sayısı","dashboard.linkClicks": "Linklerin tıklanması",diff --git a/i18n/uk.json b/i18n/uk.jsonindex aff9330e..2c6fbde2 100644--- a/i18n/uk.json+++ b/i18n/uk.json@@ -98,6 +98,7 @@"campaigns.testSent": "Пробний лист надіслано","campaigns.timestamps": "Історія","campaigns.trackLink": "Відстежувати посилання",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Перегляди","dashboard.campaignViews": "Перегляди кампаній","dashboard.linkClicks": "Переходи за посиланнями",diff --git a/i18n/vi.json b/i18n/vi.jsonindex 56afd403..6401f008 100644--- a/i18n/vi.json+++ b/i18n/vi.json@@ -99,6 +99,7 @@"campaigns.testSent": "Gửi tin nhắn thử","campaigns.timestamps": "Dấu thời gian","campaigns.trackLink": "Theo dõi liên kết",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "Lượt xem","dashboard.campaignViews": "Chế độ xem chiến dịch","dashboard.linkClicks": "Liên kết nhấp chuột",diff --git a/i18n/zh-CN.json b/i18n/zh-CN.jsonindex 25bf6060..4ac31845 100644--- a/i18n/zh-CN.json+++ b/i18n/zh-CN.json@@ -98,6 +98,7 @@"campaigns.testSent": "已发送测试消息","campaigns.timestamps": "时间戳","campaigns.trackLink": "跟踪链接",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "视图","dashboard.campaignViews": "广告系列视图","dashboard.linkClicks": "链接点击次数",diff --git a/i18n/zh-TW.json b/i18n/zh-TW.jsonindex 1593250d..0029cacd 100644--- a/i18n/zh-TW.json+++ b/i18n/zh-TW.json@@ -99,6 +99,7 @@"campaigns.testSent": "測試電子郵件已寄送","campaigns.timestamps": "時間戳記","campaigns.trackLink": "追蹤連結",+ "campaigns.unSchedule": "Unschedule","campaigns.views": "開信","dashboard.campaignViews": "活動開信","dashboard.linkClicks": "連結點擊次數",diff --git a/internal/core/campaigns.go b/internal/core/campaigns.goindex f54dda23..cf3fbbd3 100644--- a/internal/core/campaigns.go+++ b/internal/core/campaigns.go@@ -209,8 +209,6 @@ func (c *Core) CreateCampaign(o models.Campaign, listIDs []int, mediaIDs []int)// UpdateCampaign updates a campaign.func (c *Core) UpdateCampaign(id int, o models.Campaign, listIDs []int, mediaIDs []int) (models.Campaign, error) {- sendLater := o.SendAt.Valid-_, err := c.q.UpdateCampaign.Exec(id,o.Name,o.Subject,@@ -219,7 +217,6 @@ func (c *Core) UpdateCampaign(id int, o models.Campaign, listIDs []int, mediaIDso.AltBody,o.ContentType,o.SendAt,- sendLater,o.Headers,pq.StringArray(normalizeTags(o.Tags)),o.Messenger,diff --git a/queries.sql b/queries.sqlindex c5b755dd..39071d2d 100644--- a/queries.sql+++ b/queries.sql@@ -830,33 +830,32 @@ WITH camp AS (altbody=(CASE WHEN $6 = '' THEN NULL ELSE $6 END),content_type=$7::content_type,send_at=$8::TIMESTAMP WITH TIME ZONE,- status=(CASE WHEN NOT $9 THEN 'draft' ELSE status END),- headers=$10,- tags=$11::VARCHAR(100)[],- messenger=$12,- template_id=$13,- archive=$15,- archive_slug=$16,- archive_template_id=$17,- archive_meta=$18,+ headers=$9,+ tags=$10::VARCHAR(100)[],+ messenger=$11,+ template_id=$12,+ archive=$14,+ archive_slug=$15,+ archive_template_id=$16,+ archive_meta=$17,updated_at=NOW()WHERE id = $1 RETURNING id),clists AS (-- Reset list relationships- DELETE FROM campaign_lists WHERE campaign_id = $1 AND NOT(list_id = ANY($14))+ DELETE FROM campaign_lists WHERE campaign_id = $1 AND NOT(list_id = ANY($13))),med AS (DELETE FROM campaign_media WHERE campaign_id = $1- AND ( media_id IS NULL or NOT(media_id = ANY($19))) RETURNING media_id+ AND ( media_id IS NULL or NOT(media_id = ANY($18))) RETURNING media_id),medi AS (INSERT INTO campaign_media (campaign_id, media_id, filename)- (SELECT $1 AS campaign_id, id, filename FROM media WHERE id=ANY($19::INT[]))+ (SELECT $1 AS campaign_id, id, filename FROM media WHERE id=ANY($18::INT[]))ON CONFLICT (campaign_id, media_id) DO NOTHING)INSERT INTO campaign_lists (campaign_id, list_id, list_name)- (SELECT $1 as campaign_id, id, name FROM lists WHERE id=ANY($14::INT[]))+ (SELECT $1 as campaign_id, id, name FROM lists WHERE id=ANY($13::INT[]))ON CONFLICT (campaign_id, list_id) DO UPDATE SET list_name = EXCLUDED.list_name;-- name: update-campaign-counts