Skip to content

📈 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!

simpler updatePeriod function

Blue Mouse2da63f46bb39
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsx
index c87a2c3a1..0a0f41ea1 100644
--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx
+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx
@@ -6,7 +6,6 @@ import _find from 'lodash/find'
import _includes from 'lodash/includes'
import _isEmpty from 'lodash/isEmpty'
import _keys from 'lodash/keys'
-import _last from 'lodash/last'
import _map from 'lodash/map'
import _replace from 'lodash/replace'
import { DownloadIcon, RotateCw, SettingsIcon } from 'lucide-react'
@@ -151,19 +150,38 @@ const ViewCaptcha = () => {
}, [t, language, dateRange])
const timeBucket = useMemo<TimeBucket>(() => {
+ let _timeBucket = preferences.timeBucket || periodPairs[4].tbs[1]
const urlTimeBucket = searchParams.get('timeBucket') as TimeBucket
+ const currentPeriodPair = _find(periodPairs, (el) => el.period === period)
+ // If the time bucket from preferences is not compatible with the current period, use the first time bucket of the period
+ if (currentPeriodPair && !currentPeriodPair.tbs.includes(urlTimeBucket)) {
+ _timeBucket = currentPeriodPair.tbs[0]
+ }
+
+ // Or use the time bucket from the URL if it's compatible with the current period
if (VALID_TIME_BUCKETS.includes(urlTimeBucket)) {
- const newPeriodFull = _find(periodPairs, (el) => el.period === period)
+ if (currentPeriodPair?.tbs?.includes(urlTimeBucket)) {
+ _timeBucket = urlTimeBucket
+ }
+ }
- // todo: if timebucket is invalid for the period, should we update the url right away here?
- if (newPeriodFull?.tbs?.includes(urlTimeBucket)) {
- return urlTimeBucket
+ if (dateRange) {
+ const days = Math.ceil(Math.abs(dateRange[1].getTime() - dateRange[0].getTime()) / (1000 * 3600 * 24))
+
+ for (const index in timeBucketToDays) {
+ if (timeBucketToDays[index].lt >= days) {
+ if (!timeBucketToDays[index].tb?.includes(_timeBucket)) {
+ _timeBucket = timeBucketToDays[index].tb[0]
+ }
+
+ break
+ }
}
}
- return preferences.timeBucket || periodPairs[4].tbs[1]
- }, [searchParams, preferences.timeBucket, periodPairs, period])
+ return _timeBucket
+ }, [searchParams, preferences.timeBucket, periodPairs, period, dateRange])
const activePeriod = useMemo(() => _find(periodPairs, (p) => p.period === period), [period, periodPairs])
@@ -312,29 +330,21 @@ const ViewCaptcha = () => {
loadCaptcha()
}
- const updatePeriod = (newPeriod: any) => {
- const newPeriodFull = _find(periodPairs, (el) => el.period === newPeriod.period)
- let tb: any = timeBucket
+ // We can assume period provided is never custom, as it's handled separately in the Flatpickr callback function
+ const updatePeriod = ({ period: newPeriod }: { period: Period }) => {
+ if (period === newPeriod) {
+ return
+ }
const newSearchParams = new URLSearchParams(searchParams.toString())
+ newSearchParams.delete('from')
+ newSearchParams.delete('to')
+ newSearchParams.set('period', newPeriod)
- if (_isEmpty(newPeriodFull)) return
-
- if (!_includes(newPeriodFull.tbs, timeBucket)) {
- tb = _last(newPeriodFull.tbs)
- newSearchParams.set('timeBucket', tb)
- }
-
- if (newPeriod.period !== 'custom') {
- newSearchParams.delete('from')
- newSearchParams.delete('to')
- newSearchParams.set('period', newPeriod.period)
- updatePreferences({
- period: newPeriod.period,
- timeBucket: tb,
- rangeDate: undefined,
- })
- }
+ updatePreferences({
+ period: newPeriod,
+ rangeDate: undefined,
+ })
setSearchParams(newSearchParams)
}
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index f9dc37ca2..14d0d9206 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -12,7 +12,6 @@ import _includes from 'lodash/includes'
import _isEmpty from 'lodash/isEmpty'
import _isString from 'lodash/isString'
import _keys from 'lodash/keys'
-import _last from 'lodash/last'
import _map from 'lodash/map'
import _pickBy from 'lodash/pickBy'
import _replace from 'lodash/replace'
@@ -393,11 +392,16 @@ const ViewProject = () => {
const timeBucket = useMemo<TimeBucket>(() => {
let _timeBucket = preferences.timeBucket || periodPairs[4].tbs[1]
const urlTimeBucket = searchParams.get('timeBucket') as TimeBucket
+ const currentPeriodPair = _find(periodPairs, (el) => el.period === period)
- if (VALID_TIME_BUCKETS.includes(urlTimeBucket)) {
- const newPeriodFull = _find(periodPairs, (el) => el.period === period)
+ // If the time bucket from preferences is not compatible with the current period, use the first time bucket of the period
+ if (currentPeriodPair && !currentPeriodPair.tbs.includes(urlTimeBucket)) {
+ _timeBucket = currentPeriodPair.tbs[0]
+ }
- if (newPeriodFull?.tbs?.includes(urlTimeBucket)) {
+ // Or use the time bucket from the URL if it's compatible with the current period
+ if (VALID_TIME_BUCKETS.includes(urlTimeBucket)) {
+ if (currentPeriodPair?.tbs?.includes(urlTimeBucket)) {
_timeBucket = urlTimeBucket
}
}
@@ -2166,44 +2170,31 @@ const ViewProject = () => {
setSessionsLoading(null)
}
- const updatePeriod = (newPeriod: { period: Period; label?: string }) => {
- if (period === newPeriod.period) {
+ // We can assume period provided is never custom, as it's handled separately in the Flatpickr callback function
+ const updatePeriod = ({ period: newPeriod }: { period: Period }) => {
+ if (period === newPeriod) {
return
}
- const newPeriodFull = _find(periodPairs, (el) => el.period === newPeriod.period)
- let tb = timeBucket
- if (_isEmpty(newPeriodFull)) return
-
- if (!_includes(newPeriodFull.tbs, timeBucket)) {
- tb = _last(newPeriodFull.tbs) || 'day'
- const newSearchParamsTB = new URLSearchParams(searchParams.toString())
- newSearchParamsTB.set('timeBucket', tb)
- setSearchParams(newSearchParamsTB)
- }
-
const newSearchParams = new URLSearchParams(searchParams.toString())
- if (newPeriod.period !== 'custom') {
- newSearchParams.delete('from')
- newSearchParams.delete('to')
- newSearchParams.set('period', newPeriod.period)
- updatePreferences({
- period: newPeriod.period,
- timeBucket: tb,
- rangeDate: undefined,
- })
+ newSearchParams.delete('from')
+ newSearchParams.delete('to')
+ newSearchParams.set('period', newPeriod)
- setCanLoadMoreSessions(false)
- resetSessions()
- resetErrors()
- }
+ resetSessions()
+ resetErrors()
+
+ updatePreferences({
+ period: newPeriod,
+ rangeDate: undefined,
+ })
- setSearchParams(newSearchParams)
sdkInstance?._emitEvent('timeupdate', {
- period: newPeriod.period,
- timeBucket: tb,
- dateRange: newPeriod.period === 'custom' ? dateRange : null,
+ period: newPeriod,
+ dateRange: null,
})
+
+ setSearchParams(newSearchParams)
}
const updateTimebucket = (newTimebucket: TimeBucket) => {