diff --git a/package-lock.json b/package-lock.json index e62b412ee..8428c418d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@analytics/google-analytics": "^1.0.5", "@appwrite.io/pink": "^0.0.4", - "@aw-labs/appwrite-console": "^13.1.0", + "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", "@sentry/tracing": "^7.36.0", @@ -161,9 +161,10 @@ "integrity": "sha512-GFOodekDck6xX7OAZuI1mo7F87ThEZ9Gt0xMsgTR79zkWcnBRq0+J89pFWRPAtFNEVMPQLVHuu6s8S4UleHwtQ==" }, "node_modules/@aw-labs/appwrite-console": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@aw-labs/appwrite-console/-/appwrite-console-13.1.0.tgz", - "integrity": "sha512-1FyKke5b3vx+D3VfNYd3YnFhzUOlsj9bD+KTRLWA4WRItb55thFVZJMWQQ4XnZtDiLPuJAn2XjbMSfMr+9XYwg==", + "name": "matej-appwrite-console", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.0.tgz", + "integrity": "sha512-Cr9nm3UAJjdzxk8tiN6YQo2SN/QdyCD5gK4vbkZaG/gLwthL0Oz6n2FkSrzENmqJsg3BCLvSgjyEcZN4i+xG+g==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index 5bcbe6ed6..c1c5840e5 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "@analytics/google-analytics": "^1.0.5", "@appwrite.io/pink": "^0.0.4", - "@aw-labs/appwrite-console": "^13.1.0", + "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.0", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.36.0", "@sentry/tracing": "^7.36.0", diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 314ec302e..9ebe86392 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 = `${sdkForConsole.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 = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; @@ -196,15 +200,24 @@ {#if selectedTab === 'logs'} - {$log.data.stdout ? $log.data.stdout : 'No logs recorded'} + {$log.data.logs ? $log.data.logs : 'No logs recorded'} {:else if selectedTab === 'errors'} - {$log.data.stderr ? $log.data.stderr : 'No errors recorded'} + {$log.data.errors ? $log.data.errors : 'No errors recorded'} {:else} - {$log.data.response ? $log.data.response : 'No response recorded'} + STATUS CODE:
+ {$log.data.statusCode} +

+ BODY:
+ {$log.data.body ? $log.data.body : 'No response body recorded'} +

+ HEADERS:
+ {$log.data.headers + ? JSON.stringify($log.data.headers, null, 4) + : 'No response headers recorded'}
{/if} diff --git a/src/lib/stores/logs.ts b/src/lib/stores/logs.ts index 7fd421a6e..97357c0af 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]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte index d426d0a33..6ab795983 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte @@ -44,7 +44,7 @@ } }); - function showLogs(execution: Models.Execution) { + function showLogs(execution: Models.Execution) { $log.show = true; $log.func = $func; $log.data = execution;