diff --git a/package-lock.json b/package-lock.json index 354542545..617a11671 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@analytics/google-analytics": "^1.0.5", - "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.3", + "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.4", "@aw-labs/icons": "0.0.0-77", "@aw-labs/ui": "0.0.0-77", "@popperjs/core": "^2.11.6", @@ -146,9 +146,9 @@ }, "node_modules/@aw-labs/appwrite-console": { "name": "matej-appwrite-console", - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.3.tgz", - "integrity": "sha512-ePg3yvL/hfFhS0RS2CEHwdRz+QJXwHPCkeOa/0Q2V891YYJQe78OU5E8T05Nij7pxIfEBhIMyc2xjgtRsEIktw==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.4.tgz", + "integrity": "sha512-Fhph0Mc/TEUZ++5u5sFIbTFQO8GYvAo9CEzo8N7SpyZ/AtSOcp+/bw3xqD7tSyVJdbopviuytO6YLwblSAZJuw==", "dependencies": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" @@ -7741,9 +7741,9 @@ "integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g==" }, "@aw-labs/appwrite-console": { - "version": "npm:matej-appwrite-console@7.1.3", - "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.3.tgz", - "integrity": "sha512-ePg3yvL/hfFhS0RS2CEHwdRz+QJXwHPCkeOa/0Q2V891YYJQe78OU5E8T05Nij7pxIfEBhIMyc2xjgtRsEIktw==", + "version": "npm:matej-appwrite-console@7.1.4", + "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.4.tgz", + "integrity": "sha512-Fhph0Mc/TEUZ++5u5sFIbTFQO8GYvAo9CEzo8N7SpyZ/AtSOcp+/bw3xqD7tSyVJdbopviuytO6YLwblSAZJuw==", "requires": { "cross-fetch": "3.1.5", "isomorphic-form-data": "2.0.0" diff --git a/package.json b/package.json index 268f1c6e3..5f8cc602b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "@analytics/google-analytics": "^1.0.5", "analytics": "^0.8.1", - "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.3", + "@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.4", "@aw-labs/icons": "0.0.0-77", "@aw-labs/ui": "0.0.0-77", "@popperjs/core": "^2.11.6", diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 0664f5763..b25daf24d 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -14,9 +14,7 @@ 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}`; @@ -24,11 +22,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'; + selectedTab = 'logs'; rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } @@ -163,14 +159,19 @@
(selectedTab = 'response')}> - Response + selected={selectedTab === 'method'} + on:click={() => (selectedTab = 'method')}> + Method (selectedTab = 'headers')}> - Headers + selected={selectedTab === 'path'} + on:click={() => (selectedTab = 'path')}> + Path and query + + (selectedTab = 'agent')}> + Agent (selectedTab = 'errors')}> Errors - (selectedTab = 'statusCode')}> - Status Code -
@@ -204,27 +200,27 @@ {#if selectedTab === 'logs'} - {$log.data.stdout ?? $log.data.logs ?? 'No logs recorded'} + {$log.data.stdout ?? $log.data.logs ?? 'No logs.'} {:else if selectedTab === 'errors'} - {$log.data.stderr ?? $log.data.errors ?? 'No errors recorded'} - - {:else if selectedTab === 'headers'} - - {$log.data.headers - ? JSON.stringify($log.data.headers, null, 4) - : 'No headers recorded'} + {$log.data.stderr ?? $log.data.errors ?? 'No errors.'} {:else if selectedTab === 'statusCode'} - {$log.data.statusCode ?? 'No status code recorded'} + {$log.data.statusCode ?? 'No response status code.'} - {:else} + {:else if selectedTab === 'method'} - {$log.data.response ?? - $log.data.body ?? - 'No response body recorded'} + {$log.data.method ?? 'No request method.'} + + {:else if selectedTab === 'agent'} + + {$log.data.agent ?? 'No request agent.'} + + {:else if selectedTab === 'path'} + + {$log.data.path ?? 'No request path.'} {/if} diff --git a/src/lib/stores/logs.ts b/src/lib/stores/logs.ts index 97357c0af..7fd421a6e 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,