From 1874c23da189e2c08756e884ef433e14338d8bdb Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 28 Aug 2023 17:19:57 +0200 Subject: [PATCH] feat: missing alerts --- .../{variables.ts => consoleVariables.ts} | 0 .../function-[function]/createManual.svelte | 43 ++-- .../function-[function]/execute.svelte | 200 ++++++++++-------- .../function-[function]/settings/+page.svelte | 3 +- .../settings/updateConfiguration.svelte | 4 +- .../template-[template]/+page.svelte | 2 +- .../settings/updateInstallations.svelte | 4 +- 7 files changed, 142 insertions(+), 114 deletions(-) rename src/lib/stores/{variables.ts => consoleVariables.ts} (100%) diff --git a/src/lib/stores/variables.ts b/src/lib/stores/consoleVariables.ts similarity index 100% rename from src/lib/stores/variables.ts rename to src/lib/stores/consoleVariables.ts diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte index e0013ea54..75437ae81 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte @@ -7,13 +7,14 @@ InputTextarea, InputText } from '$lib/elements/forms'; - import { Collapsible, CollapsibleItem, Modal } from '$lib/components'; + import { Alert, Collapsible, CollapsibleItem, Modal } from '$lib/components'; import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; import { page } from '$app/stores'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { func } from './store'; export let show = false; @@ -77,20 +78,32 @@ placeholder="Entrypoint" bind:value={entrypoint} required /> - - - Build settings - (optional) - - - - - + {#if $func.version !== 'v3'} + + Build commands now available for functions v3.0 + Update your function version to make use of new features including build commands. + + + + + + {:else} + + + Build settings + (optional) + + + + + + {/if} This deployment will be activated after the build is completed. diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index fc180b167..10da25131 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -3,7 +3,7 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { Modal } from '$lib/components'; + import { Alert, Modal } from '$lib/components'; import Collapsible from '$lib/components/collapsible.svelte'; import CollapsibleItem from '$lib/components/collapsibleItem.svelte'; import { Dependencies } from '$lib/constants'; @@ -105,98 +105,116 @@

- + {#if selectedFunction?.version !== 'v3'} + + + Customizable execution data now available for functions v3.0 + + Update your function version to make use of new features including customizable HTTP + data in your executions. + + + + + + + {:else} + - + - - - Advanced settings - (optional) - -

- Customize your execution with headers or body. To customize parameters, add - them to path. -

-
- -
-
- - {#if headers} - {#each headers as [name, value], index} - - - - - - - - {/each} - {/if} - - -
- - - - - + + + Advanced settings + (optional) + +

+ Customize your execution with headers or body. To customize parameters, + add them to path. +

+
+ +
+
+ + {#if headers} + {#each headers as [name, value], index} + + + + + + + + {/each} + {/if} + + +
+ + + + + {/if} diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte index da6521239..b7e1961c5 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte @@ -46,7 +46,8 @@ Your function is outdated Update your function version to make use of new features including build commands and HTTP - data in your executions. To update, follow the steps outlined in our documentation. + data in your executions. To update, follow the steps outlined in our + documentation. diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte index 489dc8ae3..edebc1d10 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte @@ -49,7 +49,7 @@ import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte'; import { installations } from '$lib/wizards/functions/store'; import { isSelfHosted } from '$lib/system'; - import { consoleVariables } from '$lib/stores/variables'; + import { consoleVariables } from '$lib/stores/consoleVariables'; const functionId = $page.params.function; @@ -174,8 +174,6 @@ selectedDir !== $func?.providerRootDirectory; $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; - - $: console.log($consoleVariables);
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte index 741746326..6b089bce2 100644 --- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte +++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte @@ -4,7 +4,7 @@ import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; - import { consoleVariables } from '$lib/stores/variables'; + import { consoleVariables } from '$lib/stores/consoleVariables'; import { isSelfHosted } from '$lib/system'; import { connectTemplate } from '$lib/wizards/functions/cover.svelte'; import { template } from './store'; diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte index 53ee83e74..6a36b1452 100644 --- a/src/routes/console/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte @@ -29,7 +29,7 @@ import GitDisconnectModal from './GitDisconnectModal.svelte'; import dayjs from 'dayjs'; import { isSelfHosted } from '$lib/system'; - import { consoleVariables } from '$lib/stores/variables'; + import { consoleVariables } from '$lib/stores/consoleVariables'; export let total: number; export let limit: number; @@ -78,8 +78,6 @@ } $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true; - - $: console.log($consoleVariables, isVcsEnabled);