diff --git a/src/lib/components/alert.svelte b/src/lib/components/alert.svelte index 599d6b9e9..80a87573a 100644 --- a/src/lib/components/alert.svelte +++ b/src/lib/components/alert.svelte @@ -2,6 +2,7 @@ import { createEventDispatcher } from 'svelte'; import type { Buttons } from '../stores/notifications'; + export let isInline = false; export let dismissible = false; export let type: 'info' | 'success' | 'warning' | 'error' = 'info'; export let buttons: Buttons[] = []; @@ -14,7 +15,8 @@ class:is-success={type === 'success'} class:is-warning={type === 'warning'} class:is-danger={type === 'error'} - class:is-info={type === 'info'}> + class:is-info={type === 'info'} + class:is-inline={isInline}>
{#if dismissible}
+ + diff --git a/src/lib/elements/forms/inputSwitch.svelte b/src/lib/elements/forms/inputSwitch.svelte index 1dc09ec01..f0234a736 100644 --- a/src/lib/elements/forms/inputSwitch.svelte +++ b/src/lib/elements/forms/inputSwitch.svelte @@ -43,6 +43,7 @@
{label}
+
{#if error} diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index fcaabd80f..8ce03665a 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -14,7 +14,9 @@ let selectedTab: string; let rawData: string; - function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment { + function isDeployment( + data: Models.Deployment | Models.Execution + ): data is Models.Deployment { if ('buildId' in data) { selectedTab = 'logs'; rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; @@ -22,7 +24,9 @@ } } - function isExecution(data: Models.Deployment | Models.Execution): data is Models.Execution { + function isExecution( + data: Models.Deployment | Models.Execution + ): data is Models.Execution { if ('trigger' in data) { selectedTab = 'response'; rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; diff --git a/src/lib/stores/logs.ts b/src/lib/stores/logs.ts index 9b9775415..0757da9c2 100644 --- a/src/lib/stores/logs.ts +++ b/src/lib/stores/logs.ts @@ -4,7 +4,7 @@ import { writable } from 'svelte/store'; export const log = writable<{ show: boolean; func: Models.Function; - data: Models.Execution | Models.Deployment; + data: Models.Execution | Models.Deployment; }>({ show: false, func: null, diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte index 1e783436d..ec70c05f3 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte @@ -23,6 +23,8 @@ import CreateDeployment from '../create.svelte'; import type { Models } from '@appwrite.io/console'; import type { PageData } from './$types'; + import Alert from '$lib/components/alert.svelte'; + import { project } from '$routes/console/project-[project]/store'; export let data: PageData; @@ -43,7 +45,7 @@ } }); - function showLogs(execution: Models.Execution) { + function showLogs(execution: Models.Execution) { $log.show = true; $log.func = $func; $log.data = execution; @@ -52,8 +54,22 @@
- Logs + Executions
+ {#if !$func.logging} +
+ + Your execution logs are disabled + + To see the latest execution logs, enable them in your + + Function settings. + +
+ {/if} {#if data.executions.total} 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 ebad1e66c..c47066dc2 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 @@ -13,6 +13,7 @@ import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import { invalidate } from '$app/navigation'; + import UpdateLogging from './updateLogging.svelte'; export let data; @@ -35,6 +36,7 @@ + diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte index 9555b7094..8faa0f55f 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -36,7 +36,8 @@ Array.from($eventSet), $func.schedule || undefined, $func.timeout || undefined, - $func.enabled + $func.enabled, + $func.logging ); await invalidate(Dependencies.FUNCTION); addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte new file mode 100644 index 000000000..518e58924 --- /dev/null +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -0,0 +1,79 @@ + + +
+ + Execution logs +

+ Enable or disable execution logs. We recommend disabling logs when transferring critical + data or for performance reasons. +

+ + + + +

+ When enabled, all execution responses will be accessible in the + Executions tab +

+
+
+
+
+ + + + +
+
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte index 431d12e5f..b46da4aaa 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte @@ -26,7 +26,8 @@ $func.events || undefined, $func.schedule || undefined, $func.timeout || undefined, - $func.enabled + $func.enabled, + $func.logging ); await invalidate(Dependencies.FUNCTION); addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte index 369f936a9..8c8904226 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte @@ -30,7 +30,8 @@ $func.events || undefined, $func.schedule || undefined, $func.timeout || undefined, - $func.enabled + $func.enabled, + $func.logging ); await invalidate(Dependencies.FUNCTION); addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte index 212f343f0..e5d8eb108 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte @@ -26,7 +26,8 @@ $func.events || undefined, functionSchedule, $func.timeout || undefined, - $func.enabled + $func.enabled, + $func.logging ); await invalidate(Dependencies.FUNCTION); addNotification({ diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte index 94489f929..154bd8e1c 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte @@ -26,7 +26,8 @@ $func.events || undefined, $func.schedule || undefined, timeout, - $func.enabled + $func.enabled, + $func.logging ); await invalidate(Dependencies.FUNCTION); addNotification({