diff --git a/src/lib/layout/index.ts b/src/lib/layout/index.ts index d28020209..004b68fbb 100644 --- a/src/lib/layout/index.ts +++ b/src/lib/layout/index.ts @@ -10,8 +10,7 @@ export { default as WizardWithSteps } from './wizardWithSteps.svelte'; export { default as WizardStep } from './wizardStep.svelte'; export { default as Breadcrumbs } from './breadcrumbs.svelte'; export { default as Unauthenticated } from './unauthenticated.svelte'; -export { default as Usage, type UsagePeriods } from './usage.svelte'; -export { default as UsageMultiple } from './usageMultiple.svelte'; +export type { UsagePeriods } from './usageHelpers'; export { default as Progress } from './progress.svelte'; export { default as GridHeader } from './gridHeader.svelte'; export { default as ContainerHeader } from './containerHeader.svelte'; diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte deleted file mode 100644 index 9f5889b04..000000000 --- a/src/lib/layout/usage.svelte +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - {#if !hidePeriodSelect} -
- goto(`${path}/${e.detail}`)} - id="period" - options={[ - { - label: '24 hours', - value: '24h' - }, - { - label: '30 days', - value: '30d' - }, - { - label: '90 days', - value: '90d' - } - ]} - value={page.params.period ?? '30d'} /> -
- {/if} - - {#if count} - - {formatNumberWithCommas(total)} - {countMetadata.title} - -
- [m.date, m.value]) - : accumulateFromEndingTotal(count, total) - } - ]} /> -
- {/if} -
-
- - diff --git a/src/lib/layout/usageHelpers.ts b/src/lib/layout/usageHelpers.ts new file mode 100644 index 000000000..61c457ef3 --- /dev/null +++ b/src/lib/layout/usageHelpers.ts @@ -0,0 +1,68 @@ +import { ProjectUsageRange, type Models } from '@appwrite.io/console'; + +export type UsagePeriods = '24h' | '30d' | '90d'; + +export function periodToDates(period: UsagePeriods): { + start: string; + end: string; + period: ProjectUsageRange; +} { + const start = new Date(); + switch (period) { + case '24h': + start.setUTCHours(start.getHours() - 24); + break; + case '30d': + start.setUTCHours(0, 0, 0, 0); + start.setUTCDate(start.getDate() - 30); + break; + case '90d': + start.setUTCHours(0, 0, 0, 0); + start.setUTCDate(start.getDate() - 90); + break; + } + const end = new Date(); + end.setUTCDate(end.getUTCDate() + 1); + end.setUTCHours(0, 0, 0, 0); + return { + start: start.toISOString(), + end: end.toISOString(), + period: period === '24h' ? ProjectUsageRange.OneHour : ProjectUsageRange.OneDay + }; +} + +export function last(set: Models.Metric[]): Models.Metric | null { + if (!set) return null; + return set.slice(-1)[0] ?? null; +} + +export function total(set: Models.Metric[]): number { + return set?.reduce((prev, curr) => prev + curr.value, 0) ?? 0; +} + +export function accumulateFromEndingTotal( + metrics: Models.Metric[], + endingTotal: number, + startingDayToFillZero: Date = null +): Array<[string, number]> { + return (metrics ?? []).reduceRight( + (acc, curr) => { + if (startingDayToFillZero !== null && startingDayToFillZero instanceof Date) { + const date = new Date(curr.date); + if (date > startingDayToFillZero) { + acc.data.unshift([date.toISOString(), 0]); + acc.total -= 0; + + return acc; + } + } + acc.data.unshift([curr.date, acc.total]); + acc.total -= curr.value; + return acc; + }, + { + total: endingTotal, + data: [] + } + ).data; +} diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte deleted file mode 100644 index ff1789c49..000000000 --- a/src/lib/layout/usageMultiple.svelte +++ /dev/null @@ -1,99 +0,0 @@ - - -
- {#if showHeader} -
- {title} - - {#if path} - - - 24h - - - 30d - - - 90d - - - {/if} -
- {/if} - - - {#if count} - - {formatNumberWithCommas(totalCount)} - Total {title.toLocaleLowerCase()} - -
- - - {#if legendData} - - {/if} -
- {/if} -
-
- - diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 874cc23ec..cdee86848 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -15,7 +15,7 @@ import { organization } from '$lib/stores/organization'; import ProjectBreakdown from './ProjectBreakdown.svelte'; import { formatNum } from '$lib/helpers/string'; - import { accumulateFromEndingTotal, total } from '$lib/layout/usage.svelte'; + import { accumulateFromEndingTotal, total } from '$lib/layout/usageHelpers'; import { Click, trackEvent } from '$lib/actions/analytics'; import TotalMembers from './totalMembers.svelte'; import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts index a34a5d001..1a378fe43 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts @@ -1,6 +1,6 @@ import { writable } from 'svelte/store'; import type { Column } from '$lib/helpers/types'; -import { IconChartBar, IconCloudUpload, IconCog } from '@appwrite.io/pink-icons-svelte'; +import { IconCloudUpload, IconCog } from '@appwrite.io/pink-icons-svelte'; import { resolveRoute, withPath } from '$lib/stores/navigation'; import type { Page } from '@sveltejs/kit'; import { type Models, Query } from '@appwrite.io/console'; @@ -104,7 +104,6 @@ export const customRetainingOptions = [ export const databaseSubNavigationItems = [ { title: 'Backups', href: 'backups', icon: IconCloudUpload }, - { title: 'Usage', href: 'usage', icon: IconChartBar }, { title: 'Settings', href: 'settings', icon: IconCog } ]; diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index 6f52422be..059310af0 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -22,7 +22,7 @@ import Bandwidth from './bandwidth.svelte'; import Requests from './requests.svelte'; import { usage } from './store'; - import { periodToDates } from '$lib/layout/usage.svelte'; + import { periodToDates } from '$lib/layout/usageHelpers'; import { canWriteProjects } from '$lib/stores/roles'; import { Card, Layout, Typography } from '@appwrite.io/pink-svelte'; import { writable, type Writable } from 'svelte/store'; diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index b6d535078..085865d6d 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -12,7 +12,7 @@ import { bytesToSize, humanFileSize, mbSecondsToGBHours } from '$lib/helpers/sizeConvertion'; import { BarChart, Legend } from '$lib/charts'; import { formatNum } from '$lib/helpers/string'; - import { total } from '$lib/layout/usage.svelte'; + import { total } from '$lib/layout/usageHelpers'; import { base } from '$app/paths'; import { formatCurrency, formatNumberWithCommas, clampMin } from '$lib/helpers/numbers'; import { getCountryName } from '$lib/helpers/diallingCodes.js';