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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fix date filter.
Brian Cao84236c0cd9ef
diff --git a/src/components/input/WebsiteDateFilter.js b/src/components/input/WebsiteDateFilter.jsindex e56eba4f9..db8d141ab 100644--- a/src/components/input/WebsiteDateFilter.js+++ b/src/components/input/WebsiteDateFilter.js@@ -9,7 +9,8 @@ export function WebsiteDateFilter({ websiteId }) {const [dateRange, setDateRange] = useDateRange(websiteId);const { value, startDate, endDate, selectedUnit } = dateRange;- const isFutureDate = isAfter(incrementDateRange(dateRange, -1).startDate, new Date());+ const isFutureDate =+ value !== 'all' && isAfter(incrementDateRange(dateRange, -1).startDate, new Date());const handleChange = async value => {setDateRange(value);@@ -32,19 +33,21 @@ export function WebsiteDateFilter({ websiteId }) {onChange={handleChange}showAllTime={true}/>- <Flexbox justifyContent="center" gap={10} className={styles.container}>- <Button onClick={() => handleIncrement(1)}>- <Icon rotate={90}>- <Icons.ChevronDown />- </Icon>- </Button>-- <Button onClick={() => handleIncrement(-1)} disabled={isFutureDate}>- <Icon rotate={270}>- <Icons.ChevronDown />- </Icon>- </Button>- </Flexbox>+ {value !== 'all' && (+ <Flexbox justifyContent="center" gap={10} className={styles.container}>+ <Button onClick={() => handleIncrement(1)}>+ <Icon rotate={90}>+ <Icons.ChevronDown />+ </Icon>+ </Button>++ <Button onClick={() => handleIncrement(-1)} disabled={isFutureDate}>+ <Icon rotate={270}>+ <Icons.ChevronDown />+ </Icon>+ </Button>+ </Flexbox>+ )}</>);}diff --git a/src/lib/date.js b/src/lib/date.jsindex 02f6053dc..14f0e13ce 100644--- a/src/lib/date.js+++ b/src/lib/date.js@@ -195,6 +195,13 @@ export function incrementDateRange(value, increment) {const sub = num * increment;switch (unit) {+ case 'hour':+ return {+ ...value,+ startDate: subHours(startDate, sub),+ endDate: subHours(endDate, sub),+ value: 'range',+ };case 'day':return {...value,