From 2d050a606a017e7745e6cd67b68fe8d452f7be7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 20 Feb 2023 11:00:23 +0100
Subject: [PATCH] Fix sdk changes

---
 package-lock.json          | 15 ++++++++-------
 package.json               |  2 +-
 src/lib/layout/logs.svelte | 37 +++++++++++++++++++++++++++++++------
 src/lib/stores/logs.ts     |  2 +-
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52821597c..c47c3b8dc 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": "^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"
diff --git a/package.json b/package.json
index 266a4d365..505ee8674 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": "^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",
diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 4297e0dc6..0664f5763 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<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>
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.Headers> | Models.Deployment;
 }>({
     show: false,
     func: null,