diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts index c652eb6c3..e7545f251 100644 --- a/src/lib/helpers/faker.ts +++ b/src/lib/helpers/faker.ts @@ -256,24 +256,24 @@ function seededRandom(seed: number) { return x - Math.floor(x); } +const BASE_TIME_MS = Date.now(); + export function generateFakeBarChartData(seed = 1) { const fakeData: [number, number][] = []; - const now = Date.now(); for (let i = 23; i >= 0; i--) { const val = seededRandom(seed + i) * 1_000_000; - fakeData.push([now - i * 60 * 60 * 1000, Math.round(val)]); + fakeData.push([BASE_TIME_MS - i * 60 * 60 * 1000, Math.round(val)]); } return fakeData; } export function generateFakeLineChartData(seed = 2) { const fakeData: [number, number][] = []; - const now = Date.now(); let value = seededRandom(seed) * 5000 + 5000; for (let i = 23; i >= 0; i--) { value += (seededRandom(seed + i) - 0.5) * 1000; value = Math.max(0, value); - fakeData.push([now - i * 60 * 60 * 1000, Math.round(value)]); + fakeData.push([BASE_TIME_MS - i * 60 * 60 * 1000, Math.round(value)]); } return fakeData; } diff --git a/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte b/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte index 4d45a389c..9509d874a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/bandwidth.svelte @@ -83,15 +83,24 @@ toggle(event) && dispatch('change', '24h')}> + on:click={(event) => { + toggle(event); + dispatch('change', '24h'); + }}> 24h toggle(event) && dispatch('change', '30d')}> + on:click={(event) => { + toggle(event); + dispatch('change', '30d'); + }}> 30d toggle(event) && dispatch('change', '90d')}> + on:click={(event) => { + toggle(event); + dispatch('change', '90d'); + }}> 90d diff --git a/src/routes/(console)/project-[region]-[project]/overview/requests.svelte b/src/routes/(console)/project-[region]-[project]/overview/requests.svelte index 9cc77b001..2222e7c31 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/requests.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/requests.svelte @@ -84,14 +84,20 @@ toggle(event) && dispatch('change', '24h')} - >24h + on:click={(event) => { + toggle(event); + dispatch('change', '24h'); + }}>24h toggle(event) && dispatch('change', '30d')} - >30d + on:click={(event) => { + toggle(event); + dispatch('change', '30d'); + }}>30d toggle(event) && dispatch('change', '90d')} - >90d + on:click={(event) => { + toggle(event); + dispatch('change', '90d'); + }}>90d diff --git a/src/routes/(console)/project-[region]-[project]/overview/store.ts b/src/routes/(console)/project-[region]-[project]/overview/store.ts index c64221a47..94c3de36f 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/store.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/store.ts @@ -22,7 +22,13 @@ export const usage = cachedStore< return { load: async (start, end, period) => { const currentData = get(usage); - const currentParamsHash = hash([page.params.project, start, end, period.toString()]); + const currentParamsHash = hash([ + page.params.project, + page.params.region, + start, + end, + period.toString() + ]); // don't hit the API call if we have the data! if (lastParamsHash === currentParamsHash && currentData && !isDev) {