From 0e30d5d5a73bab7e16da4698b3e839d21939e45d Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Sun, 28 Jul 2024 17:14:36 +0530 Subject: [PATCH 1/9] fix: use a simpler view for usage cards. --- .../settings/usage/[[invoice]]/+page.svelte | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index a4d52bdf4..099deb804 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -223,24 +223,20 @@ {#if data.usage.executionsBreakdown.length > 0} - Function + Function Usage - {#each data.usage.executionsBreakdown as func} - + {func.name ?? func.resourceId} - + {formatNum(func.value)} executions - - View function - {/each} @@ -281,25 +277,21 @@ {#if data.usage.bucketsBreakdown.length > 0}
- Bucket + Bucket Usage - {#each data.usage.bucketsBreakdown.sort((a, b) => b.value - a.value) as bucket} {@const humanized = humanFileSize(bucket.value)} - - {bucket.name ?? bucket.resourceId} - - - {humanized.value}{humanized.unit} - - View bucket + {bucket.name ?? bucket.resourceId} + + {humanized.value}{humanized.unit} + {/each} From 90a35d053f5364cb5c9a6afcdff4d6ad6a39cc74 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Tue, 30 Jul 2024 14:13:11 +0530 Subject: [PATCH 2/9] improve: use chevron, make whole tile clickable. --- src/lib/elements/table/row.svelte | 16 ++++++++-- .../settings/usage/[[invoice]]/+page.svelte | 31 +++++++++++-------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/lib/elements/table/row.svelte b/src/lib/elements/table/row.svelte index 3a9808d96..c0cba2f5e 100644 --- a/src/lib/elements/table/row.svelte +++ b/src/lib/elements/table/row.svelte @@ -1,3 +1,13 @@ -
- -
+ + +{#if link} + + + +{:else} +
+ +
+{/if} \ No newline at end of file diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index 099deb804..efe4f15df 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -221,22 +221,24 @@ } ]} /> {#if data.usage.executionsBreakdown.length > 0} -
+
- Function + Function Usage + {#each data.usage.executionsBreakdown as func} - - + + {func.name ?? func.resourceId} - + {formatNum(func.value)} executions + + + {/each} @@ -275,23 +277,26 @@ {#if data.usage.bucketsBreakdown.length > 0} -
+
- Bucket + Bucket Usage + {#each data.usage.bucketsBreakdown.sort((a, b) => b.value - a.value) as bucket} {@const humanized = humanFileSize(bucket.value)} - - + {bucket.name ?? bucket.resourceId} - + {humanized.value}{humanized.unit} + + + {/each} From 4df56e25c1ae371184d2fff378f27a978fd6e463 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Wed, 31 Jul 2024 23:51:27 +0530 Subject: [PATCH 3/9] use: row-link component. --- src/lib/elements/table/row.svelte | 16 +++------------- .../settings/usage/[[invoice]]/+page.svelte | 12 +++++------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/lib/elements/table/row.svelte b/src/lib/elements/table/row.svelte index c0cba2f5e..7cdf2e053 100644 --- a/src/lib/elements/table/row.svelte +++ b/src/lib/elements/table/row.svelte @@ -1,13 +1,3 @@ - - -{#if link} - - - -{:else} -
- -
-{/if} \ No newline at end of file +
+ +
\ No newline at end of file diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index efe4f15df..1485a4267 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -4,11 +4,9 @@ import { TableBody, TableCell, - TableCellLink, TableCellHead, TableHeader, - TableRow, - Table + Table, TableRowLink } from '$lib/elements/table'; import { showUsageRatesModal, tierToPlan, upgradeURL } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; @@ -229,7 +227,7 @@ {#each data.usage.executionsBreakdown as func} - + {func.name ?? func.resourceId} @@ -239,7 +237,7 @@ - + {/each}
@@ -286,7 +284,7 @@ {#each data.usage.bucketsBreakdown.sort((a, b) => b.value - a.value) as bucket} {@const humanized = humanFileSize(bucket.value)} - + {bucket.name ?? bucket.resourceId} @@ -297,7 +295,7 @@ - + {/each} From b0ec7f9fe76500c9e6167da1dc2a3658a6da4bd6 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Thu, 1 Aug 2024 12:29:23 +0530 Subject: [PATCH 4/9] update: organization usage. --- .../usage/[[invoice]]/ProjectBreakdown.svelte | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 456559272..83042fc74 100644 --- a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -3,12 +3,10 @@ import { Collapsible, CollapsibleItem } from '$lib/components'; import { TableBody, - TableCellLink, TableCellHead, TableHeader, - TableRow, TableScroll, - TableCellText + TableRowLink, TableCell } from '$lib/elements/table'; import { abbreviateNumber } from '$lib/helpers/numbers'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; @@ -55,27 +53,31 @@ Project breakdown - + - Project - Usage - + Project + Usage + {#each groupByProject(metric).sort((a, b) => b.usage - a.usage) as project} - - + + {getProjectName(project.projectId)} - - {format(project.usage)} - - View project usage - - + + {format(project.usage)} + + + + {/each} + + \ No newline at end of file From 49cbe477b9c1f6b5c0454158b59399e891dff45b Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Thu, 1 Aug 2024 12:32:04 +0530 Subject: [PATCH 5/9] ran: `npm run format`. --- src/lib/elements/table/row.svelte | 2 +- src/lib/helpers/load.ts | 2 +- src/lib/layout/unauthenticated.svelte | 2 +- src/lib/stores/feedback.ts | 4 ++-- .../usage/[[invoice]]/ProjectBreakdown.svelte | 10 ++++++---- .../settings/usage/[[invoice]]/+page.svelte | 13 +++++++------ 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/lib/elements/table/row.svelte b/src/lib/elements/table/row.svelte index 7cdf2e053..3a9808d96 100644 --- a/src/lib/elements/table/row.svelte +++ b/src/lib/elements/table/row.svelte @@ -1,3 +1,3 @@
-
\ No newline at end of file + diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index 05e043ddc..21e2f1ee6 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -21,7 +21,7 @@ export enum View { export function getView(url: URL, route: Page['route'], fallback: View): View { return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid ? View.Grid - : View.Table ?? fallback; + : (View.Table ?? fallback); } export function getColumns(route: Page['route'], fallback: string[]): string[] { diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index b7e250b54..4d859d492 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -16,7 +16,7 @@ export let coupon: Coupon = null; $: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign); - $: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as + $: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as | 'default' | CampaignData['template']; diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts index 7f9b6b200..7eaefca2d 100644 --- a/src/lib/stores/feedback.ts +++ b/src/lib/stores/feedback.ts @@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore(); function createFeedbackStore() { const { subscribe, update } = writable({ - elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0, - visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0, + elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0, + visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0, notification: false, type: 'general', show: false diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 83042fc74..9ebccad73 100644 --- a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -6,7 +6,8 @@ TableCellHead, TableHeader, TableScroll, - TableRowLink, TableCell + TableRowLink, + TableCell } from '$lib/elements/table'; import { abbreviateNumber } from '$lib/helpers/numbers'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; @@ -57,7 +58,7 @@ Project Usage - + {#each groupByProject(metric).sort((a, b) => b.usage - a.usage) as project} @@ -67,7 +68,8 @@ {format(project.usage)} - + {/each} @@ -80,4 +82,4 @@ .ignore-icon-rotate { rotate: unset !important; } - \ No newline at end of file + diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte index 1485a4267..ad8e71972 100644 --- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -6,7 +6,8 @@ TableCell, TableCellHead, TableHeader, - Table, TableRowLink + Table, + TableRowLink } from '$lib/elements/table'; import { showUsageRatesModal, tierToPlan, upgradeURL } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; @@ -227,7 +228,8 @@ {#each data.usage.executionsBreakdown as func} - + {func.name ?? func.resourceId} @@ -235,7 +237,7 @@ {formatNum(func.value)} executions - + {/each} @@ -285,15 +287,14 @@ {#each data.usage.bucketsBreakdown.sort((a, b) => b.value - a.value) as bucket} {@const humanized = humanFileSize(bucket.value)} - + {bucket.name ?? bucket.resourceId} {humanized.value}{humanized.unit} - + {/each} From 53dd5f3d4db0a28e654236c1bca3797e6ddd6d5a Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Sat, 10 Aug 2024 12:34:17 +0530 Subject: [PATCH 6/9] ran: `npm run format`, again. --- src/lib/helpers/load.ts | 2 +- src/lib/layout/unauthenticated.svelte | 2 +- src/lib/stores/feedback.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index 21e2f1ee6..05e043ddc 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -21,7 +21,7 @@ export enum View { export function getView(url: URL, route: Page['route'], fallback: View): View { return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid ? View.Grid - : (View.Table ?? fallback); + : View.Table ?? fallback; } export function getColumns(route: Page['route'], fallback: string[]): string[] { diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index 4d859d492..b7e250b54 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -16,7 +16,7 @@ export let coupon: Coupon = null; $: selectedCampaign = campaigns.get(coupon?.campaign ?? campaign); - $: variation = ((coupon?.campaign ?? campaign) ? selectedCampaign?.template : 'default') as + $: variation = (coupon?.campaign ?? campaign ? selectedCampaign?.template : 'default') as | 'default' | CampaignData['template']; diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts index 7eaefca2d..7f9b6b200 100644 --- a/src/lib/stores/feedback.ts +++ b/src/lib/stores/feedback.ts @@ -71,8 +71,8 @@ export const feedbackData = createFeedbackDataStore(); function createFeedbackStore() { const { subscribe, update } = writable({ - elapsed: browser ? (parseInt(localStorage.getItem('feedbackElapsed')) ?? 0) : 0, - visualized: browser ? (parseInt(localStorage.getItem('feedbackVisualized')) ?? 0) : 0, + elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) ?? 0 : 0, + visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) ?? 0 : 0, notification: false, type: 'general', show: false From 7c40d6189613966c961e76563907cbe90603f407 Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 26 Nov 2024 15:21:49 +0530 Subject: [PATCH 7/9] ran: formatter. --- .../usage/[[invoice]]/ProjectBreakdown.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 073607204..5516b61b7 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -77,8 +77,8 @@ {format(project.usage)} - + {/if} From e160c09f9894ddc88d90b4e679070ab98a5f097e Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 26 Nov 2024 15:46:39 +0530 Subject: [PATCH 8/9] remove: unused var. --- .../project-[project]/settings/usage/[[invoice]]/+page.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte index 214454f95..b2d4f322a 100644 --- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -21,7 +21,6 @@ export let data; - $: baseRoute = `${base}/project-${data.project.$id}`; $: network = data.usage.network; $: users = data.usage.users; $: usersTotal = data.usage.usersTotal; From 08d75e7832671c14061ebe45e801cfdcc1782f91 Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 26 Nov 2024 15:50:15 +0530 Subject: [PATCH 9/9] re-add: var for correct path. --- .../project-[project]/settings/usage/[[invoice]]/+page.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte index b2d4f322a..d7666f5bc 100644 --- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte @@ -21,6 +21,7 @@ export let data; + $: baseRoute = `${base}/project-${data.project.$id}`; $: network = data.usage.network; $: users = data.usage.users; $: usersTotal = data.usage.usersTotal; @@ -232,7 +233,7 @@ {#each data.usage.executionsBreakdown as func} + href={`${baseRoute}/functions/function-${func.resourceId}`}> {func.name ?? func.resourceId}