📈 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 eslint errors & create getProjectCacheCustomKey method
Blue Mouse4078dbf71780
diff --git a/src/pages/Project/View/ViewProject.container.jsx b/src/pages/Project/View/ViewProject.container.jsxindex 5df5a7e3f..58c2771c3 100644--- a/src/pages/Project/View/ViewProject.container.jsx+++ b/src/pages/Project/View/ViewProject.container.jsx@@ -16,8 +16,8 @@ const mapDispatchToProps = (dispatch) => ({showError: (message) => {dispatch(errorsActions.genericError(message))},- setProjectCache: (pid, period, timeBucket, data, key) => {- dispatch(UIActions.setProjectCache(pid, period, timeBucket, data, key))+ setProjectCache: (pid, data, key) => {+ dispatch(UIActions.setProjectCache(pid, data, key))},setProjectViewPrefs: (pid, period, timeBucket, rangeDate) => {dispatch(UIActions.setProjectViewPrefs(pid, period, timeBucket, rangeDate))diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 8960438a8..56ae65f02 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -38,7 +38,8 @@ import PropTypes from 'prop-types'import Title from 'components/Title'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import {- tbPeriodPairs, tbsFormatMapper, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE, timeBucketToDays,+ tbPeriodPairs, tbsFormatMapper, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE,+ timeBucketToDays, getProjectCacheCustomKey,} from 'redux/constants'import Button from 'ui/Button'import Loader from 'ui/Loader'@@ -373,15 +374,16 @@ const ViewProject = ({setDataLoading(true)try {let data- let key = getProjectCacheKey(period, timeBucket)-+ let keylet fromlet toif (rangeDate) {from = getFormatDate(rangeDate[0])to = getFormatDate(rangeDate[1])- key = `${from}-${to}-${timeBucket}`+ key = getProjectCacheCustomKey(from, to, timeBucket)+ } else {+ key = getProjectCacheKey(period, timeBucket)}if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {@@ -393,7 +395,7 @@ const ViewProject = ({data = await getProjectData(id, timeBucket, period, newFilters || filters, '', '', timezone)}- setProjectCache(id, period, timeBucket, data || {}, key)+ setProjectCache(id, data || {}, key)}if (_isEmpty(data)) {diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex b8c1f26f5..684640471 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -67,10 +67,10 @@ const setProjectsLoading = (isLoading) => ({},})-const setProjectCache = (pid, period, timeBucket, data, key) => ({+const setProjectCache = (pid, data, key) => ({type: types.SET_PROJECT_CACHE,payload: {- pid, period, timeBucket, data, key+ pid, data, key,},})diff --git a/src/redux/constants/index.js b/src/redux/constants/index.jsindex 25ff39ad9..b71c29f07 100644--- a/src/redux/constants/index.js+++ b/src/redux/constants/index.js@@ -112,6 +112,7 @@ export const GENERAL_STATS_UPDATE_INTERVAL = 60000// Functionsexport const getProjectCacheKey = (period, timeBucket) => `${period}${timeBucket}`+export const getProjectCacheCustomKey = (from, to, timeBucket) => `${from}-${to}-${timeBucket}`// Cookiesexport const GDPR_REQUEST = 'gdpr_request'diff --git a/src/redux/reducers/ui/cache.js b/src/redux/reducers/ui/cache.jsindex bd88cce53..9ed316a9f 100644--- a/src/redux/reducers/ui/cache.js+++ b/src/redux/reducers/ui/cache.js@@ -34,9 +34,7 @@ const getInitialState = () => {const cacheReducer = (state = getInitialState(), { type, payload }) => {switch (type) {case types.SET_PROJECT_CACHE: {- const {- pid, period, timeBucket, data, key,- } = payload+ const { pid, data, key } = payloadreturn {...state,