Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Fix date picker shifting day bug (#2848)
Vini Brasil0cfbcedd8493
diff --git a/assets/js/dashboard/comparison-input.js b/assets/js/dashboard/comparison-input.jsindex 3fd36d627c..5f3763e485 100644--- a/assets/js/dashboard/comparison-input.js+++ b/assets/js/dashboard/comparison-input.js@@ -6,7 +6,7 @@ import { ChevronDownIcon } from '@heroicons/react/20/solid'import classNames from 'classnames'import * as storage from './util/storage'import Flatpickr from 'react-flatpickr'-import { formatISO, parseUTCDate, formatDateRange } from './util/date.js'+import { parseNaiveDate, formatISO, formatDateRange } from './util/date.js'const COMPARISON_MODES = {'off': 'Disable comparison',@@ -140,12 +140,16 @@ const ComparisonInput = function({ site, query, history }) {mode: 'range',showMonths: 1,maxDate: 'today',- minDate: parseUTCDate(site.statsBegin),+ minDate: site.statsBegin,animate: true,static: true,onClose: ([from, to], _dateStr, _instance) => {setUiMode("menu")- if (from && to) updateMode("custom", formatISO(parseUTCDate(from)), formatISO(parseUTCDate(to)))++ if (from && to) {+ [from, to] = [parseNaiveDate(from), parseNaiveDate(to)]+ updateMode("custom", formatISO(from), formatISO(to))+ }}}diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.jsindex 941e47f376..b4ea787f59 100644--- a/assets/js/dashboard/datepicker.js+++ b/assets/js/dashboard/datepicker.js@@ -17,6 +17,7 @@ import {isThisMonth,isThisYear,parseUTCDate,+ parseNaiveDate,isBefore,isAfter,formatDateRange@@ -254,34 +255,18 @@ function DatePicker({query, site, history}) {return () => { document.removeEventListener("mousedown", handleClick, false); }}, [])- function setCustomDate(dates) {- if (dates.length === 2) {- const [from, to] = dates.map(parseUTCDate)- if (formatISO(from) === formatISO(to)) {- navigateToQuery(- history,- query,- {- period: 'day',- date: formatISO(from),- from: false,- to: false- }- )+ function setCustomDate([from, to], _dateStr, _instance) {+ if (from && to) {+ [from, to] = [parseNaiveDate(from), parseNaiveDate(to)]++ if (from.isSame(to)) {+ navigateToQuery( history, query, { period: 'day', date: formatISO(from), from: false, to: false })} else {- navigateToQuery(- history,- query,- {- period: 'custom',- date: false,- from: formatISO(from),- to: formatISO(to),- }- )+ navigateToQuery( history, query, { period: 'custom', date: false, from: formatISO(from), to: formatISO(to) })}- setOpen(false)}++ setOpen(false)}function toggle() {@@ -400,13 +385,13 @@ function DatePicker({query, site, history}) {options={{mode: 'range',maxDate: 'today',- minDate: parseUTCDate(site.statsBegin),+ minDate: site.statsBegin,showMonths: 1,static: true,animate: true}}ref={calendar}className="invisible"- onChange={setCustomDate}+ onClose={setCustomDate}/></div>)diff --git a/assets/js/dashboard/util/date.js b/assets/js/dashboard/util/date.jsindex 3777688be2..702e472e18 100644--- a/assets/js/dashboard/util/date.js+++ b/assets/js/dashboard/util/date.js@@ -63,6 +63,10 @@ export function parseUTCDate(dateString) {return dayjs.utc(dateString)}+export function parseNaiveDate(dateString) {+ return dayjs(dateString)+}+export function nowForSite(site) {return dayjs.utc().utcOffset(site.offset / 60)}