The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
fix getIntervalData
Steven Teyfe1292428fe8
diff --git a/apps/web/lib/analytics/utils/get-interval-data.ts b/apps/web/lib/analytics/utils/get-interval-data.tsindex fe099cc5d2..dd0aa8be29 100644--- a/apps/web/lib/analytics/utils/get-interval-data.ts+++ b/apps/web/lib/analytics/utils/get-interval-data.ts@@ -1,6 +1,7 @@-import { TZDate } from "@date-fns/tz";+import { tz, TZDate } from "@date-fns/tz";import { DUB_FOUNDING_DATE } from "@dub/utils";import {+ endOfToday,startOfMonth,startOfQuarter,startOfYear,@@ -13,45 +14,55 @@ const INTERVAL_DATA: Record<string,({ timezone }: { timezone?: string }) => {startDate: TZDate;+ endDate: TZDate;granularity: "minute" | "hour" | "day" | "month";}> = {"24h": ({ timezone }) => ({startDate: subHours(new TZDate(Date.now(), timezone), 24),+ endDate: new TZDate(Date.now(), timezone),granularity: "hour",}),"7d": ({ timezone }) => ({startDate: subDays(new TZDate(Date.now(), timezone), 7),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "day",}),"30d": ({ timezone }) => ({startDate: subDays(new TZDate(Date.now(), timezone), 30),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "day",}),"90d": ({ timezone }) => ({startDate: subDays(new TZDate(Date.now(), timezone), 90),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "day",}),"1y": ({ timezone }) => ({startDate: subMonths(new TZDate(Date.now(), timezone), 12),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "month",}),mtd: ({ timezone }) => {return {startDate: startOfMonth(new TZDate(Date.now(), timezone)),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "day",};},qtd: ({ timezone }) => ({startDate: startOfQuarter(new TZDate(Date.now(), timezone)),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "day",}),ytd: ({ timezone }) => ({startDate: startOfYear(new TZDate(Date.now(), timezone)),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "month",}),all: ({ timezone }) => ({startDate: new TZDate(DUB_FOUNDING_DATE, timezone),+ endDate: endOfToday({ in: tz(timezone ?? "UTC") }),granularity: "month",}),};diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.tsindex a6f66a190b..45fc6ba12a 100644--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts@@ -20,17 +20,14 @@ export const getStartEndDates = ({let granularity: "minute" | "hour" | "day" | "month" = "day";if (start || (interval === "all" && dataAvailableFrom)) {- startDate = new TZDate(- startOfDay(start ?? dataAvailableFrom ?? Date.now()),- timezone,+ startDate = startOfDay(+ new TZDate(new Date(start ?? dataAvailableFrom ?? Date.now()), timezone),);- endDate = new TZDate(endOfDay(end ?? Date.now()), timezone);+ endDate = endOfDay(new TZDate(new Date(end ?? Date.now()), timezone));- const daysDifference = differenceInDays(- endDate,- startDate,- timezone ? { in: tz(timezone) } : undefined,- );+ const daysDifference = differenceInDays(endDate, startDate, {+ in: tz(timezone ?? "UTC"),+ });if (daysDifference <= 2) {granularity = "hour";@@ -46,8 +43,8 @@ export const getStartEndDates = ({interval = interval ?? "30d";const intervalData = getIntervalData(interval, { timezone });startDate = intervalData.startDate;+ endDate = intervalData.endDate;granularity = intervalData.granularity;- endDate = new TZDate(endOfDay(Date.now()), timezone);}return { startDate, endDate, granularity };diff --git a/apps/web/ui/modals/export-links-modal.tsx b/apps/web/ui/modals/export-links-modal.tsxindex c3c0923ac4..9998a30827 100644--- a/apps/web/ui/modals/export-links-modal.tsx+++ b/apps/web/ui/modals/export-links-modal.tsx@@ -171,7 +171,7 @@ function ExportLinksModal({label: display,dateRange: {from: getIntervalData(value).startDate,- to: new Date(),+ to: getIntervalData(value).endDate,},}))}/>diff --git a/apps/web/ui/shared/simple-date-range-picker.tsx b/apps/web/ui/shared/simple-date-range-picker.tsxindex 65843d2d76..c56e934865 100644--- a/apps/web/ui/shared/simple-date-range-picker.tsx+++ b/apps/web/ui/shared/simple-date-range-picker.tsx@@ -73,15 +73,16 @@ export default function SimpleDateRangePicker({): INTERVAL_DISPLAYS).map(({ display, value, shortcut }) => {- const start = getIntervalData(value).startDate;- const end = new Date();+ const { startDate, endDate } = getIntervalData(value, {+ timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,+ });return {id: value,label: display,dateRange: {- from: start,- to: end,+ from: startDate,+ to: endDate,},shortcut,};