diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index 7d03a6d63..09c62731b 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -10,14 +10,6 @@ import FadeIn from '../../fade-in'; import * as url from '../../util/url' import LineGraphWithRouter from './line-graph' -function getStoredInterval(period, domain) { - return storage.getItem(`interval__${period}__${domain}`) -} - -function storeInterval(period, domain, interval) { - storage.setItem(`interval__${period}__${domain}`, interval) -} - function fetchMainGraph(site, query, metric, interval) { const params = {metric, interval} return api.get(url.apiPath(site, '/main-graph'), query, params) @@ -48,17 +40,17 @@ export default function VisitorGraph(props) { const onIntervalUpdate = useCallback((newInterval) => { - storeInterval(query.period, site.domain, newInterval) + storage.setInterval(site, query, newInterval) setGraphData(null) setGraphRefreshing(true) - fetchGraphData(getStoredMetric(), newInterval) + fetchGraphData(storage.getMetric(site), newInterval) }, [query]) const onMetricUpdate = useCallback((newMetric) => { - storage.setItem(`metric__${site.domain}`, newMetric) + storage.setMetric(site, newMetric) setGraphData(null) setGraphRefreshing(true) - fetchGraphData(newMetric, getStoredInterval(query.period, site.domain)) + fetchGraphData(newMetric, storage.getInterval(site, query)) }, [query]) useEffect(() => { @@ -82,13 +74,13 @@ export default function VisitorGraph(props) { }, [topStatData]) function fetchTopStatsAndGraphData() { - const metric = getStoredMetric() - const interval = getStoredInterval(query.period, site.domain) + const metric = storage.getMetric(site) + const interval = storage.getInterval(site, query) fetchTopReport(site, query, metric, interval) .then((res) => { - storeInterval(query.period, site.domain, res.interval) - storage.setItem(`metric__${site.domain}`, res.metric) + storage.setInterval(site, query, res.interval) + storage.setMetric(site, res.metric) setTopStatData(res) setTopStatsLoading(false) setGraphData(res) @@ -105,10 +97,6 @@ export default function VisitorGraph(props) { }) } - function getStoredMetric() { - return storage.getItem(`metric__${site.domain}`) - } - function storeTopStatsContainerHeight() { storage.setItem(`topStatsHeight__${site.domain}`, document.getElementById('top-stats-container').clientHeight) } @@ -139,7 +127,7 @@ export default function VisitorGraph(props) { {!isRealtime && } - + diff --git a/assets/js/dashboard/util/storage.js b/assets/js/dashboard/util/storage.js index 3333199e4..827eeec94 100644 --- a/assets/js/dashboard/util/storage.js +++ b/assets/js/dashboard/util/storage.js @@ -33,3 +33,19 @@ export function getItem(key) { return memStore[key] } } + +export function setInterval(site, query, interval) { + setItem(`interval__${query.period}__${site.domain}`, interval) +} + +export function getInterval(site, query) { + return getItem(`interval__${query.period}__${site.domain}`) +} + +export function setMetric(site, metric) { + setItem(`metric__${site.domain}`, metric) +} + +export function getMetric(site) { + return getItem(`metric__${site.domain}`) +}