diff --git a/bun.lock b/bun.lock index c1041547c..df79131cc 100644 --- a/bun.lock +++ b/bun.lock @@ -6,7 +6,7 @@ "name": "@appwrite/console", "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8c37253", + "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@2e31ae6", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3", "@appwrite.io/pink-legacy": "^1.0.3", @@ -126,7 +126,7 @@ "@analytics/type-utils": ["@analytics/type-utils@0.6.4", "", {}, "sha512-Ou1gQxFakOWLcPnbFVsrPb8g1wLLUZYYJXDPjHkG07+5mustGs5yqACx42UAu4A6NszNN6Z5gGxhyH45zPWRxw=="], - "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@8c37253", { "dependencies": { "json-bigint": "1.0.0" } }, "sha512-tk/tQgC20lA8p7RnL2uu22X+OYqPh2HDVGqBLNU/h3Wks66fQUu2Y6OarAAcoMyhfxelP/k0fa9jDaRvclC0jw=="], + "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@2e31ae6", { "dependencies": { "json-bigint": "1.0.0" } }, "sha512-DtlsXzS8hzz1R0FCC9FXPrabmZUs9qbkC4ogNU0POeKvcplviPe5Pcn0tzZotjYrPfAEdbpS2sJc62ZOdkAp5Q=="], "@appwrite.io/pink-icons": ["@appwrite.io/pink-icons@0.25.0", "", {}, "sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q=="], diff --git a/package.json b/package.json index 85975be26..9743b7700 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8c37253", + "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@2e31ae6", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3", "@appwrite.io/pink-legacy": "^1.0.3", diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts index d644e9884..cc4d9a112 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts @@ -1,10 +1,9 @@ import { sdk } from '$lib/stores/sdk'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { isCloud } from '$lib/system'; -import { Query, type Models } from '@appwrite.io/console'; +import { Query } from '@appwrite.io/console'; const VARIABLES_LIMIT = 100; -type SiteSpecification = Models.Specification & { buildEnabled: boolean; runtimeEnabled: boolean }; export const load = async ({ params, depends, parent }) => { depends(Dependencies.VARIABLES); @@ -47,9 +46,9 @@ export const load = async ({ params, depends, parent }) => { } }); - const specifications = (specificationsList?.specifications ?? []) as SiteSpecification[]; - const buildEnabledSpecs = specifications.filter((s) => s.buildEnabled); - const runtimeEnabledSpecs = specifications.filter((s) => s.runtimeEnabled); + const specifications = specificationsList?.specifications ?? []; + const buildEnabledSpecs = specifications.filter((s) => s.enabledForBuilds); + const runtimeEnabledSpecs = specifications.filter((s) => s.enabled); if ( buildEnabledSpecs.length && !buildEnabledSpecs.some((s) => s.slug === site.buildSpecification) diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index e7a91dcc8..cd2bc0a73 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -25,11 +25,6 @@ specs: Models.SpecificationList; } = $props(); - type SiteSpecification = Models.Specification & { - buildEnabled: boolean; - runtimeEnabled: boolean; - }; - let frameworkKey = $state(site.framework); let installCommand = $state(site?.installCommand); let buildCommand = $state(site?.buildCommand); @@ -130,9 +125,8 @@ site.adapter = adapter; } if (specs && specs.specifications?.length) { - const specifications = specs.specifications as SiteSpecification[]; - const buildEnabledSpecs = specifications.filter((s) => s.buildEnabled); - const runtimeEnabledSpecs = specifications.filter((s) => s.runtimeEnabled); + const buildEnabledSpecs = specs.specifications.filter((s) => s.enabledForBuilds); + const runtimeEnabledSpecs = specs.specifications.filter((s) => s.enabled); if ( buildEnabledSpecs.length && !buildEnabledSpecs.some((s) => s.slug === site.buildSpecification) @@ -156,9 +150,9 @@ adptr = selectedFramework.adapters[0]; site.adapter = adapter; } - const specifications = (specs?.specifications ?? []) as SiteSpecification[]; - const buildEnabledSpecs = specifications.filter((s) => s.buildEnabled); - const runtimeEnabledSpecs = specifications.filter((s) => s.runtimeEnabled); + const specifications = specs?.specifications ?? []; + const buildEnabledSpecs = specifications.filter((s) => s.enabledForBuilds); + const runtimeEnabledSpecs = specifications.filter((s) => s.enabled); const specToSend = buildEnabledSpecs.some((s) => s.slug === site.buildSpecification) ? site.buildSpecification : (buildEnabledSpecs[0]?.slug ?? site.buildSpecification); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte index 69d02d709..6cf9fcd08 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateResourceLimits.svelte @@ -18,11 +18,6 @@ export let site: Models.Site; export let specs: Models.SpecificationList; - type SiteSpecification = Models.Specification & { - buildEnabled: boolean; - runtimeEnabled: boolean; - }; - let buildSpecification = site.buildSpecification; let runtimeSpecification = site.runtimeSpecification; let originalBuild = site.buildSpecification; @@ -80,18 +75,18 @@ } } - const specifications = (specs?.specifications ?? []) as SiteSpecification[]; - const buildEnabledSpecs = specifications.filter((spec) => spec.buildEnabled); - const runtimeEnabledSpecs = specifications.filter((spec) => spec.runtimeEnabled); + const specifications = specs?.specifications ?? []; + const buildEnabledSpecs = specifications.filter((spec) => spec.enabledForBuilds); + const runtimeEnabledSpecs = specifications.filter((spec) => spec.enabled); const buildOptions = specifications.map((spec) => ({ label: `${spec.cpus} CPU, ${spec.memory} MB RAM`, value: spec.slug, - disabled: !spec.buildEnabled + disabled: !spec.enabledForBuilds })); const runtimeOptions = specifications.map((spec) => ({ label: `${spec.cpus} CPU, ${spec.memory} MB RAM`, value: spec.slug, - disabled: !spec.runtimeEnabled + disabled: !spec.enabled }));