Support new execution model

This commit is contained in:
Matej Bačo
2023-02-27 11:41:55 +01:00
parent 007bcc5142
commit 7d9b976cc6
4 changed files with 36 additions and 40 deletions
+7 -7
View File
@@ -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"
+1 -1
View File
@@ -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",
+27 -31
View File
@@ -14,9 +14,7 @@
let selectedTab: string;
let rawData: string;
function isDeployment(
data: Models.Deployment | Models.Execution<Models.Headers>
): 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<Models.Headers>
): data is Models.Execution<Models.Headers> {
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 @@
<div class="tabs u-margin-block-start-48 u-sep-block-end">
<Tabs>
<Tab
selected={selectedTab === 'response'}
on:click={() => (selectedTab = 'response')}>
Response
selected={selectedTab === 'method'}
on:click={() => (selectedTab = 'method')}>
Method
</Tab>
<Tab
selected={selectedTab === 'headers'}
on:click={() => (selectedTab = 'headers')}>
Headers
selected={selectedTab === 'path'}
on:click={() => (selectedTab = 'path')}>
Path and query
</Tab>
<Tab
selected={selectedTab === 'agent'}
on:click={() => (selectedTab = 'agent')}>
Agent
</Tab>
<Tab
selected={selectedTab === 'logs'}
@@ -182,11 +183,6 @@
on:click={() => (selectedTab = 'errors')}>
Errors
</Tab>
<Tab
selected={selectedTab === 'statusCode'}
on:click={() => (selectedTab = 'statusCode')}>
Status Code
</Tab>
</Tabs>
</div>
<div class="theme-dark u-stretch u-margin-block-start-32 u-overflow-hidden">
@@ -204,27 +200,27 @@
</header>
{#if selectedTab === 'logs'}
<code class="code-panel-content">
{$log.data.stdout ?? $log.data.logs ?? 'No logs recorded'}
{$log.data.stdout ?? $log.data.logs ?? 'No logs.'}
</code>
{:else if selectedTab === 'errors'}
<code class="code-panel-content">
{$log.data.stderr ?? $log.data.errors ?? 'No errors recorded'}
</code>
{:else if selectedTab === 'headers'}
<code class="code-panel-content">
{$log.data.headers
? JSON.stringify($log.data.headers, null, 4)
: 'No headers recorded'}
{$log.data.stderr ?? $log.data.errors ?? 'No errors.'}
</code>
{:else if selectedTab === 'statusCode'}
<code class="code-panel-content">
{$log.data.statusCode ?? 'No status code recorded'}
{$log.data.statusCode ?? 'No response status code.'}
</code>
{:else}
{:else if selectedTab === 'method'}
<code class="code-panel-content">
{$log.data.response ??
$log.data.body ??
'No response body recorded'}
{$log.data.method ?? 'No request method.'}
</code>
{:else if selectedTab === 'agent'}
<code class="code-panel-content">
{$log.data.agent ?? 'No request agent.'}
</code>
{:else if selectedTab === 'path'}
<code class="code-panel-content">
{$log.data.path ?? 'No request path.'}
</code>
{/if}
</section>
+1 -1
View File
@@ -4,7 +4,7 @@ import { writable } from 'svelte/store';
export const log = writable<{
show: boolean;
func: Models.Function;
data: Models.Execution<Models.Headers> | Models.Deployment;
data: Models.Execution | Models.Deployment;
}>({
show: false,
func: null,