From b5fad49b9d8320a06822738acc6c75e5fee619b5 Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Fri, 21 Feb 2025 18:18:18 +0530 Subject: [PATCH 01/16] feat: added image transformation usage to org & buckets --- src/lib/sdk/billing.ts | 9 ++- src/lib/sdk/usage.ts | 8 ++ .../usage/[[invoice]]/+page.svelte | 79 ++++++++++++++++--- .../usage/[[invoice]]/+page.ts | 8 +- .../usage/[[period]]/+page.svelte | 22 +++++- .../bucket-[bucket]/usage/[[period]]/+page.ts | 12 +-- 6 files changed, 112 insertions(+), 26 deletions(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index d5d158b0b..86aa2d474 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -1,8 +1,8 @@ -import type { Client, Models } from '@appwrite.io/console'; -import type { OrganizationError, Organization, OrganizationList } from '../stores/organization'; -import type { PaymentMethod } from '@stripe/stripe-js'; import type { Tier } from '$lib/stores/billing'; import type { Campaign } from '$lib/stores/campaigns'; +import type { Client, Models } from '@appwrite.io/console'; +import type { PaymentMethod } from '@stripe/stripe-js'; +import type { Organization, OrganizationError, OrganizationList } from '../stores/organization'; export type PaymentMethodData = { $id: string; @@ -213,11 +213,13 @@ export type OrganizationUsage = { executions: Array; databasesReads: Array; databasesWrites: Array; + imageTransformations: Array; executionsTotal: number; filesStorageTotal: number; buildsStorageTotal: number; databasesReadsTotal: number; databasesWritesTotal: number; + imageTransformationsTotal: number; deploymentsStorageTotal: number; executionsMBSecondsTotal: number; buildsMBSecondsTotal: number; @@ -235,6 +237,7 @@ export type OrganizationUsage = { users: number; authPhoneTotal: number; authPhoneEstimate: number; + fileTransformations: number; }>; authPhoneTotal: number; authPhoneEstimate: number; diff --git a/src/lib/sdk/usage.ts b/src/lib/sdk/usage.ts index 304bad1f6..33b9a877a 100644 --- a/src/lib/sdk/usage.ts +++ b/src/lib/sdk/usage.ts @@ -185,6 +185,14 @@ export type UsageBuckets = { * Aggregated statistics of bucket storage files per period. */ storage: Metric[]; + /** + * Aggregated statistics of bucket file transformations per period. + */ + fileTransformations: Metric[]; + /** + * Total aggregated number of file transformations. + */ + fileTransformationsTotal: number; }; /** * UsageFunctions diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 27a59f68e..b5723fbd7 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -1,6 +1,16 @@ + + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index de6a068c6..021b2ba45 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -1,8 +1,8 @@ -import { sdk } from '$lib/stores/sdk'; -import type { Metric, UsageBuckets } from '$lib/sdk/usage'; -import type { PageLoad } from './$types'; -import { StorageUsageRange } from '@appwrite.io/console'; import { isValueOfStringEnum } from '$lib/helpers/types'; +import type { Metric, UsageBuckets } from '$lib/sdk/usage'; +import { sdk } from '$lib/stores/sdk'; +import { StorageUsageRange } from '@appwrite.io/console'; +import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(StorageUsageRange, params.period) @@ -15,6 +15,8 @@ export const load: PageLoad = async ({ params }) => { return { filesTotal: response.filesTotal, - files: response.files as Metric[] + files: response.files as Metric[], + fileTransformationsTotal: response.fileTransformationsTotal, + fileTransformations: response.fileTransformations as Metric[] }; }; From 0a2600409b89c1fc85da552c7a2b7f1cd5e1b803 Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Fri, 21 Feb 2025 18:28:19 +0530 Subject: [PATCH 02/16] chore: fix schema --- src/lib/sdk/billing.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index 86aa2d474..d387b3ae0 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -213,13 +213,13 @@ export type OrganizationUsage = { executions: Array; databasesReads: Array; databasesWrites: Array; - imageTransformations: Array; + fileTransformations: Array; executionsTotal: number; filesStorageTotal: number; buildsStorageTotal: number; databasesReadsTotal: number; databasesWritesTotal: number; - imageTransformationsTotal: number; + fileTransformationsTotal: number; deploymentsStorageTotal: number; executionsMBSecondsTotal: number; buildsMBSecondsTotal: number; From d3f0aa03042ff6c1d5c0b9f38fc7fa48749817cb Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Tue, 25 Feb 2025 10:05:21 +0530 Subject: [PATCH 03/16] chore: update naming convention --- src/lib/sdk/billing.ts | 5 ++--- src/lib/sdk/usage.ts | 4 ++-- .../usage/[[invoice]]/+page.svelte | 6 +++--- .../organization-[organization]/usage/[[invoice]]/+page.ts | 4 ++-- .../storage/bucket-[bucket]/usage/[[period]]/+page.svelte | 4 ++-- .../storage/bucket-[bucket]/usage/[[period]]/+page.ts | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index d387b3ae0..b680c9d2e 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -213,13 +213,13 @@ export type OrganizationUsage = { executions: Array; databasesReads: Array; databasesWrites: Array; - fileTransformations: Array; + imageTransformations: Array; executionsTotal: number; filesStorageTotal: number; buildsStorageTotal: number; databasesReadsTotal: number; databasesWritesTotal: number; - fileTransformationsTotal: number; + imageTransformationsTotal: number; deploymentsStorageTotal: number; executionsMBSecondsTotal: number; buildsMBSecondsTotal: number; @@ -237,7 +237,6 @@ export type OrganizationUsage = { users: number; authPhoneTotal: number; authPhoneEstimate: number; - fileTransformations: number; }>; authPhoneTotal: number; authPhoneEstimate: number; diff --git a/src/lib/sdk/usage.ts b/src/lib/sdk/usage.ts index 33b9a877a..1d99d8d50 100644 --- a/src/lib/sdk/usage.ts +++ b/src/lib/sdk/usage.ts @@ -188,11 +188,11 @@ export type UsageBuckets = { /** * Aggregated statistics of bucket file transformations per period. */ - fileTransformations: Metric[]; + imageTransformations: Metric[]; /** * Total aggregated number of file transformations. */ - fileTransformationsTotal: number; + imageTransformationsTotal: number; }; /** * UsageFunctions diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index b5723fbd7..8782758b0 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -266,7 +266,7 @@ The total number of image transformations across all projects in your organization.

- {#if data.organizationUsage.fileTransformationsTotal} + {#if data.organizationUsage.imageTransformationsTotal}
[e.date, e.value] ) ] @@ -292,7 +292,7 @@ legendData={[ { name: 'Transformations', - value: data.organizationUsage.fileTransformationsTotal + value: data.organizationUsage.imageTransformationsTotal } ]} /> diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts index d81cd35ac..2605dc4a6 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts @@ -34,8 +34,8 @@ export const load: PageLoad = async ({ params, parent }) => { databasesWrites: null, databasesReadsTotal: null, databasesWritesTotal: null, - fileTransformations: null, - fileTransformationsTotal: null + imageTransformations: null, + imageTransformationsTotal: null } }; } diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte index 3366a0130..b4b2f6127 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte @@ -7,8 +7,8 @@ export let data: PageData; $: filesTotal = data.filesTotal; $: files = data.files; - $: transformationsTotal = data.fileTransformationsTotal; - $: transformations = data.fileTransformations; + $: transformationsTotal = data.imageTransformationsTotal; + $: transformations = data.imageTransformations; console.log(data); diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index 021b2ba45..e54038b45 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -16,7 +16,7 @@ export const load: PageLoad = async ({ params }) => { return { filesTotal: response.filesTotal, files: response.files as Metric[], - fileTransformationsTotal: response.fileTransformationsTotal, - fileTransformations: response.fileTransformations as Metric[] + imageTransformationsTotal: response.imageTransformationsTotal, + imageTransformations: response.imageTransformations as Metric[] }; }; From e0890ac098cdceaf6c96847f00bfe62bf47a438d Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Tue, 25 Feb 2025 13:51:36 +0530 Subject: [PATCH 04/16] chore: updated component --- src/lib/sdk/billing.ts | 1 + src/lib/stores/billing.ts | 59 ++++++++++--------- .../usage/[[invoice]]/+page.svelte | 27 ++++----- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index b680c9d2e..e1fe75c89 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -315,6 +315,7 @@ export type Plan = { order: number; bandwidth: number; storage: number; + imageTransformations: number; webhooks: number; users: number; teams: number; diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 83cb2d1d6..dd698c912 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -1,37 +1,37 @@ -import { page } from '$app/stores'; -import { derived, get, writable } from 'svelte/store'; -import { sdk } from './sdk'; -import { organization, type Organization, type OrganizationError } from './organization'; -import type { - InvoiceList, - AddressesList, - Invoice, - PaymentList, - PlansMap, - PaymentMethodData, - Plan, - Aggregation -} from '$lib/sdk/billing'; -import { isCloud } from '$lib/system'; -import { cachedStore } from '$lib/helpers/cache'; -import { Query } from '@appwrite.io/console'; -import { headerAlert } from './headerAlert'; -import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequired.svelte'; -import { addNotification, notifications } from './notifications'; +import { browser } from '$app/environment'; import { goto } from '$app/navigation'; import { base } from '$app/paths'; -import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store'; -import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte'; -import { BillingPlan, NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants'; -import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte'; -import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte'; -import LimitReached from '$lib/components/billing/alerts/limitReached.svelte'; +import { page } from '$app/stores'; import { trackEvent } from '$lib/actions/analytics'; +import LimitReached from '$lib/components/billing/alerts/limitReached.svelte'; +import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte'; +import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte'; import newDevUpgradePro from '$lib/components/billing/alerts/newDevUpgradePro.svelte'; +import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequired.svelte'; +import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte'; +import { BillingPlan, NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants'; +import { cachedStore } from '$lib/helpers/cache'; import { sizeToBytes, type Size } from '$lib/helpers/sizeConvertion'; -import { user } from './user'; -import { browser } from '$app/environment'; +import type { + AddressesList, + Aggregation, + Invoice, + InvoiceList, + PaymentList, + PaymentMethodData, + Plan, + PlansMap +} from '$lib/sdk/billing'; +import { isCloud } from '$lib/system'; +import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store'; +import { Query } from '@appwrite.io/console'; +import { derived, get, writable } from 'svelte/store'; +import { headerAlert } from './headerAlert'; +import { addNotification, notifications } from './notifications'; +import { organization, type Organization, type OrganizationError } from './organization'; import { canSeeBilling } from './roles'; +import { sdk } from './sdk'; +import { user } from './user'; export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'auto-1' | 'cont-1' | 'ent-1'; @@ -130,7 +130,8 @@ export type PlanServices = | 'users' | 'usersAddon' | 'webhooks' - | 'authPhone'; + | 'authPhone' + | 'imageTransformations'; export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan?: Plan): number { if (!isCloud) return 0; diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 8782758b0..e172ae8f3 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -267,7 +267,17 @@

{#if data.organizationUsage.imageTransformationsTotal} + {@const current = data.organizationUsage.imageTransformationsTotal} + {@const max = getServiceLimit('imageTransformations', tier, plan)}
+ [e.date, e.value] @@ -287,21 +297,6 @@ } ]} />
- - - - {#if projects?.length > 0} - - {/if} {:else}
From 2258baaa9db24a1401caf1b19b6ab47634e13e20 Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Tue, 25 Feb 2025 14:36:23 +0530 Subject: [PATCH 05/16] chore: hide selector for image transformations --- src/lib/layout/usage.svelte | 39 ++++++++++--------- .../usage/[[period]]/+page.svelte | 5 +-- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index d9f31bc11..dc1b703a2 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -58,12 +58,12 @@
{title} - - - 24h - - - 30d - - - 90d - - + {#if !hideSelectPeriod} + + + 24h + + + 30d + + + 90d + + + {/if}
{#if count} diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte index b4b2f6127..aaf45f345 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte @@ -9,8 +9,6 @@ $: files = data.files; $: transformationsTotal = data.imageTransformationsTotal; $: transformations = data.imageTransformations; - - console.log(data); + }} + hideSelectPeriod /> From 586a51ebde6d07b928bc97708ff9e78ed9bbe09b Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Wed, 26 Feb 2025 10:26:38 +0530 Subject: [PATCH 06/16] chore: added image transformation breakdown --- src/lib/sdk/usage.ts | 4 ++-- .../usage/[[invoice]]/+page.svelte | 8 +++++++- .../usage/[[invoice]]/ProjectBreakdown.svelte | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lib/sdk/usage.ts b/src/lib/sdk/usage.ts index 1d99d8d50..f0bf1dc40 100644 --- a/src/lib/sdk/usage.ts +++ b/src/lib/sdk/usage.ts @@ -186,11 +186,11 @@ export type UsageBuckets = { */ storage: Metric[]; /** - * Aggregated statistics of bucket file transformations per period. + * Aggregated statistics of bucket image transformations per period. */ imageTransformations: Metric[]; /** - * Total aggregated number of file transformations. + * Total aggregated number of bucket image transformations. */ imageTransformationsTotal: number; }; diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index e172ae8f3..24d5fae5c 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -265,6 +265,9 @@

The total number of image transformations across all projects in your organization.

+ {#if $organization.billingPlan === BillingPlan.FREE} +

This feature is not available on the Free plan.

+ {/if} {#if data.organizationUsage.imageTransformationsTotal} {@const current = data.organizationUsage.imageTransformationsTotal} @@ -273,7 +276,7 @@
+ {#if projects?.length > 0} + + {/if} {:else}
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index ca31412f4..5eea3c4a7 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -1,5 +1,5 @@
- {#if currentValue !== undefined && currentUnit !== undefined && progress !== undefined && maxValue !== undefined} + {#if currentValue !== undefined && currentUnit !== undefined && progress !== undefined}

@@ -26,10 +26,12 @@ {/if}

-

- {maxValue} - {maxUnit ? maxUnit : ''} -

+ {#if maxValue !== undefined} +

+ {maxValue} + {maxUnit ? maxUnit : ''} +

+ {/if}
{/if} {#if showBar && progressBarData.length > 0} diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index eec2e105c..813d67abe 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -3,7 +3,6 @@ import { tooltip } from '$lib/actions/tooltip'; import { BarChart, Legend } from '$lib/charts'; import { Card, CardGrid, Heading, ProgressBarBig } from '$lib/components'; - import { EmptyCardCloud } from '$lib/components/billing'; import { BillingPlan } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; @@ -24,22 +23,6 @@ export let data; - // Mock data for image transformations - data.organizationUsage = { - ...data.organizationUsage, - imageTransformationsTotal: 1250, - imageTransformations: [ - { date: '2024-03-01', value: 50 }, - { date: '2024-03-02', value: 75 }, - { date: '2024-03-03', value: 125 }, - { date: '2024-03-04', value: 200 }, - { date: '2024-03-05', value: 150 }, - { date: '2024-03-06', value: 175 }, - { date: '2024-03-07', value: 225 }, - { date: '2024-03-08', value: 250 } - ] - }; - const tier = data?.plan ? (data.plan.$id as Tier) : (data?.currentInvoice?.plan ?? $organization?.billingPlan); @@ -287,20 +270,12 @@ >.

- - {#if $organization.billingPlan === BillingPlan.FREE && new Date() < new Date('2024-04-01')} - - {:else if data.organizationUsage.imageTransformationsTotal} + {#if data.organizationUsage.imageTransformationsTotal} {@const current = data.organizationUsage.imageTransformationsTotal} - {@const max = getServiceLimit('imageTransformations', tier, plan)} - {@const isBeforeApril = new Date() < new Date('2024-04-01')} Date: Wed, 5 Mar 2025 10:31:52 +0530 Subject: [PATCH 14/16] chore: temporary check --- package.json | 2 +- pnpm-lock.yaml | 11 ++++++----- .../storage/bucket-[bucket]/usage/[[period]]/+page.ts | 9 ++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d942ead4e..c5985ea39 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "1.5.1", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c8fc1d7b8..d404cd2e9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: 1.5.1 - version: 1.5.1 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -199,8 +199,9 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@1.5.1': - resolution: {integrity: sha512-H0fkBprsxXjOhbrE+MqXt1e4Gx4QeRdHuvMs7UxqGr2fAVEqh4ez2yk40A0ZSQvvN+rqLduoItMHQFl+sCPbtQ==} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604} + version: 1.5.2 '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} @@ -3837,7 +3838,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@1.5.1': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604': {} '@appwrite.io/pink-icons@0.25.0': {} diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index e54038b45..468fe7363 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -1,7 +1,6 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; -import type { Metric, UsageBuckets } from '$lib/sdk/usage'; import { sdk } from '$lib/stores/sdk'; -import { StorageUsageRange } from '@appwrite.io/console'; +import { StorageUsageRange, type Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { @@ -11,12 +10,12 @@ export const load: PageLoad = async ({ params }) => { const response = (await sdk.forProject.storage.getBucketUsage( params.bucket, period - )) as unknown as UsageBuckets; + )) as unknown as Models.UsageBuckets; return { filesTotal: response.filesTotal, - files: response.files as Metric[], + files: response.files as Models.Metric[], imageTransformationsTotal: response.imageTransformationsTotal, - imageTransformations: response.imageTransformations as Metric[] + imageTransformations: response.imageTransformations as Models.Metric[] }; }; From 1933c8ec11e7181f6da27ac54e4683508c8384b6 Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Wed, 5 Mar 2025 10:59:05 +0530 Subject: [PATCH 15/16] chore: bump console sdk to 1.5.2 --- package.json | 2 +- pnpm-lock.yaml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c5985ea39..6142c536d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "e2e:ui": "playwright test tests/e2e --ui" }, "dependencies": { - "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604", + "@appwrite.io/console": "1.5.2", "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", "@popperjs/core": "^2.11.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d404cd2e9..72072365e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604 - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604 + specifier: 1.5.2 + version: 1.5.2 '@appwrite.io/pink': specifier: 0.25.0 version: 0.25.0 @@ -199,9 +199,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604} - version: 1.5.2 + '@appwrite.io/console@1.5.2': + resolution: {integrity: sha512-9nNZzxoQcpm5C5pKlGJLWxsEJ4sr5mdt01Hg6M8QpfMtsRe0gjaPa7WGrGBepRnZVKPDNpozh3Hua7nqgx4aEA==} '@appwrite.io/pink-icons@0.25.0': resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==} @@ -3838,7 +3837,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1604': {} + '@appwrite.io/console@1.5.2': {} '@appwrite.io/pink-icons@0.25.0': {} From b37bf5a85bbb2f3636e363701931b92b3d46211a Mon Sep 17 00:00:00 2001 From: ChiragAgg5k Date: Wed, 5 Mar 2025 11:47:16 +0530 Subject: [PATCH 16/16] chore: remove consolelog --- .../usage/[[invoice]]/ProjectBreakdown.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte index 64e9ffd74..ced2c0162 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte @@ -107,7 +107,6 @@ } onMount(() => { - console.log(JSON.stringify(projects, null, 2)); if (metric === undefined && databaseOperationMetric === undefined) { throw new Error(`metric or database operations must be defined`); }