Fix sdk changes

This commit is contained in:
Matej Bačo
2023-02-20 11:00:23 +01:00
parent d64fc2c3f9
commit 2d050a606a
4 changed files with 41 additions and 15 deletions
+8 -7
View File
@@ -9,7 +9,7 @@
"version": "0.0.1",
"dependencies": {
"@analytics/google-analytics": "^1.0.5",
"@aw-labs/appwrite-console": "^13.1.0",
"@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.0",
"@aw-labs/icons": "0.0.0-77",
"@aw-labs/ui": "0.0.0-77",
"@popperjs/core": "^2.11.6",
@@ -145,9 +145,10 @@
"integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g=="
},
"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"
@@ -7740,9 +7741,9 @@
"integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g=="
},
"@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==",
"version": "npm:matej-appwrite-console@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==",
"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": "^13.1.0",
"@aw-labs/appwrite-console": "npm:matej-appwrite-console@7.1.0",
"@aw-labs/icons": "0.0.0-77",
"@aw-labs/ui": "0.0.0-77",
"@popperjs/core": "^2.11.6",
+31 -6
View File
@@ -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<Models.Headers>
): 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<Models.Headers>
): data is Models.Execution<Models.Headers> {
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}`;
@@ -153,7 +157,6 @@
</div>
<div class="status u-margin-inline-start-auto">
<Status status={$log.data.status}>{$log.data.status}</Status>
<time>{calculateTime($log.data.duration)}</time>
</div>
</div>
@@ -164,6 +167,11 @@
on:click={() => (selectedTab = 'response')}>
Response
</Tab>
<Tab
selected={selectedTab === 'headers'}
on:click={() => (selectedTab = 'headers')}>
Headers
</Tab>
<Tab
selected={selectedTab === 'logs'}
on:click={() => (selectedTab = 'logs')}>
@@ -174,6 +182,11 @@
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">
@@ -191,15 +204,27 @@
</header>
{#if selectedTab === 'logs'}
<code class="code-panel-content">
{$log.data.stdout ?? 'No logs recorded'}
{$log.data.stdout ?? $log.data.logs ?? 'No logs recorded'}
</code>
{:else if selectedTab === 'errors'}
<code class="code-panel-content">
{$log.data.stderr ?? 'No errors recorded'}
{$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'}
</code>
{:else if selectedTab === 'statusCode'}
<code class="code-panel-content">
{$log.data.statusCode ?? 'No status code recorded'}
</code>
{:else}
<code class="code-panel-content">
{$log.data.response ?? 'No response recorded'}
{$log.data.response ??
$log.data.body ??
'No response body recorded'}
</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.Deployment;
data: Models.Execution<Models.Headers> | Models.Deployment;
}>({
show: false,
func: null,