📈 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: remove period / timebucket cache
Blue Mouse46ce244e0ffd
diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex fd4abf049..ed441c77a 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -321,7 +321,6 @@ export const reportFrequencyForEmailsOptions: {export const SHOW_BANNER_AT_PERC = 85 // show banner when 85% of events in tier are usedexport const LS_THEME_SETTING = 'colour-theme'-export const LS_VIEW_PREFS_SETTING = 'proj-view-preferences'export const LS_CAPTCHA_VIEW_PREFS_SETTING = 'captcha-view-preferences'export const DEFAULT_TIMEZONE = 'Etc/GMT'diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 79988fd70..234156753 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -268,8 +268,6 @@ const ViewProjectContent = () => {const {id,project,- preferences,- updatePreferences,allowedToManage,liveVisitors,isPasswordRequired,@@ -334,7 +332,6 @@ const ViewProjectContent = () => {[CHART_METRICS_MAPPING.cumulativeMode]: false,[CHART_METRICS_MAPPING.customEvents]: false,[CHART_METRICS_MAPPING.revenue]: false,- ...(preferences.metricsVisualisation || {}),} as Record<keyof typeof CHART_METRICS_MAPPING, boolean>)const [customMetrics, setCustomMetrics] = useState<ProjectViewCustomEvent[]>([],@@ -363,8 +360,8 @@ const ViewProjectContent = () => {return urlPeriod}- return preferences.period || '7d'- }, [searchParams, preferences.period])+ return '7d'+ }, [searchParams])// Extract compare params from URL early (needed for state initialization)const urlCompareEnabled = searchParams.get('compare') === 'true'@@ -393,10 +390,6 @@ const ViewProjectContent = () => {return null}- let initialDateRange: Date[] | null = preferences.rangeDate- ? [new Date(preferences.rangeDate[0]), new Date(preferences.rangeDate[1])]- : null-const from = searchParams.get('from')const to = searchParams.get('to')@@ -405,12 +398,12 @@ const ViewProjectContent = () => {const toDate = new Date(to)if (fromDate.getDate() && toDate.getDate()) {- initialDateRange = [fromDate, toDate]+ return [fromDate, toDate]}}- return initialDateRange- }, [period, searchParams, preferences.rangeDate])+ return null+ }, [period, searchParams])const periodPairs = useMemo<TBPeriodPairsProps[]>(() => {let tbs = null@@ -432,20 +425,16 @@ const ViewProjectContent = () => {}, [t, language, dateRange])const timeBucket = useMemo<TimeBucket>(() => {- let _timeBucket = preferences.timeBucket || periodPairs[4].tbs[1]- const urlTimeBucket = searchParams.get('timeBucket') as TimeBucketconst currentPeriodPair = _find(periodPairs, (el) => el.period === period)+ let _timeBucket = currentPeriodPair?.tbs?.[0] || 'day'+ const urlTimeBucket = searchParams.get('timeBucket') as TimeBucket- // 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)) {- if (currentPeriodPair?.tbs?.includes(urlTimeBucket)) {- _timeBucket = urlTimeBucket- }+ // Use the time bucket from the URL if it's compatible with the current period+ if (+ VALID_TIME_BUCKETS.includes(urlTimeBucket) &&+ currentPeriodPair?.tbs?.includes(urlTimeBucket)+ ) {+ _timeBucket = urlTimeBucket}if (dateRange) {@@ -466,7 +455,7 @@ const ViewProjectContent = () => {}return _timeBucket- }, [searchParams, preferences.timeBucket, periodPairs, period, dateRange])+ }, [searchParams, periodPairs, period, dateRange])const activePeriod = useMemo(() => _find(periodPairs, (p) => p.period === period),@@ -928,14 +917,9 @@ const ViewProjectContent = () => {newSearchParams.delete('to')newSearchParams.set('period', newPeriod)- updatePreferences({- period: newPeriod,- rangeDate: undefined,- })-setSearchParams(newSearchParams)},- [period, searchParams, setSearchParams, updatePreferences],+ [period, searchParams, setSearchParams],)const updateTimebucket = useCallback(@@ -947,12 +931,8 @@ const ViewProjectContent = () => {const newSearchParams = new URLSearchParams(searchParams.toString())newSearchParams.set('timeBucket', newTimebucket)setSearchParams(newSearchParams)-- updatePreferences({- timeBucket: newTimebucket,- })},- [dataLoading, searchParams, setSearchParams, updatePreferences],+ [dataLoading, searchParams, setSearchParams],)const openSettingsHandler = () => {diff --git a/web/app/pages/Project/View/utils/cache.ts b/web/app/pages/Project/View/utils/cache.tsindex e847b0fff..8bd44b7e0 100644--- a/web/app/pages/Project/View/utils/cache.ts+++ b/web/app/pages/Project/View/utils/cache.ts@@ -1,50 +1,6 @@-import {- isBrowser,- LS_PROJECTS_PROTECTED_KEY,- LS_VIEW_PREFS_SETTING,-} from '~/lib/constants'+import { LS_PROJECTS_PROTECTED_KEY } from '~/lib/constants'import { type Project } from '~/lib/models/Project'-import { getItemJSON, removeItem, setItem } from '~/utils/localstorage'--import { ProjectPreferences } from '../../../../providers/CurrentProjectProvider'--import { filterInvalidPreferences } from './filters'--const getAllProjectPreferences = (): Record<string, ProjectPreferences> => {- if (!isBrowser) {- return {}- }-- const storedPrefs = getItemJSON(LS_VIEW_PREFS_SETTING) || {}-- try {- return filterInvalidPreferences(storedPrefs)- } catch {- removeItem(LS_VIEW_PREFS_SETTING)- }-- return {}-}--export const getProjectPreferences = (- id: Project['id'],-): ProjectPreferences => {- const preferences = getAllProjectPreferences()- return preferences?.[id] || {}-}--export const setProjectPreferences = (- id: Project['id'],- preferences: ProjectPreferences,-) => {- setItem(- LS_VIEW_PREFS_SETTING,- JSON.stringify({- ...getAllProjectPreferences(),- [id]: preferences,- }),- )-}+import { getItemJSON, setItem } from '~/utils/localstorage'const getAllProjectPasswords = () =>getItemJSON(LS_PROJECTS_PROTECTED_KEY) || {}diff --git a/web/app/providers/CurrentProjectProvider.tsx b/web/app/providers/CurrentProjectProvider.tsxindex bf8d31cb2..aac4ff62a 100644--- a/web/app/providers/CurrentProjectProvider.tsx+++ b/web/app/providers/CurrentProjectProvider.tsx@@ -31,11 +31,7 @@ import type {import { getItemJSON } from '~/utils/localstorage'import routes from '~/utils/routes'-import {- getProjectPreferences,- setProjectPassword,- setProjectPreferences,-} from '../pages/Project/View/utils/cache'+import { setProjectPassword } from '../pages/Project/View/utils/cache'import { CHART_METRICS_MAPPING } from '../pages/Project/View/ViewProject.helpers'interface CurrentProjectContextType {@@ -198,21 +194,12 @@ export type ProjectPreferences = {metricsVisualisation?: Record<keyof typeof CHART_METRICS_MAPPING, boolean>}-const useProjectPreferences = (id: string) => {- const [preferences, setPreferences] = useState<ProjectPreferences>(- getProjectPreferences(id) as ProjectPreferences,- )+const useProjectPreferences = () => {+ const [preferences, setPreferences] = useState<ProjectPreferences>({})- const updatePreferences = useCallback(- (prefs: ProjectPreferences) => {- setPreferences((prev) => {- const newPrefs = { ...prev, ...prefs }- setProjectPreferences(id, newPrefs)- return newPrefs- })- },- [id],- )+ const updatePreferences = useCallback((prefs: ProjectPreferences) => {+ setPreferences((prev) => ({ ...prev, ...prefs }))+ }, [])return { preferences, updatePreferences }}@@ -263,7 +250,7 @@ export const CurrentProjectProvider = ({}: CurrentProjectProviderProps) => {const { project, mergeProject, isPasswordRequired, submitPassword } =useProject(id)- const { preferences, updatePreferences } = useProjectPreferences(id)+ const { preferences, updatePreferences } = useProjectPreferences()const { liveVisitors, updateLiveVisitors } = useLiveVisitors(project)return (diff --git a/web/app/utils/auth.ts b/web/app/utils/auth.tsindex c00d33121..a1aed20b8 100644--- a/web/app/utils/auth.ts+++ b/web/app/utils/auth.ts@@ -2,7 +2,6 @@ import {isSelfhosted,LOW_EVENTS_WARNING,LS_CAPTCHA_VIEW_PREFS_SETTING,- LS_VIEW_PREFS_SETTING,SHOW_BANNER_AT_PERC,} from '~/lib/constants'@@ -33,6 +32,5 @@ export const shouldShowLowEventsBanner = (* Called before navigating to /logout route.*/export const clearLocalStorageOnLogout = () => {- removeItem(LS_VIEW_PREFS_SETTING)removeItem(LS_CAPTCHA_VIEW_PREFS_SETTING)}