Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@
"overrides": {
"vite": "npm:rolldown-vite@latest",
"minimatch": "10.2.3",
"brace-expansion": ">=5.0.5",
"brace-expansion": ">=5.0.7",
"js-yaml": "^4.3.0",
"immutable": "^5.1.5",
"flatted": "^3.4.2",
"devalue": "^5.8.1",
Expand Down
10 changes: 0 additions & 10 deletions src/lib/commandCenter/searchers/functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ export const functionsSearcher = (async (query: string) => {
},
group: 'functions'
},
{
label: 'Go to usage',
nested: true,
callback() {
goto(
`${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/usage`
);
},
group: 'functions'
},
{
label: 'Go to executions',
nested: true,
Expand Down
3 changes: 1 addition & 2 deletions src/lib/layout/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
145 changes: 0 additions & 145 deletions src/lib/layout/usage.svelte

This file was deleted.

68 changes: 68 additions & 0 deletions src/lib/layout/usageHelpers.ts
Original file line number Diff line number Diff line change
@@ -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;
}
99 changes: 0 additions & 99 deletions src/lib/layout/usageMultiple.svelte

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading