From 0530c9cefbdf6e2f161e8d47cb57d0d4fb2d5711 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 13 Mar 2025 09:23:43 +0100 Subject: [PATCH] fix: Matej feedback --- .../template-[template]/+page.svelte | 2 +- .../template-[template]/permissions.svelte | 7 +++++-- .../sites/create-site/configuration.svelte | 18 ++++++++++++++---- .../sites/create-site/manual/+page.svelte | 2 -- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte index bab3fee56..95058fa9d 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/+page.svelte @@ -64,7 +64,7 @@ let silentMode = false; let entrypoint = ''; let selectedScopes: string[] = []; - let execute = false; + let execute = true; let variables: Partial[] = []; let specification = specificationOptions[0].value; diff --git a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte index 219428209..f17aae982 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/template-[template]/permissions.svelte @@ -4,16 +4,19 @@ export let templateScopes: string[]; export let selectedScopes: string[]; - export let execute = false; + export let execute = true; let scopeList = scopes .filter((s) => templateScopes.includes(s.scope)) .map((s) => { + selectedScopes.push(s.scope); return { value: s, - checked: false + checked: true }; }); + + $: console.log(selectedScopes);
diff --git a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte index c76d00c9f..80ba859fd 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte @@ -36,6 +36,7 @@ export let frameworks: Models.Framework[]; export let selectedFramework: Models.Framework; + $: frameworkData = frameworks.find((framework) => framework.key === selectedFramework?.key); export let variables: Partial[] = []; export let installCommand = ''; @@ -52,7 +53,11 @@ let currentVariable: Partial; let frameworkId = selectedFramework.key; - $: frameworkData = frameworks.find((framework) => framework.key === selectedFramework?.key); + $: if (!installCommand || !buildCommand || !outputDirectory) { + installCommand ||= frameworkData?.adapters?.ssr?.installCommand; + buildCommand ||= frameworkData?.adapters?.ssr?.buildCommand; + outputDirectory ||= frameworkData?.adapters?.ssr?.outputDirectory; + }
@@ -87,7 +92,9 @@ size="s" disabled={frameworkData?.adapters?.ssr?.installCommand === installCommand} - on:click={() => (installCommand = '')}> + on:click={() => + (installCommand = + frameworkData?.adapters?.ssr?.installCommand)}> Reset @@ -102,7 +109,8 @@ size="s" disabled={frameworkData?.adapters?.ssr?.buildCommand === buildCommand} - on:click={() => (buildCommand = '')}> + on:click={() => + (buildCommand = frameworkData?.adapters?.ssr?.buildCommand)}> Reset @@ -117,7 +125,9 @@ size="s" disabled={frameworkData?.adapters?.ssr?.outputDirectory === outputDirectory} - on:click={() => (outputDirectory = '')}> + on:click={() => + (outputDirectory = + frameworkData?.adapters?.ssr?.outputDirectory)}> Reset diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte index 1e30231e5..ca67d6fd0 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte @@ -176,8 +176,6 @@ bind:selectedFramework={framework} bind:variables frameworks={data.frameworks.frameworks} /> - -