diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte index 84f47a74c..28452bf7b 100644 --- a/src/lib/wizards/functions/cover.svelte +++ b/src/lib/wizards/functions/cover.svelte @@ -19,7 +19,8 @@ repositoryBehaviour: 'new', repositoryName: template.id, repositoryPrivate: true, - repositoryId: null + repositoryId: null, + specification: null }); wizard.start(CreateTemplate); } diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte index 355a62e47..6017fc46d 100644 --- a/src/lib/wizards/functions/createTemplate.svelte +++ b/src/lib/wizards/functions/createTemplate.svelte @@ -58,7 +58,8 @@ $template.providerRepositoryId || undefined, $template.providerOwner || undefined, runtimeDetail.providerRootDirectory || undefined, - $template.providerVersion || undefined + $template.providerVersion || undefined, + $templateConfig.specification || undefined ); if ($templateConfig.variables) { @@ -78,7 +79,8 @@ customId: !!response.$id, runtime: response.runtime, deployment_type: $templateConfig.repositoryBehaviour, - scopes: $templateConfig.scopes + scopes: $templateConfig.scopes, + specification: $templateConfig.specification }); resetState(); } catch (error) { diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte index 481cd5026..07c35cd91 100644 --- a/src/lib/wizards/functions/steps/templateConfiguration.svelte +++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte @@ -4,6 +4,7 @@ import { FormList, InputSelect, InputText } from '$lib/elements/forms'; import { WizardStep } from '$lib/layout'; import { runtimesList } from '$lib/stores/runtimes'; + import { specificationsList } from '$lib/stores/specifications'; import { template, templateConfig } from '../store'; let showCustomId = false; @@ -12,6 +13,10 @@ if (!$templateConfig.runtime) { throw new Error('Please select a runtime.'); } + + if (!$templateConfig.specification) { + throw new Error('Please select a specification.'); + } } async function loadRuntimes() { @@ -27,6 +32,22 @@ return options; } + + async function loadSpecifications() { + const specificationOptions = (await $specificationsList).specifications.map((size) => ({ + label: + `${size.cpus} CPU, ${size.memory} MB RAM` + + (!size.enabled ? ` (Upgrade to use this)` : ''), + value: size.slug, + disabled: !size.enabled + })); + + if (!$templateConfig.specification && specificationOptions.length > 0) { + $templateConfig.specification = specificationOptions[0].value; + } + + return specificationOptions; + } @@ -61,6 +82,25 @@ {options} bind:value={$templateConfig.runtime} /> {/await} + {#await loadSpecifications()} + + {:then specificationOptions} + + {/await} diff --git a/src/lib/wizards/functions/store.ts b/src/lib/wizards/functions/store.ts index 205c2847e..6ae23d609 100644 --- a/src/lib/wizards/functions/store.ts +++ b/src/lib/wizards/functions/store.ts @@ -15,6 +15,7 @@ export const templateConfig = writable<{ repositoryId: string; execute?: boolean; scopes?: string[]; + specification?: string; }>(); export const repository = writable(); export const installation = writable();