diff --git a/index.html b/index.html index 30ab891238..65edd72fac 100644 --- a/index.html +++ b/index.html @@ -422,8 +422,11 @@ margin-left: 0.5rem; } + #history-from, #history-to { + font: inherit; + } + #history-range-text { - font-family: monospace; margin-right: 0.25rem; } @@ -711,6 +714,8 @@

ClickBench — a Benchmark For Analytical DBMS

← All systems History of 🔗 Copy link + From + To Show all dates @@ -2023,7 +2028,23 @@

Detailed Comparison

const range = history_view.range; document.getElementById('history-range').style.display = range ? 'inline' : 'none'; - document.getElementById('history-range-text').textContent = range ? `${range.from} — ${range.to}` : ''; + document.getElementById('history-range-text').textContent = range?.last ? `Last ${range.last} days` : ''; + document.getElementById('history-from').value = range && range.from != min_date ? range.from : ''; + document.getElementById('history-to').value = range && range.to != max_date ? range.to : ''; +} + +/// An empty input leaves its side of the range open. +const min_date = '0000-01-01'; +const max_date = '9999-12-31'; + +for (const id of ['history-from', 'history-to']) { + document.getElementById(id).addEventListener('change', () => { + const from = document.getElementById('history-from').value; + const to = document.getElementById('history-to').value; + setHistoryView(history_view.key, from || to ? {from: from || min_date, to: to || max_date} : null); + updateHistory(); + render(); + }); } document.getElementById('history-range-reset').addEventListener('click', e => { @@ -2033,8 +2054,8 @@

Detailed Comparison

render(); }); -function openHistory(key) { - setHistoryView(key); +function openHistory(key, range) { + setHistoryView(key, range); updateHistory(); render(); window.scrollTo(0, 0); @@ -2073,7 +2094,8 @@

Detailed Comparison

const range = history_view.range; filtered_data = (history_view.data || []).filter(elem => !range || (elem.date >= range.from && elem.date <= range.to)); nothing_selected_elem.textContent = history_view.error ? `Cannot load the history: ${history_view.error}` - : !history_view.data ? 'Loading…' : history_view.data.length ? 'No results for this metric' : 'No results'; + : !history_view.data ? 'Loading…' : !history_view.data.length ? 'No results' + : filtered_data.length ? 'No results for this metric' : 'No results in this date range'; } else { applyTopRowFilters(); @@ -2576,7 +2598,13 @@

Detailed Comparison

history.pushState(historyState(), '', window.location.pathname + (window.location.search || '') + '#' + encodeState(selectors) + (history_view ? '&history=' + encodeURIComponent(history_view.key) : '') - + (history_view?.range ? `&from=${history_view.range.from}&to=${history_view.range.to}` : '')); + + (history_view?.range?.last ? `&last=${history_view.range.last}` + : history_view?.range ? `&from=${history_view.range.from}&to=${history_view.range.to}` : '')); +} + +/// The range of the last `days` days, relative to today, kept as `&last=` in the URL so that the link stays fresh. +function lastDaysRange(days) { + return {from: new Date(Date.now() - days * 86400000).toISOString().slice(0, 10), to: max_date, last: days}; } /// The selectors and the history view from the URL. @@ -2586,7 +2614,9 @@

Detailed Comparison

const hash = decodeURIComponent(window.location.hash.substring(1)); selectors = {...selectors, ...decodeState(hash)}; const params = Object.fromEntries(hash.split('&').map(kv => kv.split('='))); - setHistoryView(params.history, params.from && params.to ? {from: params.from, to: params.to} : null); + const last = parseInt(params.last); + setHistoryView(params.history, last > 0 ? lastDaysRange(last) + : params.from && params.to ? {from: params.from, to: params.to} : null); } catch {} }