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 missing subscriber details and avatars to bounces page.
Kailash Nadhf427fd89c7d0
diff --git a/models/bounces.go b/models/bounces.goindex 49ad2189..dbc27ea7 100644--- a/models/bounces.go+++ b/models/bounces.go@@ -23,6 +23,7 @@ type Bounce struct {Email string `db:"email" json:"email,omitempty"`SubscriberUUID string `db:"subscriber_uuid" json:"subscriber_uuid,omitempty"`SubscriberID int `db:"subscriber_id" json:"subscriber_id,omitempty"`+ SubscriberName string `db:"subscriber_name" json:"-"`SubscriberStatus string `db:"subscriber_status" json:"subscriber_status"`CampaignUUID string `db:"campaign_uuid" json:"campaign_uuid,omitempty"`@@ -39,9 +40,9 @@ type BounceCampaign struct {Name string `json:"name"`}-// ParsedCampaign unmarshals the bounce's raw campaign JSON, or returns nil if the+// Campaigns unmarshals the bounce's raw campaign JSON, or returns nil if the// bounce isn't associated with a campaign.-func (b Bounce) ParsedCampaign() *BounceCampaign {+func (b Bounce) Campaigns() *BounceCampaign {if b.Campaign == nil || len(*b.Campaign) == 0 {return nil}diff --git a/queries/bounces.sql b/queries/bounces.sqlindex df0b1855..1ab2e339 100644--- a/queries/bounces.sql+++ b/queries/bounces.sql@@ -39,6 +39,7 @@ SELECT COUNT(*) OVER () AS total,bounces.subscriber_id,subscribers.uuid AS subscriber_uuid,subscribers.email AS email,+ subscribers.name AS subscriber_name,subscribers.status as subscriber_status,(CASE WHEN bounces.campaign_id IS NOT NULLdiff --git a/static/admin/partials/subscriber-bounces.html b/static/admin/partials/subscriber-bounces.htmlindex 7c251c73..f9353276 100644--- a/static/admin/partials/subscriber-bounces.html+++ b/static/admin/partials/subscriber-bounces.html@@ -12,7 +12,7 @@{{- range $d.Bounces }}<tr><td>- {{- with .ParsedCampaign }}+ {{- with .Campaigns }}<a href="{{ URI "/admin/campaigns" }}/{{ .ID }}">{{ .Name }}</a>{{- end }}</td>diff --git a/static/admin/views/bounces.html b/static/admin/views/bounces.htmlindex 9c219860..d2bf1925 100644--- a/static/admin/views/bounces.html+++ b/static/admin/views/bounces.html@@ -61,11 +61,22 @@<tr data-testid="bounce-row" data-id="{{ .ID }}"><td><input name="id" type="checkbox" value="{{ .ID }}" data-subscriber-id="{{ .SubscriberID }}"></td><td>- <a href="{{ URI "/admin/subscribers" }}/{{ .SubscriberID }}" class="unstyled{{ if eq .SubscriberStatus "blocklisted" }} blocklisted{{ end }}">{{ .Email }}</a>- {{ if ne .SubscriberStatus "enabled" }}{{ Badge (list (Dot) ($.L.T (printf "subscribers.status.%s" .SubscriberStatus))) (printf "status-%s" .SubscriberStatus) }}{{ end }}+ <div class="avatar{{ if eq .SubscriberStatus "blocklisted" }} disabled{{ end }}">+ {{ template "avatar-icon" dict "Kind" "subscriber" "Name" (or .SubscriberName .Email) }}+ <div class="avatar-label">+ <a href="{{ URI "/admin/subscribers" }}/{{ .SubscriberID }}" class="unstyled{{ if eq .SubscriberStatus "blocklisted" }} blocklisted{{ end }}">{{ .Email }}</a>+ {{ if ne .SubscriberStatus "enabled" }}{{ Badge (list (Dot) ($.L.T (printf "subscribers.status.%s" .SubscriberStatus))) (printf "status-%s" .SubscriberStatus) }}{{ end }}+ <div class="text-8 text-light">{{ .SubscriberName }}</div>+ </div>+ </div></td><td data-label="{{ $.L.T "globals.terms.campaign" }}">- {{- with .ParsedCampaign }}<a href="{{ $base }}?campaign_id={{ .ID }}" class="unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ .Name }}</a>{{ else }}-{{ end }}+ {{- with .Campaigns }}+ <div class="avatar">+ {{ template "avatar-icon" dict "Kind" "campaign" "Name" .Name }}+ <a href="{{ $base }}?campaign_id={{ .ID }}" class="avatar-label unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ .Name }}">{{ .Name }}</a>+ </div>+ {{- else }}-{{ end }}</td><td data-label="{{ $.L.T "bounces.source" }}"><a href="{{ $base }}?source={{ .Source }}" class="unstyled text-light" title="{{ $.L.T "globals.buttons.filter" }} {{ .Source }}">{{ .Source }}</a></td><td data-label="{{ $.L.T "globals.fields.type" }}"><a href="{{ $base }}?type={{ .Type }}" class="unstyled" title="{{ $.L.T "globals.buttons.filter" }} {{ $.L.T (printf "bounces.%s" .Type) }}">{{ Badge ($.L.T (printf "bounces.%s" .Type)) (printf "enum bounce-%s" .Type) }}</a></td>