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!

(improvments) add filters to cache key

Maksim Mrugd2d37f25b4bd
diff --git a/src/pages/Captcha/Settings/CaptchaSettings.container.tsx b/src/pages/Captcha/Settings/CaptchaSettings.container.tsx
index 991111ce7..ee292e355 100644
--- a/src/pages/Captcha/Settings/CaptchaSettings.container.tsx
+++ b/src/pages/Captcha/Settings/CaptchaSettings.container.tsx
@@ -47,7 +47,7 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
removeProject: (pid: string) => {
dispatch(UIActions.removeCaptchaProject(pid))
},
- deleteProjectCache: (pid: string) => {
+ deleteProjectCache: (pid: string, filters: any) => {
dispatch(UIActions.deleteCaptchaProjectCache({
pid,
}))
diff --git a/src/pages/Captcha/View/ViewCaptcha.tsx b/src/pages/Captcha/View/ViewCaptcha.tsx
index d5e58fa8c..d96cae41f 100644
--- a/src/pages/Captcha/View/ViewCaptcha.tsx
+++ b/src/pages/Captcha/View/ViewCaptcha.tsx
@@ -179,9 +179,9 @@ const ViewProject = ({
if (dateRange) {
from = getFormatDate(dateRange[0])
to = getFormatDate(dateRange[1])
- key = getProjectCacheCustomKey(from, to, timeBucket)
+ key = getProjectCacheCustomKey(from, to, timeBucket, newFilters || filters)
} else {
- key = getProjectCaptchaCacheKey(period, timeBucket)
+ key = getProjectCaptchaCacheKey(period, timeBucket, newFilters || filters)
}
if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {
diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsx
index 992efd059..483b1ed54 100644
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@ -657,7 +657,7 @@ const ViewProject = ({
if (activePeriod?.period === 'custom' ? diffCompare <= diff : diffCompare <= activePeriod?.countDays) {
fromCompare = getFormatDate(dateRangeCompare[0])
toCompare = getFormatDate(dateRangeCompare[1])
- keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket)
+ keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket, newFilters || filters)
} else {
showError(t('project.compareDateRangeError'))
compareDisable()
@@ -673,12 +673,12 @@ const ViewProject = ({
if (date) {
fromCompare = date.from
toCompare = date.to
- keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket)
+ keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket, newFilters || filters)
}
}
if (!_isEmpty(fromCompare) && !_isEmpty(toCompare)) {
- if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare]) && _isEmpty(newFilters || filters)) {
+ if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare])) {
dataCompare = cache[id][keyCompare]
} else {
dataCompare = await getProjectCompareData(id, timeBucket, '', newFilters || filters, fromCompare, toCompare, timezone, projectPassword)
@@ -696,13 +696,13 @@ const ViewProject = ({
if (dateRange) {
from = getFormatDate(dateRange[0])
to = getFormatDate(dateRange[1])
- key = getProjectCacheCustomKey(from, to, timeBucket)
+ key = getProjectCacheCustomKey(from, to, timeBucket, newFilters || filters)
} else {
- key = getProjectCacheKey(period, timeBucket)
+ key = getProjectCacheKey(period, timeBucket, newFilters || filters)
}
// check if we need to load new date or we have data in redux/localstorage
- if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key]) && !_isEmpty(newFilters || filters)) {
+ if ((!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key]))) {
data = cache[id][key]
} else {
if (period === 'custom' && dateRange) {
@@ -827,7 +827,7 @@ const ViewProject = ({
if (activePeriod?.period === 'custom' ? diffCompare <= diff : diffCompare <= activePeriod?.countDays) {
fromCompare = getFormatDate(dateRangeCompare[0])
toCompare = getFormatDate(dateRangeCompare[1])
- keyCompare = getProjectCacheCustomKeyPerf(fromCompare, toCompare, timeBucket)
+ keyCompare = getProjectCacheCustomKeyPerf(fromCompare, toCompare, timeBucket, newFilters || filtersPerf)
} else {
showError(t('project.compareDateRangeError'))
compareDisable()
@@ -843,12 +843,12 @@ const ViewProject = ({
if (date) {
fromCompare = date.from
toCompare = date.to
- keyCompare = getProjectCacheCustomKeyPerf(fromCompare, toCompare, timeBucket)
+ keyCompare = getProjectCacheCustomKeyPerf(fromCompare, toCompare, timeBucket, newFilters || filtersPerf)
}
}
if (!_isEmpty(fromCompare) && !_isEmpty(toCompare)) {
- if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare]) && _isEmpty(newFilters || filtersPerf)) {
+ if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare])) {
dataCompare = cache[id][keyCompare]
} else {
dataCompare = await getPerfData(id, timeBucket, '', newFilters || filtersPerf, fromCompare, toCompare, timezone, projectPassword)
@@ -861,9 +861,9 @@ const ViewProject = ({
if (dateRange) {
from = getFormatDate(dateRange[0])
to = getFormatDate(dateRange[1])
- key = getProjectCacheCustomKey(from, to, timeBucket)
+ key = getProjectCacheCustomKey(from, to, timeBucket, newFilters || filtersPerf)
} else {
- key = getProjectCacheKey(period, timeBucket)
+ key = getProjectCacheKey(period, timeBucket, newFilters || filtersPerf)
}
if (!forced && !_isEmpty(cachePerf[id]) && !_isEmpty(cachePerf[id][key])) {
@@ -1111,7 +1111,7 @@ const ViewProject = ({
const onForecastSubmit = async (periodToForecast: string) => {
setIsForecastOpened(false)
setDataLoading(true)
- const key = getProjectForcastCacheKey(period, timeBucket, periodToForecast)
+ const key = getProjectForcastCacheKey(period, timeBucket, periodToForecast, filters)
const data = cache[id][key]
if (!_isEmpty(data)) {
diff --git a/src/pages/Project/View/components/UserFlow.tsx b/src/pages/Project/View/components/UserFlow.tsx
index 8c5d080e1..d3aa1bbc7 100644
--- a/src/pages/Project/View/components/UserFlow.tsx
+++ b/src/pages/Project/View/components/UserFlow.tsx
@@ -18,18 +18,20 @@ const mapStateToProps = (state: StateType) => ({
})
const mapDispatchToProps = (dispatch: AppDispatch) => ({
- setUserFlowAscending: (data: IUserFlow, pid: string, period: string) => {
+ setUserFlowAscending: (data: IUserFlow, pid: string, period: string, filters: any) => {
dispatch(UIActions.setUserFlowAscending({
data,
pid,
period,
+ filters,
}))
},
- setUserFlowDescending: (data: IUserFlow, pid: string, period: string) => {
+ setUserFlowDescending: (data: IUserFlow, pid: string, period: string, filters: any) => {
dispatch(UIActions.setUserFlowDescending({
data,
pid,
period,
+ filters,
}))
},
generateError: (message: string) => {
@@ -59,8 +61,8 @@ const UserFlow = ({
from: string
to: string
isReversed?: boolean
- setUserFlowAscending: (data: IUserFlow, id: string, pd: string) => void
- setUserFlowDescending: (data: IUserFlow, id: string, pd: string) => void
+ setUserFlowAscending: (data: IUserFlow, id: string, pd: string, fltr: any) => void
+ setUserFlowDescending: (data: IUserFlow, id: string, pd: string, fltr: any) => void
generateError: (message: string) => void
t: (key: string) => string
filters: string[]
@@ -69,7 +71,7 @@ const UserFlow = ({
[key: string]: string
}
}) => {
- const key = getUserFlowCacheKey(pid, period)
+ const key = getUserFlowCacheKey(pid, period, filters)
const userFlowAscending = userFlowAscendingCache[key]
const userFlowDescending = userFlowDescendingCache[key]
const [isLoading, setIsLoading] = useState<boolean>(true)
@@ -84,8 +86,8 @@ const UserFlow = ({
}) => {
const { ascending, descending } = res
- setUserFlowAscending(ascending, pid, period)
- setUserFlowDescending(descending, pid, period)
+ setUserFlowAscending(ascending, pid, period, filters)
+ setUserFlowDescending(descending, pid, period, filters)
})
.catch((err: Error) => {
generateError(err.message)
diff --git a/src/redux/constants/index.ts b/src/redux/constants/index.ts
index 56c6ce16e..5fac6b60c 100644
--- a/src/redux/constants/index.ts
+++ b/src/redux/constants/index.ts
@@ -223,12 +223,12 @@ export const isSelfhosted: boolean = Boolean(process.env.REACT_APP_SELFHOSTED)
export const LIVE_VISITORS_UPDATE_INTERVAL: number = 40000
// Functions
-export const getProjectCacheKey = (period: string, timeBucket: string): string => `${period}${timeBucket}`
-export const getProjectCaptchaCacheKey = (period: string, timeBucket: string): string => `${period}${timeBucket}captcha`
-export const getProjectForcastCacheKey = (period: string, timeBucket: string, periodToForecast: string): string => `${period}${timeBucket}${periodToForecast}forecast`
-export const getProjectCacheCustomKey = (from: string, to: string, timeBucket: string): string => `${from}-${to}-${timeBucket}`
-export const getProjectCacheCustomKeyPerf = (from: string, to: string, timeBucket: string): string => `${from}-${to}-${timeBucket}perf`
-export const getUserFlowCacheKey = (pid: string, period: string): string => `${pid}${period}userflow`
+export const getProjectCacheKey = (period: string, timeBucket: string, filters?: any): string => `${period}${timeBucket}${filters ? JSON.stringify(filters) : ''}}`
+export const getProjectCaptchaCacheKey = (period: string, timeBucket: string, filters?: any): string => `${period}${timeBucket}captcha${filters ? JSON.stringify(filters) : ''}}`
+export const getProjectForcastCacheKey = (period: string, timeBucket: string, periodToForecast: string, filters: any): string => `${period}${timeBucket}${periodToForecast}forecast${filters ? JSON.stringify(filters) : ''}`
+export const getProjectCacheCustomKey = (from: string, to: string, timeBucket: string, filters: any): string => `${from}-${to}-${timeBucket}${filters ? JSON.stringify(filters) : ''}}`
+export const getProjectCacheCustomKeyPerf = (from: string, to: string, timeBucket: string, filters: any): string => `${from}-${to}-${timeBucket}perf${filters ? JSON.stringify(filters) : ''}`
+export const getUserFlowCacheKey = (pid: string, period: string, filters: any): string => `${pid}${period}userflow${filters ? JSON.stringify(filters) : ''}`
// Cookies
export const GDPR_REQUEST: string = 'gdpr_request'
diff --git a/src/redux/reducers/ui/cache.ts b/src/redux/reducers/ui/cache.ts
index 19993a915..a603b7b52 100644
--- a/src/redux/reducers/ui/cache.ts
+++ b/src/redux/reducers/ui/cache.ts
@@ -74,14 +74,14 @@ const cacheSlice = createSlice({
},
}
},
- deleteProjectCache(state, { payload }: PayloadAction<{ pid?: string, period?: string, timeBucket?: string }>) {
+ deleteProjectCache(state, { payload }: PayloadAction<{ pid?: string, period?: string, timeBucket?: string, filters?: any }>) {
const {
- pid, period, timeBucket,
+ pid, period, timeBucket, filters,
} = payload
let key: string
- if (period && timeBucket) {
- key = getProjectCacheKey(period, timeBucket)
+ if (period && timeBucket && filters) {
+ key = getProjectCacheKey(period, timeBucket, filters)
}
if (_isEmpty(period) || _isEmpty(timeBucket)) {
@@ -98,7 +98,9 @@ const cacheSlice = createSlice({
}
},
deleteCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string, period?: string, timeBucket?: string }>) {
- const { pid, period, timeBucket } = payload
+ const {
+ pid, period, timeBucket,
+ } = payload
let key: string
if (period && timeBucket) {
@@ -197,16 +199,16 @@ const cacheSlice = createSlice({
},
}
},
- setUserFlowAscending(state, { payload }: PayloadAction<{ pid: string, period: string, data: IUserFlow }>) {
- const key = getUserFlowCacheKey(payload.pid, payload.period)
+ setUserFlowAscending(state, { payload }: PayloadAction<{ pid: string, period: string, data: IUserFlow, filters: any }>) {
+ const key = getUserFlowCacheKey(payload.pid, payload.period, payload.filters)
state.userFlowAscending = {
...state.userFlowAscending,
[key]: payload.data,
}
},
- setUserFlowDescending(state, { payload }: PayloadAction<{ pid: string, period: string, data: IUserFlow }>) {
- const key = getUserFlowCacheKey(payload.pid, payload.period)
+ setUserFlowDescending(state, { payload }: PayloadAction<{ pid: string, period: string, data: IUserFlow, filters: any }>) {
+ const key = getUserFlowCacheKey(payload.pid, payload.period, payload.filters)
state.userFlowDescending = {
...state.userFlowDescending,