📈 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
some fix and save date to localStorage, redux
kruzhambusb8f6a475b3d4
diff --git a/src/pages/Project/View/ViewProject.container.jsx b/src/pages/Project/View/ViewProject.container.jsxindex 36e7a6183..d1f7313c4 100644--- a/src/pages/Project/View/ViewProject.container.jsx+++ b/src/pages/Project/View/ViewProject.container.jsx@@ -19,8 +19,8 @@ const mapDispatchToProps = (dispatch) => ({setProjectCache: (pid, period, timeBucket, data) => {dispatch(UIActions.setProjectCache(pid, period, timeBucket, data))},- setProjectViewPrefs: (pid, period, timeBucket) => {- dispatch(UIActions.setProjectViewPrefs(pid, period, timeBucket))+ setProjectViewPrefs: (pid, period, timeBucket, rangeDate) => {+ dispatch(UIActions.setProjectViewPrefs(pid, period, timeBucket, rangeDate))},setPublicProject: (project) => {dispatch(UIActions.setPublicProject(project))diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex e601996f4..a371d87e0 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -30,7 +30,7 @@ import _find from 'lodash/find'import _size from 'lodash/size'import _filter from 'lodash/filter'import _truncate from 'lodash/truncate'-import PropTypes, { element } from 'prop-types'+import PropTypes from 'prop-types'import Title from 'components/Title'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'@@ -283,7 +283,8 @@ const ViewProject = ({const isLoading = authenticated ? _isLoading : falseconst tnMapping = typeNameMapping(t)const refCalendar = useRef(null)- const [rangeDate, setRangeDate] = useState()+ const localstorageRangeDate = projectViewPrefs[id].rangeDate+ const [rangeDate, setRangeDate] = useState(localstorageRangeDate ? [new Date(localstorageRangeDate[0]), new Date(localstorageRangeDate[1])] : null)const timeBucketToDays = [{ lt: 7, tb: ['hour','day'] }, // 7 days{ lt: 28, tb: ['day','week'] }, // 4 weeks@@ -425,11 +426,11 @@ const ViewProject = ({if(rangeDate) {const days = Math.ceil(Math.abs(rangeDate[1].getTime() - rangeDate[0].getTime()) / (1000 * 3600 * 24))for (let index in timeBucketToDays) {- if (timeBucketToDays[index].lt > days) {+ if (timeBucketToDays[index].lt >= days) {setTimebucket(timeBucketToDays[index].tb[0])setPeriodPairs(tbPeriodPairs(t, timeBucketToDays[index].tb, rangeDate))setPeriod("Custom")- setProjectViewPrefs(id, 'Custom', timeBucketToDays[index].tb[0])+ setProjectViewPrefs(id, 'Custom', timeBucketToDays[index].tb[0], rangeDate)break}}@@ -501,9 +502,7 @@ const ViewProject = ({const updateTimebucket = (newTimebucket) => {setTimebucket(newTimebucket)- if(!period === 'Custom') {- setProjectViewPrefs(id, period, newTimebucket)- }+ setProjectViewPrefs(id, period, newTimebucket)}const openSettingsHandler = () => {diff --git a/src/redux/actions/ui/index.js b/src/redux/actions/ui/index.jsindex 516e580a6..89fa7d495 100644--- a/src/redux/actions/ui/index.js+++ b/src/redux/actions/ui/index.js@@ -81,10 +81,10 @@ const deleteProjectCache = (pid, period, timeBucket) => ({},})-const setProjectViewPrefs = (pid, period, timeBucket) => ({+const setProjectViewPrefs = (pid, period, timeBucket, rangeDate) => ({type: types.SET_PROJECT_VIEW_PREFS,payload: {- pid, period, timeBucket,+ pid, period, timeBucket, rangeDate},})diff --git a/src/redux/reducers/ui/cache.js b/src/redux/reducers/ui/cache.jsindex 1eaa02e18..247e9d800 100644--- a/src/redux/reducers/ui/cache.js+++ b/src/redux/reducers/ui/cache.js@@ -76,13 +76,15 @@ const cacheReducer = (state = getInitialState(), { type, payload }) => {}case types.SET_PROJECT_VIEW_PREFS: {- const { pid, period, timeBucket } = payload+ const { pid, period, timeBucket, rangeDate } = payloadreturn {...state,projectViewPrefs: {...state.projectViewPrefs,- [pid]: {+ [pid]: rangeDate ? {+ period, timeBucket, rangeDate+ } : {period, timeBucket,},},diff --git a/src/redux/sagas/ui/set_project_view_prefs.js b/src/redux/sagas/ui/set_project_view_prefs.jsindex da2c0f43e..4a1bb0a64 100644--- a/src/redux/sagas/ui/set_project_view_prefs.js+++ b/src/redux/sagas/ui/set_project_view_prefs.js@@ -1,12 +1,14 @@import { LS_VIEW_PREFS_SETTING } from 'redux/constants'import { getInitialViewPrefs } from 'redux/reducers/ui/cache'-export default function setProjectViewPrefs({ payload: { pid, period, timeBucket } }) {+export default function setProjectViewPrefs({ payload: { pid, period, timeBucket, rangeDate } }) {if (typeof window !== 'undefined' && window.localStorage) {const viewPrefs = {...getInitialViewPrefs(),- [pid]: {- period, timeBucket,+ [pid]: rangeDate ? {+ period, timeBucket, rangeDate+ } : {+ period, timeBucket,},}