📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
fix: custom date not loading
Blue Mouseb3c19c2c0067
diff --git a/web/app/routes/api.analytics.ts b/web/app/routes/api.analytics.tsindex c07d0d75e..6e61fdbca 100644--- a/web/app/routes/api.analytics.ts+++ b/web/app/routes/api.analytics.ts@@ -68,6 +68,26 @@ import {} from '~/api/api.server'import { getProjectPasswordCookie } from '~/utils/session.server'+function formatDateForBackend(dateStr: string | undefined): string | undefined {+ if (!dateStr) return undefined++ // If already in YYYY-MM-DD format, return as-is+ if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {+ return dateStr+ }++ // Convert ISO 8601 or other formats to YYYY-MM-DD+ const date = new Date(dateStr)+ if (Number.isNaN(date.getTime())) {+ return dateStr+ }++ const yyyy = date.getUTCFullYear()+ const mm = String(date.getUTCMonth() + 1).padStart(2, '0')+ const dd = String(date.getUTCDate()).padStart(2, '0')+ return `${yyyy}-${mm}-${dd}`+}+interface ProxyRequest {action:| 'getSessions'@@ -148,8 +168,8 @@ export async function action({ request }: ActionFunctionArgs) {} = {timeBucket: params.timeBucket || 'day',period: params.period || '7d',- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone || 'UTC',filters: params.filters || [],password: password || undefined,@@ -199,8 +219,8 @@ export async function action({ request }: ActionFunctionArgs) {request,body.flagId,params.period || '7d',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timezone,)return data<ProxyResponse<FeatureFlagStats>>({@@ -224,8 +244,8 @@ export async function action({ request }: ActionFunctionArgs) {request,body.flagId,params.period || '7d',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timezone,params.take || 15,params.skip || 0,@@ -252,8 +272,8 @@ export async function action({ request }: ActionFunctionArgs) {request,body.goalId,params.period || '7d',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timezone,)return data<ProxyResponse<GoalStats>>({@@ -277,8 +297,8 @@ export async function action({ request }: ActionFunctionArgs) {request,body.goalId,params.period || '7d',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timeBucket || 'day',params.timezone,)@@ -299,8 +319,8 @@ export async function action({ request }: ActionFunctionArgs) {params.timeBucket || 'hour',params.period || '3d',params.filters || [],- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',password || undefined,)return data<ProxyResponse<CaptchaDataResponse>>({@@ -325,8 +345,8 @@ export async function action({ request }: ActionFunctionArgs) {body.experimentId,params.period || '7d',params.timeBucket || 'day',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timezone,)return data<ProxyResponse<ExperimentResults>>({@@ -417,8 +437,8 @@ export async function action({ request }: ActionFunctionArgs) {projectId,params.period || '3d',params.filters || [],- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.take || 30,params.skip || 0,params.timezone || '',@@ -447,8 +467,8 @@ export async function action({ request }: ActionFunctionArgs) {projectId,body.profileId,params.period || '7d',- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.timezone || '',password || undefined,)@@ -475,8 +495,8 @@ export async function action({ request }: ActionFunctionArgs) {body.profileId,params.period || '3d',params.filters || [],- params.from || '',- params.to || '',+ formatDateForBackend(params.from) || '',+ formatDateForBackend(params.to) || '',params.take || 30,params.skip || 0,params.timezone || '',@@ -592,8 +612,8 @@ export async function action({ request }: ActionFunctionArgs) {{timeBucket: params.timeBucket,period: params.period,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone,password: password || undefined,},@@ -622,8 +642,8 @@ export async function action({ request }: ActionFunctionArgs) {{timeBucket: params.timeBucket,period: params.period,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),filters: params.filters,timezone: params.timezone,password: password || undefined,@@ -653,8 +673,8 @@ export async function action({ request }: ActionFunctionArgs) {{timeBucket: params.timeBucket,period: params.period,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),take: params.take,skip: params.skip,password: password || undefined,@@ -711,8 +731,8 @@ export async function action({ request }: ActionFunctionArgs) {timeBucket: params.timeBucket,period: params.period,filters: params.filters,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone,customEvents: body.customEvents,password: password || undefined,@@ -733,8 +753,8 @@ export async function action({ request }: ActionFunctionArgs) {timeBucket: params.timeBucket,period: params.period,filters: params.filters,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone,password: password || undefined,})@@ -751,8 +771,8 @@ export async function action({ request }: ActionFunctionArgs) {case 'getGSCKeywords': {const result = await getGSCKeywordsServer(request, projectId, {period: params.period,- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone,password: password || undefined,})@@ -781,8 +801,8 @@ export async function action({ request }: ActionFunctionArgs) {case 'getRevenueData': {const result = await getRevenueDataServer(request, projectId, {period: params.period || '7d',- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone,timeBucket: params.timeBucket,})@@ -806,8 +826,8 @@ export async function action({ request }: ActionFunctionArgs) {const result = await getOverallStatsServer(request, pids, {timeBucket: params.timeBucket || 'day',period: params.period || '7d',- from: params.from,- to: params.to,+ from: formatDateForBackend(params.from),+ to: formatDateForBackend(params.to),timezone: params.timezone || 'UTC',filters: params.filters || [],includeChart: true,diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsxindex 8e67b214d..66b800e47 100644--- a/web/app/routes/projects.$id.tsx+++ b/web/app/routes/projects.$id.tsx@@ -62,6 +62,26 @@ import {hasAuthTokens,} from '~/utils/session.server'+function formatDateForBackend(dateStr: string): string {+ if (!dateStr) return ''++ // If already in YYYY-MM-DD format, return as-is+ if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {+ return dateStr+ }++ // Convert ISO 8601 or other formats to YYYY-MM-DD+ const date = new Date(dateStr)+ if (Number.isNaN(date.getTime())) {+ return dateStr+ }++ const yyyy = date.getUTCFullYear()+ const mm = String(date.getUTCMonth() + 1).padStart(2, '0')+ const dd = String(date.getUTCDate()).padStart(2, '0')+ return `${yyyy}-${mm}-${dd}`+}+export const links: LinksFunction = () => [{ rel: 'stylesheet', href: ProjectViewStyle },]@@ -253,8 +273,8 @@ export async function loader({ request, params }: LoaderFunctionArgs) {PROJECT_TABS.trafficconst period = (url.searchParams.get('period') || '7d') as Periodconst urlTimeBucket = url.searchParams.get('timeBucket')- const from = url.searchParams.get('from') || ''- const to = url.searchParams.get('to') || ''+ const from = formatDateForBackend(url.searchParams.get('from') || '')+ const to = formatDateForBackend(url.searchParams.get('to') || '')const timezone = url.searchParams.get('timezone') || DEFAULT_TIMEZONEconst filters = parseFiltersFromUrl(url.searchParams)@@ -267,8 +287,12 @@ export async function loader({ request, params }: LoaderFunctionArgs) {// Traffic compare paramsconst compareEnabled = url.searchParams.get('compare') === 'true'- const compareFrom = url.searchParams.get('compareFrom') || ''- const compareTo = url.searchParams.get('compareTo') || ''+ const compareFrom = formatDateForBackend(+ url.searchParams.get('compareFrom') || '',+ )+ const compareTo = formatDateForBackend(+ url.searchParams.get('compareTo') || '',+ )// Traffic custom events paramsconst customEventsParam = url.searchParams.get('customEvents') || ''