Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Refactored useDateRange to always use query string. Fixed all time filter.

Mike Cao92ee44756c0b
diff --git a/src/app/(main)/links/[linkId]/LinkControls.tsx b/src/app/(main)/links/[linkId]/LinkControls.tsx
index 3e59043ca..01c8e2e95 100644
--- a/src/app/(main)/links/[linkId]/LinkControls.tsx
+++ b/src/app/(main)/links/[linkId]/LinkControls.tsx
@@ -1,5 +1,5 @@
import { Column, Row } from '@umami/react-zen';
-import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
import { FilterBar } from '@/components/input/FilterBar';
import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect';
diff --git a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx
index 5e9d6cbfd..43c14050f 100644
--- a/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx
+++ b/src/app/(main)/links/[linkId]/LinkMetricsBar.tsx
@@ -12,10 +12,9 @@ export function LinkMetricsBar({
showChange?: boolean;
compareMode?: boolean;
}) {
- const { dateRange } = useDateRange(linkId);
+ const { isAllTime } = useDateRange();
const { formatMessage, labels } = useMessages();
const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(linkId);
- const isAllTime = dateRange.value === 'all';
const { pageviews, visitors, visits, comparison } = data || {};
diff --git a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx b/src/app/(main)/pixels/[pixelId]/PixelControls.tsx
index c5fee534f..165b23b93 100644
--- a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx
+++ b/src/app/(main)/pixels/[pixelId]/PixelControls.tsx
@@ -1,5 +1,5 @@
import { Column, Row } from '@umami/react-zen';
-import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
import { FilterBar } from '@/components/input/FilterBar';
import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect';
diff --git a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx
index 5b01ef842..0305df7f3 100644
--- a/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx
+++ b/src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx
@@ -12,10 +12,9 @@ export function PixelMetricsBar({
showChange?: boolean;
compareMode?: boolean;
}) {
- const { dateRange } = useDateRange(pixelId);
+ const { isAllTime } = useDateRange();
const { formatMessage, labels } = useMessages();
const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(pixelId);
- const isAllTime = dateRange.value === 'all';
const { pageviews, visitors, visits, comparison } = data || {};
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx
index 5b375bded..497913b78 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage.tsx
@@ -12,7 +12,7 @@ export function AttributionPage({ websiteId }: { websiteId: string }) {
const { formatMessage, labels } = useMessages();
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
return (
<Column gap="6">
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx
index d54797412..33355d705 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage.tsx
@@ -12,7 +12,7 @@ import { SectionHeader } from '@/components/common/SectionHeader';
export function BreakdownPage({ websiteId }: { websiteId: string }) {
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
const [fields, setFields] = useState(['path']);
return (
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx
index 1918aadf5..c155662ff 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage.tsx
@@ -12,7 +12,7 @@ export function FunnelsPage({ websiteId }: { websiteId: string }) {
const { data, isLoading, error } = useReportsQuery({ websiteId, type: 'funnel' });
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
return (
<Column gap>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx
index 30f92325f..6cd417288 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage.tsx
@@ -12,7 +12,7 @@ export function GoalsPage({ websiteId }: { websiteId: string }) {
const { data, isLoading, error } = useReportsQuery({ websiteId, type: 'goal' });
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
return (
<Column gap>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx
index d75828222..269279625 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage.tsx
@@ -13,7 +13,7 @@ export function JourneysPage({ websiteId }: { websiteId: string }) {
const { formatMessage, labels } = useMessages();
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
const [steps, setSteps] = useState(DEFAULT_STEP);
const [startStep, setStartStep] = useState('');
const [endStep, setEndStep] = useState('');
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
index 0d74c38e9..ed5120620 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
@@ -7,7 +7,7 @@ import { useDateRange } from '@/components/hooks';
export function RevenuePage({ websiteId }: { websiteId: string }) {
const {
dateRange: { startDate, endDate, unit },
- } = useDateRange(websiteId);
+ } = useDateRange();
return (
<Column gap>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx
index a5999a7c9..30b9bff22 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage.tsx
@@ -7,7 +7,7 @@ import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteContro
export function UTMPage({ websiteId }: { websiteId: string }) {
const {
dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
+ } = useDateRange();
return (
<Column gap>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
index 08e0c1c83..2406cde24 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
@@ -11,7 +11,7 @@ export function WebsiteChart({
websiteId: string;
compareMode?: boolean;
}) {
- const { dateRange, dateCompare } = useDateRange(websiteId);
+ const { dateRange, dateCompare } = useDateRange();
const { startDate, endDate, unit, value } = dateRange;
const { data, isLoading, isFetching, error } = useWebsitePageviewsQuery({
websiteId,
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx
index 97be18214..38f86e3aa 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx
@@ -1,5 +1,5 @@
import { Column, Row } from '@umami/react-zen';
-import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
import { FilterBar } from '@/components/input/FilterBar';
import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect';
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
index d217b94f6..7522c8ec0 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx
@@ -12,10 +12,9 @@ export function WebsiteMetricsBar({
showChange?: boolean;
compareMode?: boolean;
}) {
- const { dateRange } = useDateRange(websiteId);
+ const { isAllTime } = useDateRange();
const { formatMessage, labels, getErrorMessage } = useMessages();
const { data, isLoading, isFetching, error } = useWebsiteStatsQuery(websiteId);
- const isAllTime = dateRange.value === 'all';
const { pageviews, visitors, visits, bounces, totaltime, comparison } = data || {};
diff --git a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx
index 8ed32841e..2c67b76a9 100644
--- a/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx
@@ -9,7 +9,7 @@ import { useState } from 'react';
export function CompareTables({ websiteId }: { websiteId: string }) {
const [data, setData] = useState([]);
- const { dateRange, dateCompare } = useDateRange(websiteId);
+ const { dateRange, dateCompare } = useDateRange();
const { formatMessage, labels } = useMessages();
const {
router,
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 2731e2680..da0b9074e 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -77,7 +77,6 @@ export * from './useModified';
export * from './useNavigation';
export * from './usePagedQuery';
export * from './usePageParameters';
-export * from './useQueryStringDate';
export * from './useRegionNames';
export * from './useSlug';
export * from './useSticky';
diff --git a/src/components/hooks/queries/useDateRangeQuery.ts b/src/components/hooks/queries/useDateRangeQuery.ts
index 4af2011cb..32b5cd466 100644
--- a/src/components/hooks/queries/useDateRangeQuery.ts
+++ b/src/components/hooks/queries/useDateRangeQuery.ts
@@ -1,12 +1,23 @@
import { useApi } from '../useApi';
import { ReactQueryOptions } from '@/lib/types';
+type DateRange = {
+ startDate?: string;
+ endDate?: string;
+};
+
export function useDateRangeQuery(websiteId: string, options?: ReactQueryOptions) {
const { get, useQuery } = useApi();
- return useQuery<any>({
+
+ const { data } = useQuery<DateRange>({
queryKey: ['date-range', websiteId],
queryFn: () => get(`/websites/${websiteId}/daterange`),
enabled: !!websiteId,
...options,
});
+
+ return {
+ startDate: data?.startDate ? new Date(data.startDate) : null,
+ endDate: data?.endDate ? new Date(data.endDate) : null,
+ };
}
diff --git a/src/components/hooks/useDateParameters.ts b/src/components/hooks/useDateParameters.ts
index ed4a3e40f..359bbc1fd 100644
--- a/src/components/hooks/useDateParameters.ts
+++ b/src/components/hooks/useDateParameters.ts
@@ -1,10 +1,10 @@
import { useDateRange } from './useDateRange';
import { useTimezone } from './useTimezone';
-export function useDateParameters(websiteId: string) {
+export function useDateParameters() {
const {
dateRange: { startDate, endDate, unit },
- } = useDateRange(websiteId);
+ } = useDateRange();
const { timezone, toUtc } = useTimezone();
return {
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index dc81cfd7c..0b8db7ce1 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -1,35 +1,32 @@
-import { getMinimumUnit, parseDateRange } from '@/lib/date';
+import { useNavigation } from '@/components/hooks/useNavigation';
+import { useMemo } from 'react';
+import { getCompareDate, getOffsetDateRange, parseDateRange } from '@/lib/date';
import { useLocale } from '@/components/hooks/useLocale';
-import { useApi } from '@/components/hooks//useApi';
-import { useQueryStringDate } from '@/components/hooks/useQueryStringDate';
-import { useGlobalState } from '@/components/hooks/useGlobalState';
+import { DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';
-export function useDateRange(websiteId: string) {
- const { get } = useApi();
+export function useDateRange(options: { ignoreOffset?: boolean } = {}) {
+ const {
+ query: { date = DEFAULT_DATE_RANGE_VALUE, offset = 0, compare = 'prev', all },
+ } = useNavigation();
const { locale } = useLocale();
- const { dateRange: defaultDateRange, dateCompare } = useQueryStringDate();
- const [dateRange, setDateRange] = useGlobalState(`date-range:${websiteId}`, defaultDateRange);
+ const dateRange = useMemo(() => {
+ const dateRangeObject = parseDateRange(date, locale);
- const setDateRangeValue = async (value: string) => {
- if (value === 'all') {
- const result = await get(`/websites/${websiteId}/daterange`);
- const { mindate, maxdate } = result;
+ return !options.ignoreOffset && offset
+ ? getOffsetDateRange(dateRangeObject, +offset)
+ : dateRangeObject;
+ }, [date, offset, options]);
- const startDate = new Date(mindate);
- const endDate = new Date(maxdate);
- const unit = getMinimumUnit(startDate, endDate);
+ const dateCompare = getCompareDate(compare, dateRange.startDate, dateRange.endDate);
- setDateRange({
- startDate,
- endDate,
- unit,
- value,
- });
- } else {
- setDateRange(parseDateRange(value, locale));
- }
+ return {
+ date,
+ offset,
+ compare,
+ isAllTime: !!all,
+ isCustomRange: date.startsWith('range:'),
+ dateRange,
+ dateCompare,
};
-
- return { dateRange, dateCompare, setDateRange, setDateRangeValue };
}
diff --git a/src/components/hooks/useQueryStringDate.ts b/src/components/hooks/useQueryStringDate.ts
deleted file mode 100644
index 3b6431a18..000000000
--- a/src/components/hooks/useQueryStringDate.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useNavigation } from '@/components/hooks/useNavigation';
-import { useMemo } from 'react';
-import { getCompareDate, getOffsetDateRange, parseDateRange } from '@/lib/date';
-import { useLocale } from '@/components/hooks/useLocale';
-import { DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';
-
-export function useQueryStringDate(options: { ignoreOffset?: boolean } = {}) {
- const {
- query: { date = DEFAULT_DATE_RANGE_VALUE, offset = 0, compare = 'prev' },
- } = useNavigation();
- const { locale } = useLocale();
-
- const dateRange = useMemo(() => {
- const dateRangeObject = parseDateRange(date, locale);
-
- return !options.ignoreOffset && offset
- ? getOffsetDateRange(dateRangeObject, +offset)
- : dateRangeObject;
- }, [date, offset, options]);
-
- const dateCompare = getCompareDate(compare, dateRange.startDate, dateRange.endDate);
-
- return { date, offset, dateRange, dateCompare };
-}
diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsx
index 77096dc09..94c8714c5 100644
--- a/src/components/input/RefreshButton.tsx
+++ b/src/components/input/RefreshButton.tsx
@@ -12,7 +12,7 @@ export function RefreshButton({
isLoading?: boolean;
}) {
const { formatMessage, labels } = useMessages();
- const { dateRange } = useDateRange(websiteId);
+ const { dateRange } = useDateRange();
function handleClick() {
if (!isLoading && dateRange) {
diff --git a/src/components/input/SegmentFilters.tsx b/src/components/input/SegmentFilters.tsx
index 6324d7c4c..d0906d676 100644
--- a/src/components/input/SegmentFilters.tsx
+++ b/src/components/input/SegmentFilters.tsx
@@ -1,7 +1,8 @@
-import { List, ListItem } from '@umami/react-zen';
+import { IconLabel, List, ListItem } from '@umami/react-zen';
import { useWebsiteSegmentsQuery } from '@/components/hooks';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { Empty } from '@/components/common/Empty';
+import { ChartPie, UserPlus } from '@/components/icons';
export interface SegmentFiltersProps {
websiteId: string;
@@ -29,7 +30,9 @@ export function SegmentFilters({
{data?.data?.map(item => {
return (
<ListItem key={item.id} id={item.id}>
- {item.name}
+ <IconLabel icon={type === 'segment' ? <ChartPie /> : <UserPlus />}>
+ {item.name}
+ </IconLabel>
</ListItem>
);
})}
diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx
index 469da4190..6b0510593 100644
--- a/src/components/input/WebsiteDateFilter.tsx
+++ b/src/components/input/WebsiteDateFilter.tsx
@@ -1,10 +1,10 @@
+import { useCallback, useMemo } from 'react';
import { Button, Icon, Row, Text, Select, ListItem } from '@umami/react-zen';
import { isAfter } from 'date-fns';
import { ChevronRight } from '@/components/icons';
-import { useDateRange, useMessages, useNavigation } from '@/components/hooks';
+import { useDateRange, useDateRangeQuery, useMessages, useNavigation } from '@/components/hooks';
+import { getDateRangeValue } from '@/lib/date';
import { DateFilter } from './DateFilter';
-import { getOffsetDateRange } from '@/lib/date';
-import { useCallback } from 'react';
export interface WebsiteDateFilterProps {
websiteId: string;
@@ -20,30 +20,33 @@ export function WebsiteDateFilter({
showButtons = true,
allowCompare,
}: WebsiteDateFilterProps) {
- const { dateRange, setDateRange, setDateRangeValue } = useDateRange(websiteId);
- const { value, endDate } = dateRange;
+ const { dateRange, isAllTime, isCustomRange } = useDateRange();
const { formatMessage, labels } = useMessages();
const {
router,
updateParams,
query: { compare = 'prev', offset = 0 },
} = useNavigation();
- const isAllTime = value === 'all';
+ const disableForward = isAllTime || isAfter(dateRange.endDate, new Date());
- const isCustomRange = value.startsWith('range');
-
- const disableForward = value === 'all' || isAfter(endDate, new Date());
+ const websiteDateRange = useDateRangeQuery(websiteId);
const handleChange = (date: string) => {
- setDateRangeValue(date);
- router.push(updateParams({ date, offset: undefined }));
+ if (date === 'all') {
+ router.push(
+ updateParams({
+ date: getDateRangeValue(websiteDateRange.startDate, websiteDateRange.endDate),
+ offset: undefined,
+ all: 1,
+ }),
+ );
+ } else {
+ router.push(updateParams({ date, offset: undefined }));
+ }
};
const handleIncrement = useCallback(
(increment: number) => {
- const offsetDate = getOffsetDateRange(dateRange, +offset + increment);
-
- setDateRange(offsetDate);
router.push(updateParams({ offset: +offset + increment }));
},
[offset],
@@ -53,6 +56,12 @@ export function WebsiteDateFilter({
router.push(updateParams({ compare }));
};
+ const dateValue = useMemo(() => {
+ return offset !== 0
+ ? getDateRangeValue(dateRange.startDate, dateRange.endDate)
+ : dateRange.value;
+ }, [dateRange]);
+
return (
<Row gap>
{showButtons && !isAllTime && !isCustomRange && (
@@ -71,7 +80,7 @@ export function WebsiteDateFilter({
)}
<Row minWidth="200px">
<DateFilter
- value={value}
+ value={dateValue}
onChange={handleChange}
showAllTime={showAllTime}
renderDate={+offset !== 0}
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/components/input/WebsiteFilterButton.tsx
similarity index 100%
rename from src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx
rename to src/components/input/WebsiteFilterButton.tsx
diff --git a/src/components/input/WebsiteMonthSelect.tsx b/src/components/input/WebsiteMonthSelect.tsx
index b36aae939..8c4b2f5b6 100644
--- a/src/components/input/WebsiteMonthSelect.tsx
+++ b/src/components/input/WebsiteMonthSelect.tsx
@@ -1,16 +1,17 @@
-import { useDateRange } from '@/components/hooks';
-import { dateToRangeValue } from '@/lib/date';
+import { useDateRange, useNavigation } from '@/components/hooks';
+import { getMonthDateRangeValue } from '@/lib/date';
import { MonthSelect } from './MonthSelect';
-export function WebsiteMonthSelect({ websiteId }: { websiteId: string }) {
+export function WebsiteMonthSelect() {
+ const { router, updateParams } = useNavigation();
const {
dateRange: { startDate },
- saveDateRange,
- } = useDateRange(websiteId);
+ } = useDateRange();
const handleMonthSelect = (date: Date) => {
- const range = dateToRangeValue(date);
- saveDateRange(range);
+ const range = getMonthDateRangeValue(date);
+
+ router.push(updateParams({ date: range, offset: undefined }));
};
return <MonthSelect date={startDate} onChange={handleMonthSelect} />;
diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx
index f2f02eda8..7301faf44 100644
--- a/src/components/metrics/EventsChart.tsx
+++ b/src/components/metrics/EventsChart.tsx
@@ -14,7 +14,7 @@ export interface EventsChartProps extends BarChartProps {
export function EventsChart({ websiteId, focusLabel }: EventsChartProps) {
const {
dateRange: { startDate, endDate, unit },
- } = useDateRange(websiteId);
+ } = useDateRange();
const { locale } = useLocale();
const { data, isLoading, error } = useWebsiteEventsSeriesQuery(websiteId);
const [label, setLabel] = useState<string>(focusLabel);
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 2289e4fec..fa87277f3 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -131,14 +131,6 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange {
return null;
}
- if (value === 'all') {
- return {
- startDate: new Date(0),
- endDate: new Date(1),
- value,
- };
- }
-
if (value.startsWith('range')) {
const [, startTime, endTime] = value.split(':');
@@ -225,24 +217,28 @@ export function getOffsetDateRange(dateRange: DateRange, offset: number) {
case 'day':
return {
...dateRange,
+ offset,
startDate: addDays(startDate, change),
endDate: addDays(endDate, change),
};
case 'week':
return {
...dateRange,
+ offset,
startDate: addWeeks(startDate, change),
endDate: addWeeks(endDate, change),
};
case 'month':
return {
...dateRange,
+ offset,
startDate: addMonths(startDate, change),
endDate: addMonths(endDate, change),
};
case 'year':
return {
...dateRange,
+ offset,
startDate: addYears(startDate, change),
endDate: addYears(endDate, change),
};
@@ -250,6 +246,7 @@ export function getOffsetDateRange(dateRange: DateRange, offset: number) {
return {
startDate: add(startDate, change),
endDate: add(endDate, change),
+ offset,
value,
unit,
num,
@@ -354,6 +351,10 @@ export function generateTimeSeries(
});
}
-export function dateToRangeValue(date: Date) {
- return `range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`;
+export function getDateRangeValue(startDate: Date, endDate: Date) {
+ return `range:${startDate.getTime()}:${endDate.getTime()}`;
+}
+
+export function getMonthDateRangeValue(date: Date) {
+ return getDateRangeValue(startOfMonth(date), endOfMonth(date));
}
diff --git a/src/queries/sql/getWebsiteDateRange.ts b/src/queries/sql/getWebsiteDateRange.ts
index 4c0d21f0f..2f7f9f190 100644
--- a/src/queries/sql/getWebsiteDateRange.ts
+++ b/src/queries/sql/getWebsiteDateRange.ts
@@ -20,8 +20,8 @@ async function relationalQuery(websiteId: string) {
const result = await rawQuery(
`
select
- min(created_at) as mindate,
- max(created_at) as maxdate
+ min(created_at) as startDate,
+ max(created_at) as endDate
from website_event
where website_id = {{websiteId::uuid}}
and created_at >= {{startDate}}
@@ -42,8 +42,8 @@ async function clickhouseQuery(websiteId: string) {
const result = await rawQuery(
`
select
- min(created_at) as mindate,
- max(created_at) as maxdate
+ min(created_at) as startDate,
+ max(created_at) as endDate
from website_event_stats_hourly
where website_id = {websiteId:UUID}
and created_at >= {startDate:DateTime64}