From 10648d66ad2136aae27b2c923874c46db3c7ae20 Mon Sep 17 00:00:00 2001 From: Daste Date: Sat, 3 Dec 2022 12:50:55 +0100 Subject: [PATCH] Remove redundant logic in client-side javascript --- static/assets/js/components/summary.js | 11 ++--------- static/assets/js/components/time-picker.js | 12 ++---------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/static/assets/js/components/summary.js b/static/assets/js/components/summary.js index 16b69d2..fff253d 100644 --- a/static/assets/js/components/summary.js +++ b/static/assets/js/components/summary.js @@ -2,15 +2,8 @@ PetiteVue.createApp({ $delimiters: ['${', '}'], get currentInterval() { const urlParams = new URLSearchParams(window.location.search) - const cookies = new URLSearchParams(document.cookie.replaceAll('; ', '&')) - - if (urlParams.has('interval')) - return urlParams.get('interval') - if (cookies.has('wakapi_summary_interval')) - return cookies.get('wakapi_summary_interval') - if (!urlParams.has('from') && !urlParams.has('to')) - return 'today' - + if (urlParams.has('interval')) return urlParams.get('interval') + if (!urlParams.has('from') && !urlParams.has('to')) return 'today' return null } }).mount('#summary-page') \ No newline at end of file diff --git a/static/assets/js/components/time-picker.js b/static/assets/js/components/time-picker.js index 5bfe821..fcc515d 100644 --- a/static/assets/js/components/time-picker.js +++ b/static/assets/js/components/time-picker.js @@ -23,16 +23,8 @@ function TimePicker({ fromDate, toDate, timeSelection }) { }) const query = new URLSearchParams(window.location.search) - const cookies = new URLSearchParams(document.cookie.replaceAll('; ', '&')) - - let interval = undefined; - if (query.has('interval')) - interval = query.get('interval') - else if (cookies.has('wakapi_summary_interval')) - interval = cookies.get('wakapi_summary_interval') - - if (interval) { - const refEl = document.getElementById(`time-option-${interval}`) + if (query.has('interval')) { + const refEl = document.getElementById(`time-option-${query.get('interval')}`) this.timeSelection = refEl ? refEl.innerText : 'Unknown' } }