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
Fix mismatch in server+client time in analytics `from/to` view. Closes #3307.
Kailash Nadh86ef53b46b06
diff --git a/cmd/campaign_analytics.go b/cmd/campaign_analytics.goindex b7fd4313..135829e1 100644--- a/cmd/campaign_analytics.go+++ b/cmd/campaign_analytics.go@@ -94,8 +94,8 @@ func (a *App) viewAnalytics(c *echo.Context, resource string) error {adminView: newAdminView(c, a.i18n.T("globals.terms.analytics"), "", resource+".analytics"),Items: items,Resource: resource,- FromInput: from.Format("2006-01-02T15:04"),- ToInput: to.Format("2006-01-02T15:04"),+ FromInput: from.Format(time.RFC3339),+ ToInput: to.Format(time.RFC3339),Interval: c.QueryParam("interval"),DisableTracking: a.cfg.Privacy.DisableTracking,IndividualTracking: a.cfg.Privacy.IndividualTracking,@@ -111,8 +111,8 @@ func (a *App) viewAnalytics(c *echo.Context, resource string) error {// Pull analytics for the selected campaigns or lists.if len(items) > 0 {var (- fromStr = from.Format("2006-01-02 15:04:05")- toStr = to.Format("2006-01-02 15:04:05")+ fromStr = from.Format(time.RFC3339)+ toStr = to.Format(time.RFC3339)ids = make([]int, len(items)))for i, item := range items {diff --git a/cmd/utils.go b/cmd/utils.goindex f229778e..407a07c4 100644--- a/cmd/utils.go+++ b/cmd/utils.go@@ -209,7 +209,7 @@ func parseDateTime(s string) (time.Time, bool) {case 19:layout = "2006-01-02T15:04:05"default:- return time.Time{}, false+ layout = time.RFC3339}t, err := time.ParseInLocation(layout, s, time.Local)diff --git a/static/admin/assets/js/views/analytics.js b/static/admin/assets/js/views/analytics.jsindex 2e4e2a41..22b6376d 100644--- a/static/admin/assets/js/views/analytics.js+++ b/static/admin/assets/js/views/analytics.js@@ -137,14 +137,21 @@ function analyticsForm(from, to) {from,to,+ // Keep absolute timestamps so unchanged inputs preserve seconds and DST offsets.+ get fromLocal() { return this.from ? toLabel(this.from).replace(' ', 'T') : ''; },+ set fromLocal(value) { this.from = value ? new Date(value).toISOString() : ''; },+ get toLocal() { return this.to ? toLabel(this.to).replace(' ', 'T') : ''; },+ set toLocal(value) { this.to = value ? new Date(value).toISOString() : ''; },+get rangeLabel() {return [this.from, this.to]- .map((value) => value ? value.slice(0, 16).replace('T', ' ') : '…')+ .map((value) => value ? toLabel(value) : '…').join(' – ');},onDateRange(amount, unit) {const to = new Date();+ to.setUTCSeconds(0, 0);const from = new Date(to);if (unit === 'month') {// Clamp to the last day when the target month is short.@@ -159,9 +166,8 @@ function analyticsForm(from, to) {from.setTime(from.getTime() - amount * 60 * 60 * 1000);}- const localDate = (date) => new Date(date.getTime() - date.getTimezoneOffset() * 60000).toISOString().slice(0, 16);- this.from = localDate(from);- this.to = localDate(to);+ this.from = from.toISOString();+ this.to = to.toISOString();this.$refs.dates.hidePopover();this.$nextTick(() => this.$root.requestSubmit());},diff --git a/static/admin/partials/analytics-date-range.html b/static/admin/partials/analytics-date-range.htmlindex 2edbbcdb..d47e6f80 100644--- a/static/admin/partials/analytics-date-range.html+++ b/static/admin/partials/analytics-date-range.html@@ -1,5 +1,7 @@{{ define "analytics-date-range" -}}<label>{{ .L.T "globals.terms.range" }}</label>+<input type="hidden" name="from" :value="from" />+<input type="hidden" name="to" :value="to" /><ot-dropdown><button type="button" class="outline" popovertarget="analytics-dates"><span x-text="rangeLabel"></span> {{ Icon "chevron-down" }}</button><div popover id="analytics-dates" class="analytics-dates" x-ref="dates">@@ -11,10 +13,10 @@<hr /><div class="custom-dates"><label data-field>{{ .L.T "globals.fields.fromDate" }}- <input type="datetime-local" name="from" x-model="from" required />+ <input type="datetime-local" x-model="fromLocal" required /></label><label data-field>{{ .L.T "globals.fields.toDate" }}- <input type="datetime-local" name="to" x-model="to" :min="from" required />+ <input type="datetime-local" x-model="toLocal" :min="fromLocal" required /></label><button type="submit" data-variant="secondary" :disabled="submitting">{{ .L.T "globals.buttons.apply" }}</button></div>