From 191ceeec3edd35c322d6255775ce7c6c576f2f11 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Mar 2025 15:47:00 +0100 Subject: [PATCH] feat: logging --- src/lib/components/logs/index.ts | 2 + src/lib/components/logs/loggingAlert.svelte | 26 ++++ .../components/logs/logsRequest.svelte} | 0 .../components/logs/logsResponse.svelte} | 43 +++--- .../executions/+page.svelte | 13 +- .../executions/sheet.svelte | 6 +- .../executions/table.svelte | 3 +- .../function-[function]/settings/+page.svelte | 2 +- .../settings/updateLogging.svelte | 73 +++++------ .../settings/updateInstallations.svelte | 6 +- .../logs/(components)/LogsRequest.svelte | 124 ------------------ .../logs/(components)/LogsResponse.svelte | 119 ----------------- .../sites/site-[site]/logs/sheet.svelte | 6 +- .../sites/site-[site]/settings/+page.svelte | 2 + .../site-[site]/settings/updateLogging.svelte | 67 ++++++++++ 15 files changed, 169 insertions(+), 323 deletions(-) create mode 100644 src/lib/components/logs/index.ts create mode 100644 src/lib/components/logs/loggingAlert.svelte rename src/{routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte => lib/components/logs/logsRequest.svelte} (100%) rename src/{routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte => lib/components/logs/logsResponse.svelte} (80%) delete mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte delete mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte create mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte diff --git a/src/lib/components/logs/index.ts b/src/lib/components/logs/index.ts new file mode 100644 index 000000000..588612d36 --- /dev/null +++ b/src/lib/components/logs/index.ts @@ -0,0 +1,2 @@ +export { default as LogsRequest } from './logsRequest.svelte'; +export { default as LogsResponse } from './logsResponse.svelte'; diff --git a/src/lib/components/logs/loggingAlert.svelte b/src/lib/components/logs/loggingAlert.svelte new file mode 100644 index 000000000..fc4018cd2 --- /dev/null +++ b/src/lib/components/logs/loggingAlert.svelte @@ -0,0 +1,26 @@ + + +{#if product === 'site'} + + To view logs and errors, enable them in your + + site settings. + +{:else if product === 'function'} + + To view execution logs and errors, enable them in your + + function settings. + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte b/src/lib/components/logs/logsRequest.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte rename to src/lib/components/logs/logsRequest.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte b/src/lib/components/logs/logsResponse.svelte similarity index 80% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte rename to src/lib/components/logs/logsResponse.svelte index 9a082779d..c75e93b47 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte +++ b/src/lib/components/logs/logsResponse.svelte @@ -14,9 +14,11 @@ Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import LoggingAlert from './loggingAlert.svelte'; export let selectedLog: Models.Execution; - + export let product: 'site' | 'function'; + export let logging: boolean; let responseTab: 'logs' | 'errors' | 'headers' | 'body' = 'logs'; onMount(() => { @@ -37,12 +39,14 @@ on:click={() => (responseTab = 'logs')}> Logs - (responseTab = 'errors')}> - Errors - + {#if product !== 'site'} + (responseTab = 'errors')}> + Errors + + {/if} - - (responseTab = 'body')}> - Body - + {#if product !== 'site'} + (responseTab = 'body')}> + Body + + {/if} {#if responseTab === 'logs'} + {#if !logging} + + {/if} {#if selectedLog.logs} {:else} @@ -72,6 +80,9 @@ {/if} {:else if responseTab === 'errors'} + {#if !logging} + + {/if} {#if selectedLog.errors} {:else} @@ -120,8 +131,8 @@ {:else} - Body data is not captured by Appwrite for your user's security and privacy. To + + Body data is not captured by Appwrite for your user's security and privacy. To display body data in the Logs tab, use . - {#if !data.func.logging} -
- - To view execution logs and errors, enable them in your - - Function settings. - -
- {/if} {#if data?.executions?.total} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte index 6657a6fc0..42248ac4a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte @@ -19,12 +19,12 @@ import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; import { logStatusConverter } from './store'; - import LogsResponse from './(components)/LogsResponse.svelte'; - import LogsRequest from './(components)/LogsRequest.svelte'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; export let open = false; export let selectedLogId: string; export let logs: Models.Execution[]; + export let logging: boolean; function nextLog() { const currentIndex = logs.findIndex((log) => log.$id === selectedLogId); @@ -160,7 +160,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte index 0fe896442..3d82af0c9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte @@ -9,6 +9,7 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { logStatusConverter } from './store'; import DualTimeView from '$lib/components/dualTimeView.svelte'; + import { func } from '../store'; export let columns: Column[]; export let logs: Models.ExecutionList; @@ -82,4 +83,4 @@ {/each} - + 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 0db9d6895..0d1468222 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 @@ -108,7 +108,7 @@ - + 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 index 76d235655..a5a92f00a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -1,60 +1,49 @@ -
+ Execution logs - + - When disabled, execution logs and errors will not be shown in the - Executions tab. We recommend disabling them for better performance in production. + When disabled, executions will exclude logs and errors, and will be slightly faster. - + diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte index aa1df9886..955d3e280 100644 --- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte @@ -96,7 +96,11 @@ + columns={[ + { id: 'repo', width: { min: 150, max: 500 } }, + { id: 'updated', width: { min: 150, max: 500 } }, + { id: 'actions', width: 60 } + ]}> Repository Updated diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte deleted file mode 100644 index 2c6ff7f40..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - (requestTab = 'parameters')}> - Parameters - - - (requestTab = 'headers')}> - Headers - - - - - {#if requestTab === 'parameters'} - {#if parameters?.length} - - - Key - Value - - {#each parameters as parameter} - - {parameter.name} - {parameter.value} - - {/each} - - {:else} - - No parameters found. - - {/if} - {:else if requestTab === 'headers'} - {#if selectedLog.requestHeaders?.length} - - - Key - Value - - {#each selectedLog.requestHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte deleted file mode 100644 index 94cd2b55e..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - (responseTab = 'logs')}> - Logs - - - (responseTab = 'headers')}> - Headers - - - - - - {#if responseTab === 'logs'} - {#if selectedLog.logs} - - {:else} - - No logs found. - - {/if} - {:else if responseTab === 'errors'} - {#if selectedLog.errors} - - {:else} - - No errors found. - - {/if} - {:else if responseTab === 'headers'} - {#if selectedLog.responseHeaders?.length} - - - Key - Value - - {#each selectedLog.responseHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {:else if responseTab === 'body'} - {#if selectedLog.responseBody} - - {:else} - - No parameters found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte index d50a824b3..63979f208 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte @@ -14,10 +14,10 @@ Typography } from '@appwrite.io/pink-svelte'; import { timeFromNow } from '$lib/helpers/date'; - import LogsRequest from './(components)/LogsRequest.svelte'; - import LogsResponse from './(components)/LogsResponse.svelte'; import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; + import { site } from '../store'; export let open = false; export let selectedLogId: string; @@ -127,7 +127,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte index 676d1c3a0..78493460f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte @@ -15,6 +15,7 @@ import { isCloud } from '$lib/system'; import UpdateResourceLimits from './updateResourceLimits.svelte'; import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateLogging from './updateLogging.svelte'; export let data; @@ -74,5 +75,6 @@ {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte new file mode 100644 index 000000000..768437b05 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte @@ -0,0 +1,67 @@ + + +
+ + Execution logs + + + + When disabled, request logs will exclude logs and errors, and site responses will be + slightly faster. + + + + + + + +