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
feat: add subscriber activity tracking UI in admin panel (#2756)
Meysama2bfc0b77e5e
diff --git a/cmd/handlers.go b/cmd/handlers.goindex 8de9a4d8..82d54a56 100644--- a/cmd/handlers.go+++ b/cmd/handlers.go@@ -115,6 +115,7 @@ func initHTTPHandlers(e *echo.Echo, a *App) {g.GET("/api/subscribers", pm(a.QuerySubscribers, "subscribers:get_all", "subscribers:get"))g.GET("/api/subscribers/:id", pm(hasID(a.GetSubscriber), "subscribers:get_all", "subscribers:get"))+ g.GET("/api/subscribers/:id/activity", pm(hasID(a.GetSubscriberActivity), "subscribers:get_all", "subscribers:get"))g.GET("/api/subscribers/:id/export", pm(hasID(a.ExportSubscriberData), "subscribers:get_all", "subscribers:get"))g.GET("/api/subscribers/:id/bounces", pm(hasID(a.GetSubscriberBounces), "bounces:get"))g.DELETE("/api/subscribers/:id/bounces", pm(hasID(a.DeleteSubscriberBounces), "bounces:manage"))diff --git a/cmd/subscribers.go b/cmd/subscribers.goindex 5820029b..c8883c3e 100644--- a/cmd/subscribers.go+++ b/cmd/subscribers.go@@ -74,6 +74,25 @@ func (a *App) GetSubscriber(c echo.Context) error {return c.JSON(http.StatusOK, okResp{out})}+// GetSubscriberActivity handles the retrieval of a subscriber's campaign views and link clicks.+func (a *App) GetSubscriberActivity(c echo.Context) error {+ user := auth.GetUser(c)++ // Check if the user has access to at least one of the lists on the subscriber.+ id := getID(c)+ if err := a.hasSubPerm(user, []int{id}); err != nil {+ return err+ }++ // Fetch the subscriber activity from the DB.+ out, err := a.core.GetSubscriberActivity(id)+ if err != nil {+ return err+ }++ return c.JSON(http.StatusOK, okResp{out})+}+// QuerySubscribers handles querying subscribers based on an arbitrary SQL expression.func (a *App) QuerySubscribers(c echo.Context) error {// Get the authenticated user.diff --git a/frontend/src/api/index.js b/frontend/src/api/index.jsindex 61dc8678..7829ba3a 100644--- a/frontend/src/api/index.js+++ b/frontend/src/api/index.js@@ -169,6 +169,11 @@ export const getSubscriber = async (id) => http.get({ loading: models.subscribers },);+export const getSubscriberActivity = async (id) => http.get(+ `/api/subscribers/${id}/activity`,+ { loading: models.subscribers },+);+export const getSubscriberBounces = async (id) => http.get(`/api/subscribers/${id}/bounces`,{ loading: models.bounces },diff --git a/frontend/src/assets/style.scss b/frontend/src/assets/style.scssindex 61d2caf2..75ac58c7 100644--- a/frontend/src/assets/style.scss+++ b/frontend/src/assets/style.scss@@ -665,7 +665,7 @@ body.is-noscroll {/* Tabs */.b-tabs {.tab-content {- padding: 30px 20px;+ padding: 15px;border: 1px solid #ddd;border-width: 0 1px 1px 1px;@@ -824,6 +824,13 @@ section.lists {.blocklisted {color: red;}++ td.link-click-url {+ max-width: 200px;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ }}.b-table.subscriptions {@@ -1082,6 +1089,9 @@ section.analytics {/* Settings */.settings {+ .b-tabs .tab-content {+ padding: 30px 20px;+ }.disabled {opacity: 0.30;}diff --git a/frontend/src/components/SubscriberActivity.vue b/frontend/src/components/SubscriberActivity.vuenew file mode 100644index 00000000..7fa4ff76--- /dev/null+++ b/frontend/src/components/SubscriberActivity.vue@@ -0,0 +1,161 @@+<template>+ <div class="subscriber-activity">+ <div v-if="isLoading" class="has-text-centered">+ <b-loading :active="true" :is-full-page="false" />+ </div>++ <div v-else>+ <!-- Summary Stats -->+ <div class="columns">+ <div class="column is-4">+ <div class="box has-text-centered">+ <p class="heading">{{ $t('globals.terms.campaigns') }}</p>+ <p class="title">{{ activity.campaignViews ? activity.campaignViews.length : 0 }}</p>+ </div>+ </div>+ <div class="column is-4">+ <div class="box has-text-centered">+ <p class="heading">{{ $t('campaigns.views') }}</p>+ <p class="title">{{ totalViews }}</p>+ </div>+ </div>+ <div class="column is-4">+ <div class="box has-text-centered">+ <p class="heading">{{ $t('campaigns.clicks') }}</p>+ <p class="title">{{ totalClicks }}</p>+ </div>+ </div>+ </div>++ <!-- Campaign Views Section -->+ <div class="section-header mb-4">+ <h5 class="title is-5">+ {{ $t('campaigns.views') }}+ </h5>+ </div>++ <div v-if="activity.campaignViews && activity.campaignViews.length > 0">+ <b-table :data="activity.campaignViews" hoverable default-sort="lastViewedAt" default-sort-direction="desc"+ paginated :per-page="10" :pagination-simple="false" class="campaign-views-table">+ <b-table-column v-slot="props" field="subject" :label="$tc('globals.terms.campaign', 1)" sortable>+ <div v-if="props.row.uuid">+ <router-link :to="{ name: 'campaign', params: { id: props.row.id } }">+ {{ props.row.subject || props.row.name }}+ </router-link>+ </div>+ <div v-else>+ <em class="has-text-grey">{{ $t('subscribers.activity.campaignDeleted') }}</em>+ </div>+ </b-table-column>++ <b-table-column v-slot="props" field="viewCount" :label="$t('campaigns.views')" sortable numeric>+ <span class="tag is-light">{{ props.row.viewCount }}</span>+ </b-table-column>++ <b-table-column v-slot="props" field="lastViewedAt" :label="$t('globals.fields.createdAt')" sortable>+ <span v-if="props.row.lastViewedAt">+ {{ $utils.niceDate(props.row.lastViewedAt, true) }}+ </span>+ </b-table-column>+ </b-table>+ </div>+ <div v-else class="has-text-centered has-text-grey p-6">+ <p class="mt-2">{{ $t('globals.messages.emptyState') }}</p>+ </div>++ <!-- Link Clicks Section -->+ <div class="section-header mb-4 mt-6">+ <h5 class="title is-5">+ {{ $t('campaigns.clicks') }}+ </h5>+ </div>++ <div v-if="activity.linkClicks && activity.linkClicks.length > 0">+ <b-table :data="activity.linkClicks" hoverable default-sort="lastClickedAt" default-sort-direction="desc"+ paginated :per-page="10" :pagination-simple="false" class="link-clicks-table">+ <b-table-column v-slot="props" field="url" :label="$t('globals.terms.url')" cell-class="link-click-url"+ sortable>+ <a :href="props.row.url" target="_blank" rel="noopener noreferrer">+ {{ props.row.url }}+ </a>+ </b-table-column>++ <b-table-column v-slot="props" field="campaignName" :label="$tc('globals.terms.campaign', 1)" sortable>+ <div v-if="props.row.campaignUuid">+ <router-link :to="{ name: 'campaign', params: { id: props.row.campaignId } }">+ {{ props.row.campaignSubject || props.row.campaignName }}+ </router-link>+ </div>+ <div v-else>+ —+ </div>+ </b-table-column>++ <b-table-column v-slot="props" field="clickCount" :label="$t('campaigns.clicks')" sortable numeric>+ <span class="tag is-light">{{ props.row.clickCount }}</span>+ </b-table-column>++ <b-table-column v-slot="props" field="lastClickedAt" :label="$t('globals.fields.createdAt')" sortable>+ <span v-if="props.row.lastClickedAt">+ {{ $utils.niceDate(props.row.lastClickedAt, true) }}+ </span>+ </b-table-column>+ </b-table>+ </div>+ <div v-else class="has-text-centered has-text-grey p-6">+ <p class="mt-2">{{ $t('globals.messages.emptyState') }}</p>+ </div>+ </div>+ </div>+</template>++<script>+import Vue from 'vue';++export default Vue.extend({+ props: {+ subscriberId: {+ type: Number,+ required: true,+ },+ },++ data() {+ return {+ isLoading: false,+ activity: {+ campaignViews: [],+ linkClicks: [],+ },+ };+ },++ computed: {+ totalViews() {+ if (!this.activity.campaignViews) return 0;+ return this.activity.campaignViews.reduce((sum, v) => sum + (v.viewCount || 0), 0);+ },++ totalClicks() {+ if (!this.activity.linkClicks) return 0;+ return this.activity.linkClicks.reduce((sum, c) => sum + (c.clickCount || 0), 0);+ },+ },++ mounted() {+ this.getActivity();+ },++ methods: {+ getActivity() {+ this.isLoading = true;+ this.$api.getSubscriberActivity(this.subscriberId).then((data) => {+ this.activity = data;+ this.isLoading = false;+ }).catch(() => {+ this.isLoading = false;+ });+ },+ },+});+</script>diff --git a/frontend/src/views/SubscriberForm.vue b/frontend/src/views/SubscriberForm.vueindex c67ddf52..a7d320a9 100644--- a/frontend/src/views/SubscriberForm.vue+++ b/frontend/src/views/SubscriberForm.vue@@ -137,7 +137,11 @@<pre v-if="visibleMeta[props.row.id]">{{ props.row.meta }}</pre></b-table-column></b-table>- </b-tab-item>+ </b-tab-item><!-- bounces -->++ <b-tab-item :label="$t('subscribers.activity')" class="activity" :disabled="!isEditing">+ <subscriber-activity v-if="isEditing && data.id" :subscriber-id="data.id" />+ </b-tab-item><!-- activity --></b-tabs><b-field :message="$t('subscribers.attribsHelp') + ' ' + egAttribs" class="mt-6">@@ -168,11 +172,13 @@ import Vue from 'vue';import { mapState } from 'vuex';import ListSelector from '../components/ListSelector.vue';import CopyText from '../components/CopyText.vue';+import SubscriberActivity from '../components/SubscriberActivity.vue';export default Vue.extend({components: {ListSelector,CopyText,+ SubscriberActivity,},props: {diff --git a/i18n/bg.json b/i18n/bg.jsonindex e0e9fa4e..68fa842f 100644--- a/i18n/bg.json+++ b/i18n/bg.json@@ -243,6 +243,7 @@"globals.terms.template": "Шаблон | Шаблони","globals.terms.templates": "Шаблони","globals.terms.tx": "Транзакционен | Транзакционни",+ "globals.terms.url": "URL","globals.terms.user": "Потребител | Потребители","globals.terms.users": "Потребители","globals.terms.year": "Година | Години",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "До имейл","settings.title": "Настройки","settings.updateAvailable": "Налична е нова актуализация {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Разширено","subscribers.advancedQueryHelp": "Частичен SQL израз за заявка за атрибути на абонати","subscribers.attribs": "Атрибути",diff --git a/i18n/ca.json b/i18n/ca.jsonindex c7ff64fe..fde46270 100644--- a/i18n/ca.json+++ b/i18n/ca.json@@ -243,6 +243,7 @@"globals.terms.template": "Plantilla | Plantilles","globals.terms.templates": "Plantilles","globals.terms.tx": "Transaccional | Transaccionals",+ "globals.terms.url": "URL","globals.terms.user": "Usuari | Usuaris","globals.terms.users": "Usuaris","globals.terms.year": "Any | Anys",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Destinatari del correu electrònic","settings.title": "Configuració","settings.updateAvailable": "Hi ha disponible una nova actualització {versió}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avançat","subscribers.advancedQueryHelp": "Expressió SQL parcial per consultar els atributs del subscriptor","subscribers.attribs": "Atributs",diff --git a/i18n/cs-cz.json b/i18n/cs-cz.jsonindex 94238ef8..9720365d 100644--- a/i18n/cs-cz.json+++ b/i18n/cs-cz.json@@ -243,6 +243,7 @@"globals.terms.template": "Šablona | Šablony","globals.terms.templates": "Šablony","globals.terms.tx": "Transakční | Transakční",+ "globals.terms.url": "URL","globals.terms.user": "Uživatel | Uživatelé","globals.terms.users": "Uživatelé","globals.terms.year": "Rok | Roky",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Na e-mail","settings.title": "Nastavení","settings.updateAvailable": "Nová aktualizace {version} je k dispozici.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Rozšířené","subscribers.advancedQueryHelp": "Dílčí výraz SQL k dotazu na atributy odběratele","subscribers.attribs": "Atributy",diff --git a/i18n/cy.json b/i18n/cy.jsonindex 4dccf5b3..6e73cdc1 100644--- a/i18n/cy.json+++ b/i18n/cy.json@@ -243,6 +243,7 @@"globals.terms.template": "Templed | Templedi","globals.terms.templates": "Templedi","globals.terms.tx": "Trafodion",+ "globals.terms.url": "URL","globals.terms.user": "Defnyddiwr | Defnyddwyr","globals.terms.users": "Defnyddwyr","globals.terms.year": "Blwyddyn | Blynyddoedd",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "E-bost derbynnydd","settings.title": "Gosodiadau","settings.updateAvailable": "Mae diweddariad {version} newydd ar gael.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Uwch","subscribers.advancedQueryHelp": "Mynegiad SQL rhannol i wneud ymholiad ynghylch priodoleddau tanysgrifiwr","subscribers.attribs": "Priodoleddau",diff --git a/i18n/da.json b/i18n/da.jsonindex 57bc05bf..4c197aff 100644--- a/i18n/da.json+++ b/i18n/da.json@@ -243,6 +243,7 @@"globals.terms.template": "Skabelon | Skabeloner","globals.terms.templates": "Skabeloner","globals.terms.tx": "Transaktionel | Transaktionel",+ "globals.terms.url": "URL","globals.terms.user": "Bruger | Brugere","globals.terms.users": "Brugere","globals.terms.year": "År | År",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "For at e-maile","settings.title": "Indstillinger","settings.updateAvailable": "En ny opdatering {version} er tilgængelig.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avanceret","subscribers.advancedQueryHelp": "Delvist SQL-udtryk til forespørgsel på abonnentattributter","subscribers.attribs": "Attributter",diff --git a/i18n/de.json b/i18n/de.jsonindex 0379350a..96b278d5 100644--- a/i18n/de.json+++ b/i18n/de.json@@ -243,6 +243,7 @@"globals.terms.template": "Vorlage | Vorlagen","globals.terms.templates": "Vorlagen","globals.terms.tx": "Transaktion | Transaktionen",+ "globals.terms.url": "URL","globals.terms.user": "Benutzer | Benutzer","globals.terms.users": "Benutzer","globals.terms.year": "Jahr | Jahre",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Empfänger E-Mail","settings.title": "Einstellungen","settings.updateAvailable": "Ein neues Update auf {version} ist verfügbar.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Erweitert","subscribers.advancedQueryHelp": "Partieller SQL Ausdruck um Attribute der Abonnenten abzufragen","subscribers.attribs": "Attribute",diff --git a/i18n/el.json b/i18n/el.jsonindex 3925491b..38d2f439 100644--- a/i18n/el.json+++ b/i18n/el.json@@ -243,6 +243,7 @@"globals.terms.template": "Προσχέδιο | Προσχέδια","globals.terms.templates": "Προσχέδια","globals.terms.tx": "Συναλλακτική | Συναλλακτικές",+ "globals.terms.url": "URL","globals.terms.user": "Χρήστης | Χρήστες","globals.terms.users": "Χρήστες","globals.terms.year": "Έτος | Έτη",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Στο e-mail","settings.title": "Ρυθμίσεις","settings.updateAvailable": "Μια νέα ενημέρωση {version} είναι διαθέσιμη.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Για προχωρημένους","subscribers.advancedQueryHelp": "Μερική έκφραση SQL για την αναζήτηση χαρακτηριστικών συνδρομητών","subscribers.attribs": "Χαρακτηριστικά",diff --git a/i18n/en.json b/i18n/en.jsonindex 9164b5b1..918216e3 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -246,6 +246,7 @@"globals.terms.users": "Users","globals.terms.year": "Year | Years","globals.terms.import": "Import",+ "globals.terms.url": "URL","import.alreadyRunning": "An import is already running. Wait for it to finish or stop it before trying again.","import.blocklist": "Blocklist","import.csvDelim": "CSV delimiter",@@ -606,6 +607,7 @@"subscribers.status.unconfirmed": "Unconfirmed","subscribers.status.unsubscribed": "Unsubscribed","subscribers.subscribersDeleted": "{num} subscriber(s) deleted",+ "subscribers.activity": "Activity","templates.cantDeleteDefault": "Cannot delete non-existent or default template","templates.default": "Default","templates.dummyName": "Dummy campaign",diff --git a/i18n/eo.json b/i18n/eo.jsonindex 3081b479..98074029 100644--- a/i18n/eo.json+++ b/i18n/eo.json@@ -243,6 +243,7 @@"globals.terms.template": "Plantilla | Plantilles","globals.terms.templates": "Plantilles","globals.terms.tx": "Transaccional | Transaccionals",+ "globals.terms.url": "URL","globals.terms.user": "Uzanto | Uzantoj","globals.terms.users": "Uzantoj","globals.terms.year": "Any | Anys",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Destinatari del correu electrònic","settings.title": "Configuració","settings.updateAvailable": "Hi ha disponible una nova actualització {versió}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avançat","subscribers.advancedQueryHelp": "Expressió SQL parcial per consultar els atributs del subscriptor","subscribers.attribs": "Atributs",diff --git a/i18n/es.json b/i18n/es.jsonindex dea6dfe9..26ee821b 100644--- a/i18n/es.json+++ b/i18n/es.json@@ -243,6 +243,7 @@"globals.terms.template": "Plantilla | Plantillas","globals.terms.templates": "Plantillas","globals.terms.tx": "Transaccional | Transaccional",+ "globals.terms.url": "URL","globals.terms.user": "Usuario | Usuarios","globals.terms.users": "Usuarios","globals.terms.year": "Año | Años",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Correo electrónico del destinatario","settings.title": "Configuraciones","settings.updateAvailable": "Una actualización a la {version} está disponible.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avanzado","subscribers.advancedQueryHelp": "Expresión SQL parcial para consultar los atributos de un suscriptor","subscribers.attribs": "Atributos",diff --git a/i18n/fi.json b/i18n/fi.jsonindex 4cc34a97..5d1032d9 100644--- a/i18n/fi.json+++ b/i18n/fi.json@@ -243,6 +243,7 @@"globals.terms.template": "Mallipohja | Mallipohjat","globals.terms.templates": "Mallipohja","globals.terms.tx": "Transaktiivinen | Transaktiiviset",+ "globals.terms.url": "URL","globals.terms.user": "Käyttäjä | Käyttäjät","globals.terms.users": "Käyttäjät","globals.terms.year": "Vuosi | Vuodet",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Vastaanottajan e-mail","settings.title": "Asetukset","settings.updateAvailable": "Uusi päivitys {version} on saatavilla.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Edistynyt","subscribers.advancedQueryHelp": "Osa SQL-lauseketta tilaajien ominaisuuksien kyselyä varten","subscribers.attribs": "Ominaisuudet",diff --git a/i18n/fr-CA.json b/i18n/fr-CA.jsonindex 0fe3c60c..a3bce0be 100644--- a/i18n/fr-CA.json+++ b/i18n/fr-CA.json@@ -243,6 +243,7 @@"globals.terms.template": "Modèle | Modèles","globals.terms.templates": "Modèles","globals.terms.tx": "Transactionnel | Transactionnels",+ "globals.terms.url": "URL","globals.terms.user": "Utilisateur | Utilisateurs","globals.terms.users": "Utilisateurs","globals.terms.year": "Année | Années",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Courriel du destinataire","settings.title": "Paramètres","settings.updateAvailable": "Une nouvelle version ({version}) est disponible.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Requête avancée","subscribers.advancedQueryHelp": "Expression SQL partielle pour interroger les attributs de l'abonné·e","subscribers.attribs": "Attributs",diff --git a/i18n/fr.json b/i18n/fr.jsonindex 423ed217..59758434 100644--- a/i18n/fr.json+++ b/i18n/fr.json@@ -243,6 +243,7 @@"globals.terms.template": "Modèle | Modèles","globals.terms.templates": "Modèles","globals.terms.tx": "Transactionnel | Transactionnels",+ "globals.terms.url": "URL","globals.terms.user": "Utilisateur | Utilisateurs","globals.terms.users": "Utilisateurs","globals.terms.year": "Année | Années",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "E-mail du destinataire","settings.title": "Paramètres","settings.updateAvailable": "Une nouvelle version ({version}) est disponible.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Requête avancée","subscribers.advancedQueryHelp": "Expression SQL partielle pour interroger les attributs de l'abonné·e","subscribers.attribs": "Attributs",diff --git a/i18n/he.json b/i18n/he.jsonindex 21aa0cab..e81883a3 100644--- a/i18n/he.json+++ b/i18n/he.json@@ -243,6 +243,7 @@"globals.terms.template": "תבנית | תבניות","globals.terms.templates": "תבניות","globals.terms.tx": "עסקה | עסקה",+ "globals.terms.url": "URL","globals.terms.user": "משתמש | משתמשים","globals.terms.users": "משתמשים","globals.terms.year": "שנה | שנים",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "לכתובת","settings.title": "הגדרות","settings.updateAvailable": "עדכון חדש {version} זמין.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "מתקדם","subscribers.advancedQueryHelp": "הביטוי הדו־לשוני הוא להשתמש בביטוי SQL חלקיאָני לחיפוש אחריות במאפיינים בעלי חיפוש מתקדם.","subscribers.attribs": "מאפיינים",diff --git a/i18n/hu.json b/i18n/hu.jsonindex 470e047b..66c5cbc2 100644--- a/i18n/hu.json+++ b/i18n/hu.json@@ -243,6 +243,7 @@"globals.terms.template": "Sablon","globals.terms.templates": "Sablonok","globals.terms.tx": "Ügymenet",+ "globals.terms.url": "URL","globals.terms.user": "Felhasználó | Felhasználók","globals.terms.users": "Felhasználók","globals.terms.year": "Év",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Címzett","settings.title": "Beállítások","settings.updateAvailable": "Új verzió érhető el! ({version})",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Adatbázis lekérdezés","subscribers.advancedQueryHelp": "Részleges SQL kifejezés a tagok lekérdezéséhez","subscribers.attribs": "Adatok",diff --git a/i18n/it.json b/i18n/it.jsonindex 6b180536..6c500c3f 100644--- a/i18n/it.json+++ b/i18n/it.json@@ -243,6 +243,7 @@"globals.terms.template": "Modello | Modelli","globals.terms.templates": "Modelli","globals.terms.tx": "Transazionale | Transazionali",+ "globals.terms.url": "URL","globals.terms.user": "Utente | Utenti","globals.terms.users": "Utenti","globals.terms.year": "Anno | Anni",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Casella di posta di ricezione","settings.title": "Impostazioni","settings.updateAvailable": "È disponibile una nuova versione {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avanzate","subscribers.advancedQueryHelp": "Espressione SQL parziale per interrogare gli attributi del sottoscrittore","subscribers.attribs": "Attributi",diff --git a/i18n/jp.json b/i18n/jp.jsonindex c668fee8..497f50bc 100644--- a/i18n/jp.json+++ b/i18n/jp.json@@ -243,6 +243,7 @@"globals.terms.template": "テンプレート | テンプレート","globals.terms.templates": "テンプレート","globals.terms.tx": "トランザクションメール | トランザクションメール",+ "globals.terms.url": "URL","globals.terms.user": "ユーザー | ユーザー","globals.terms.users": "ユーザー","globals.terms.year": "都市 | 都市",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "メール宛","settings.title": "設定","settings.updateAvailable": "新しい {version} の更新が可能です。",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "アドバンスド","subscribers.advancedQueryHelp": "加入者属性を問い合わせる部分的なSQL式","subscribers.attribs": "属性",diff --git a/i18n/ko.json b/i18n/ko.jsonindex 112b9ef6..f9cd8426 100644--- a/i18n/ko.json+++ b/i18n/ko.json@@ -243,6 +243,7 @@"globals.terms.template": "템플릿","globals.terms.templates": "템플릿","globals.terms.tx": "트랜잭션",+ "globals.terms.url": "URL","globals.terms.user": "사용자","globals.terms.users": "사용자","globals.terms.year": "년",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "수신 이메일","settings.title": "설정","settings.updateAvailable": "새 업데이트 {version}이(가) 있습니다.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "고급","subscribers.advancedQueryHelp": "구독자 속성을 쿼리할 부분 SQL 표현식","subscribers.attribs": "속성",diff --git a/i18n/ml.json b/i18n/ml.jsonindex 51eb3c42..693abb8e 100644--- a/i18n/ml.json+++ b/i18n/ml.json@@ -243,6 +243,7 @@"globals.terms.template": "ടെംപ്ലേറ്റ് | ടെംപ്ലേറ്റുകൾ","globals.terms.templates": "ടെംപ്ലേറ്റുകൾ","globals.terms.tx": "ഇടപാട് | ഇടപാട്",+ "globals.terms.url": "URL","globals.terms.user": "ഉപയോക്താവ് | ഉപയോക്താക്കള്","globals.terms.users": "ഉപയോക്താക്കള്","globals.terms.year": "വർഷം | വർഷങ്ങൾ",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "അയക്കുന്ന ഇ-മെയിൽ വിലാസം","settings.title": "ക്രമീകരണങ്ങൾ","settings.updateAvailable": "ഒരു പുതിയ അപ്ഡേറ്റ് {version} ലഭ്യമാണ്.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "വിപുലമായത്","subscribers.advancedQueryHelp": "വരിക്കാരുടെ വിവരങ്ങൾ മനസിലാക്കുന്നതിനായുള്ള ഭാഗികമായ SQL പ്രയേഗം","subscribers.attribs": "ആട്രിബ്യൂട്ടുകൾ",diff --git a/i18n/nl.json b/i18n/nl.jsonindex fb98fd78..dfbe838b 100644--- a/i18n/nl.json+++ b/i18n/nl.json@@ -243,6 +243,7 @@"globals.terms.template": "Sjabloon | Sjablonen","globals.terms.templates": "Sjablonen","globals.terms.tx": "Transactioneel | Transactionele",+ "globals.terms.url": "URL","globals.terms.user": "Gebruiker | Gebruikers","globals.terms.users": "Gebruikers","globals.terms.year": "Jaar | Jaren",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Naar e-mail","settings.title": "Instellingen","settings.updateAvailable": "Een nieuwe update {version} is beschikbaar.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Geavanceerd","subscribers.advancedQueryHelp": "Gedeeltelijke SQL uitdrukking om abonnees attributen op te vragen","subscribers.attribs": "Attributen",diff --git a/i18n/no.json b/i18n/no.jsonindex 28bbc053..b364a439 100644--- a/i18n/no.json+++ b/i18n/no.json@@ -243,6 +243,7 @@"globals.terms.template": "Mal | Maler","globals.terms.templates": "Maler","globals.terms.tx": "Transaksjonell | Transaksjonell",+ "globals.terms.url": "URL","globals.terms.user": "Bruker | Brukere","globals.terms.users": "Brukere","globals.terms.year": "År | År",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Til e-post","settings.title": "Innstillinger","settings.updateAvailable": "En ny oppdatering {version} er tilgjengelig.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avansert","subscribers.advancedQueryHelp": "Delvis SQL-uttrykk for å søke i abonnentattributter","subscribers.attribs": "Attributter",diff --git a/i18n/pl.json b/i18n/pl.jsonindex 69f134a6..3ebbb33b 100644--- a/i18n/pl.json+++ b/i18n/pl.json@@ -243,6 +243,7 @@"globals.terms.template": "Szablon | Szablony","globals.terms.templates": "Szablony","globals.terms.tx": "Transakcyjne | Transakcyjne",+ "globals.terms.url": "URL","globals.terms.user": "Użytkownik | Użytkownicy","globals.terms.users": "Użytkownicy","globals.terms.year": "Rok | Lat",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Adres e-mail odbiorcy","settings.title": "Ustawienia","settings.updateAvailable": "Nowa wersja {version} jest dostępna.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Zaawansowane","subscribers.advancedQueryHelp": "Częściowe zapytania SQL w celu pobrania atrybutów subskrybentów","subscribers.attribs": "Atrybuty",diff --git a/i18n/pt-BR.json b/i18n/pt-BR.jsonindex 87076cda..09a790ad 100644--- a/i18n/pt-BR.json+++ b/i18n/pt-BR.json@@ -243,6 +243,7 @@"globals.terms.template": "Modelo | Modelos","globals.terms.templates": "Modelos","globals.terms.tx": "Transacional | Transacionais",+ "globals.terms.url": "URL","globals.terms.user": "Usuário | Usuários","globals.terms.users": "Usuários","globals.terms.year": "Ano | Anos",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "E-mail para","settings.title": "Configurações","settings.updateAvailable": "Atualização: a nova versão {version} já está disponível.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avançado","subscribers.advancedQueryHelp": "Expressão de SQL parcial para consultar atributos dos inscritos","subscribers.attribs": "Atributos",diff --git a/i18n/pt.json b/i18n/pt.jsonindex f0a9b3ca..3bc1af66 100644--- a/i18n/pt.json+++ b/i18n/pt.json@@ -243,6 +243,7 @@"globals.terms.template": "Modelo | Modelos","globals.terms.templates": "Modelo","globals.terms.tx": "Transacional | Transacional",+ "globals.terms.url": "URL","globals.terms.user": "Usuário | Usuários","globals.terms.users": "Usuários","globals.terms.year": "Ano | Anos",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "E-mail do destinatário","settings.title": "Definições","settings.updateAvailable": "A nova versão {version} está disponível.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avançado","subscribers.advancedQueryHelp": "Expressão SQL parcial para consultar atributos de subscritores","subscribers.attribs": "Atributos",diff --git a/i18n/ro.json b/i18n/ro.jsonindex 7d75a4ab..f9108aa5 100644--- a/i18n/ro.json+++ b/i18n/ro.json@@ -243,6 +243,7 @@"globals.terms.template": "Șabloane WhatsApp","globals.terms.templates": "Șabloane","globals.terms.tx": "Tranzacțional | Tranzacțional",+ "globals.terms.url": "URL","globals.terms.user": "Utilizator | Utilizatori","globals.terms.users": "Utilizatori","globals.terms.year": "Anul",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Pentru a e-mail","settings.title": "Setări","settings.updateAvailable": "Este disponibilă o nouă actualizare {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avansat","subscribers.advancedQueryHelp": "Expresie SQL parțială pentru a interoga atributele abonatului","subscribers.attribs": "Atribute",diff --git a/i18n/ru.json b/i18n/ru.jsonindex 2145a106..bee7e442 100644--- a/i18n/ru.json+++ b/i18n/ru.json@@ -243,6 +243,7 @@"globals.terms.template": "Шаблон | Шаблоны","globals.terms.templates": "Шаблоны","globals.terms.tx": "Транзакционный | Транзакционные",+ "globals.terms.url": "URL","globals.terms.user": "Пользователь | Пользователи","globals.terms.users": "Пользователи","globals.terms.year": "Год | Годы",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Кому (электронная почта)","settings.title": "Настройки","settings.updateAvailable": "Доступно новое обновление {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Расширенный","subscribers.advancedQueryHelp": "Частичное SQL-выражение для запроса атрибутов подписчиков","subscribers.attribs": "Атрибуты",diff --git a/i18n/se.json b/i18n/se.jsonindex f0db4e5f..74445b87 100644--- a/i18n/se.json+++ b/i18n/se.json@@ -243,6 +243,7 @@"globals.terms.template": "Mall | Mallar","globals.terms.templates": "Mallar","globals.terms.tx": "Transaktion | Transaktioner",+ "globals.terms.url": "URL","globals.terms.user": "Användare | Användare","globals.terms.users": "Användare","globals.terms.year": "År | År",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Till e-post","settings.title": "Inställningar","settings.updateAvailable": "En ny uppdatering {version} finns tillgänglig.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Avancerad","subscribers.advancedQueryHelp": "Del SQL-uttryck för att fråga prenumerantattribut","subscribers.attribs": "Attribut",diff --git a/i18n/sk.json b/i18n/sk.jsonindex aa7a71a3..059d88c0 100644--- a/i18n/sk.json+++ b/i18n/sk.json@@ -243,6 +243,7 @@"globals.terms.template": "Šablóna | Šablóny","globals.terms.templates": "Šablóny","globals.terms.tx": "Transakčné | Transakčné",+ "globals.terms.url": "URL","globals.terms.user": "Používateľ | Používatelia","globals.terms.users": "Používatelia","globals.terms.year": "Rok | Roky",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Na e-mail","settings.title": "Nastavenia","settings.updateAvailable": "Nová aktualizácia {version} je k dispozícii.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Rozšírené","subscribers.advancedQueryHelp": "Časť výrazu SQL k dotazu na atribúty odberateľov","subscribers.attribs": "Atribúty",diff --git a/i18n/sl.json b/i18n/sl.jsonindex 9cdb6807..6b665bd4 100644--- a/i18n/sl.json+++ b/i18n/sl.json@@ -243,6 +243,7 @@"globals.terms.template": "Predloga | Predloge","globals.terms.templates": "Predloge","globals.terms.tx": "Transakcijsko | Transakcijsko",+ "globals.terms.url": "URL","globals.terms.user": "Uporabnik | Uporabnika","globals.terms.users": "Uporabniki","globals.terms.year": "Leto | Leta",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Na e-pošto","settings.title": "Nastavitve","settings.updateAvailable": "Nova posodobitev {version} je na voljo.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Napredno","subscribers.advancedQueryHelp": "Delni izraz SQL za poizvedovanje atributov naročnika","subscribers.attribs": "Atributi",diff --git a/i18n/tr.json b/i18n/tr.jsonindex 1ccea3ee..feaa57b5 100644--- a/i18n/tr.json+++ b/i18n/tr.json@@ -243,6 +243,7 @@"globals.terms.template": "Taslak | Taslaklar","globals.terms.templates": "Taslaklar","globals.terms.tx": "İşlem | İşlem",+ "globals.terms.url": "URL","globals.terms.user": "Kullanıcı | Kullanıcılar","globals.terms.users": "Kullanıcılar","globals.terms.year": "Yıl | Yıllar",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Gönderilecek e-posta","settings.title": "Ayarlar","settings.updateAvailable": "Yeni bir güncel sürüm {version} mevcuttur.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "İleri düzey","subscribers.advancedQueryHelp": "Üye attributes verisini görüntülemek için SQL verisi","subscribers.attribs": "Nitelikler",diff --git a/i18n/uk.json b/i18n/uk.jsonindex a1af8571..028e067b 100644--- a/i18n/uk.json+++ b/i18n/uk.json@@ -243,6 +243,7 @@"globals.terms.template": "Шаблон | Шаблони","globals.terms.templates": "Шаблони","globals.terms.tx": "Транзакція | Транзакції",+ "globals.terms.url": "URL","globals.terms.user": "Користувач | Користувачі","globals.terms.users": "Користувачі","globals.terms.year": "Рік | Роки",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "На адресу","settings.title": "Налаштування","settings.updateAvailable": "Доступне оновлення {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Складніший запит","subscribers.advancedQueryHelp": "Частковий SQL-вираз для пошуку властивостей підписни_ць","subscribers.attribs": "Властивості",diff --git a/i18n/vi.json b/i18n/vi.jsonindex 3b4ae558..aef36b99 100644--- a/i18n/vi.json+++ b/i18n/vi.json@@ -243,6 +243,7 @@"globals.terms.template": "Mẫu | Mẫu","globals.terms.templates": "Mẫu","globals.terms.tx": "Giao dịch | Giao dịch",+ "globals.terms.url": "URL","globals.terms.user": "Người dùng | Người dùng","globals.terms.users": "Người dùng","globals.terms.year": "Năm | Năm",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "Email đến","settings.title": "Cài đặt","settings.updateAvailable": "Đã có bản cập nhật mới {version}.",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "Trình độ cao","subscribers.advancedQueryHelp": "Biểu thức SQL một phần để truy vấn thuộc tính người đăng ký","subscribers.attribs": "Thuộc tính",diff --git a/i18n/zh-CN.json b/i18n/zh-CN.jsonindex f486a6c8..910b2d6e 100644--- a/i18n/zh-CN.json+++ b/i18n/zh-CN.json@@ -243,6 +243,7 @@"globals.terms.template": "模板 | 多个模板","globals.terms.templates": "模板","globals.terms.tx": "交易 | 交易",+ "globals.terms.url": "URL","globals.terms.user": "用户","globals.terms.users": "用户","globals.terms.year": "年 | 多年",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "发到邮箱","settings.title": "设置","settings.updateAvailable": "有新的更新 {version} 可用。",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "高级","subscribers.advancedQueryHelp": "查询订阅者属性的部分SQL表达式","subscribers.attribs": "属性",diff --git a/i18n/zh-TW.json b/i18n/zh-TW.jsonindex 952f4c5c..ddf19546 100644--- a/i18n/zh-TW.json+++ b/i18n/zh-TW.json@@ -243,6 +243,7 @@"globals.terms.template": "版型| 多個版型","globals.terms.templates": "版型","globals.terms.tx": "交易 | 交易",+ "globals.terms.url": "URL","globals.terms.user": "使用者 | 使用者","globals.terms.users": "使用者","globals.terms.year": "年| 多年",@@ -562,6 +563,7 @@"settings.smtp.toEmail": "電子郵件至","settings.title": "設定","settings.updateAvailable": "有新的更新 {version} 可用。",+ "subscribers.activity": "Activity","subscribers.advancedQuery": "高級","subscribers.advancedQueryHelp": "查看訂閱者屬性的部分 SQL 表達式","subscribers.attribs": "屬性",diff --git a/internal/core/subscribers.go b/internal/core/subscribers.goindex 8d1bd7df..95332f61 100644--- a/internal/core/subscribers.go+++ b/internal/core/subscribers.go@@ -215,6 +215,19 @@ func (c *Core) GetSubscriberProfileForExport(id int, uuid string) (models.Subscrreturn out, nil}+// GetSubscriberActivity returns the subscriber's campaign views and link clicks for the Activity tab.+func (c *Core) GetSubscriberActivity(id int) (models.SubscriberActivity, error) {+ var out models.SubscriberActivity+ if err := c.q.GetSubscriberActivity.Get(&out, id); err != nil {+ c.log.Printf("error fetching subscriber activity: %v", err)++ return models.SubscriberActivity{}, echo.NewHTTPError(http.StatusInternalServerError,+ c.i18n.Ts("globals.messages.errorFetching", "name", "activity", "error", err.Error()))+ }++ return out, nil+}+// ExportSubscribers returns an iterator function that provides lists of subscribers based// on the given criteria in an exportable form. The iterator function returned can be called// repeatedly until there are nil subscribers. It's an iterator because exports can be extremelydiff --git a/models/models.go b/models/models.goindex acd8c0f9..88ffbae3 100644--- a/models/models.go+++ b/models/models.go@@ -172,6 +172,12 @@ type SubscriberExportProfile struct {LinkClicks json.RawMessage `db:"link_clicks" json:"link_clicks,omitempty"`}+// SubscriberActivity represents a subscriber's campaign views and link clicks for the Activity tab.+type SubscriberActivity struct {+ CampaignViews json.RawMessage `db:"campaign_views" json:"campaign_views"`+ LinkClicks json.RawMessage `db:"link_clicks" json:"link_clicks"`+}+// JSON is the wrapper for reading and writing arbitrary JSONB fields from the DB.type JSON map[string]anydiff --git a/models/queries.go b/models/queries.goindex 4d1fe1e0..4b41adf7 100644--- a/models/queries.go+++ b/models/queries.go@@ -36,6 +36,7 @@ type Queries struct {DeleteOrphanSubscribers *sqlx.Stmt `query:"delete-orphan-subscribers"`UnsubscribeByCampaign *sqlx.Stmt `query:"unsubscribe-by-campaign"`ExportSubscriberData *sqlx.Stmt `query:"export-subscriber-data"`+ GetSubscriberActivity *sqlx.Stmt `query:"get-subscriber-activity"`// Non-prepared arbitrary subscriber queries.QuerySubscribers string `query:"query-subscribers"`diff --git a/queries.sql b/queries.sqlindex 685491b6..ead6a7b1 100644--- a/queries.sql+++ b/queries.sql@@ -300,6 +300,44 @@ SELECT (SELECT email FROM prof) as email,COALESCE((SELECT JSON_AGG(t) FROM views t), '[]') AS campaign_views,COALESCE((SELECT JSON_AGG(t) FROM clicks t), '[]') AS link_clicks;+-- name: get-subscriber-activity+-- Gets the subscriber's campaign views and link clicks with detailed information+-- for display in the Activity tab+WITH views AS (+ SELECT+ c.id,+ c.uuid,+ c.name,+ c.subject,+ COUNT(*) as view_count,+ MAX(cv.created_at) as last_viewed_at+ FROM campaign_views cv+ LEFT JOIN campaigns c ON c.id = cv.campaign_id+ WHERE cv.subscriber_id = $1+ GROUP BY c.id, c.uuid, c.name, c.subject+ ORDER BY last_viewed_at DESC+),+clicks AS (+ SELECT+ l.id as link_id,+ l.url,+ c.id as campaign_id,+ c.uuid as campaign_uuid,+ c.name as campaign_name,+ c.subject as campaign_subject,+ COUNT(*) as click_count,+ MAX(lc.created_at) as last_clicked_at+ FROM link_clicks lc+ LEFT JOIN links l ON l.id = lc.link_id+ LEFT JOIN campaigns c ON c.id = lc.campaign_id+ WHERE lc.subscriber_id = $1+ GROUP BY l.id, l.url, c.id, c.uuid, c.name, c.subject+ ORDER BY last_clicked_at DESC+)+SELECT+ COALESCE((SELECT JSON_AGG(v) FROM views v), '[]') as campaign_views,+ COALESCE((SELECT JSON_AGG(c) FROM clicks c), '[]') as link_clicks;+-- Partial and RAW queries used to construct arbitrary subscriber-- queries for segmentation follow.