From c5086ffff9fde0e7ae287babe51c0a4825c458b7 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 31 Dec 2024 14:21:13 +0530
Subject: [PATCH 1/2] fix: wizard not closing on successful build.

---
 .../sites/(components)/logs.svelte            | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
index 869e3c77a..08aaa0aee 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
@@ -14,8 +14,8 @@
     import ansicolor from 'ansicolor';
     import { onMount } from 'svelte';
 
-    export let deployment: Models.Deployment;
     export let site: Models.Site;
+    export let deployment: Models.Deployment;
 
     let { status, buildLogs } = deployment;
 
@@ -26,12 +26,12 @@
                     `sites.${deployment.resourceId}.deployments.${deployment.$id}.update`
                 )
             ) {
-                console.log(response.payload);
-                // buildLogs = response.payload.logs;
-                // status = response.payload.status;
-                const payload = response.payload as Models.Deployment;
-                buildLogs = payload.buildLogs;
-                status = payload.status;
+                status = response.payload.status;
+                // Models.Deployment has no `logs`, the payload sends `logs` though
+                buildLogs = response.payload.logs;
+
+                console.log(`realtime logs: ${JSON.stringify(response.payload, null, 2)}`);
+
                 if (status === 'ready') {
                     goto(
                         `${base}/project-${$page.params.project}/sites/create-site/finish?site=${site.$id}`
@@ -81,9 +81,10 @@
                   lightCyan: [133, 219, 216]
               };
 
-    function formatLogs(logs: { timestamp: string; content: string }[]) {
+    function formatLogs(logs: { timestamp: string; content: string }[] = []) {
         let output = '';
-        const sum = logs.map((n) => n.content).join('');
+        // TODO: type class needs an update
+        const sum = logs.map((n) => `${n.timestamp} ${n.content}`).join('\n');
         const iterator = ansicolor.parse(sum);
         for (const element of iterator) {
             if (element.color && !element.color.name) output += `<span>${element.text}</span>`;
@@ -94,10 +95,7 @@
 
     async function cancelDeployment() {
         try {
-            await sdk.forProject.functions.updateDeploymentBuild(
-                deployment.resourceId,
-                deployment.$id
-            );
+            await sdk.forProject.sites.updateDeploymentBuild(deployment.resourceId, deployment.$id);
             await invalidate(Dependencies.DEPLOYMENTS);
             addNotification({
                 type: 'success',
@@ -138,7 +136,7 @@
                         <Code lang="text" code={buildLogs.replace(/\\n/g, '\n')} />
                     </div> -->
     <Layout.Stack alignItems="flex-end">
-        {#if status !== 'ready'}
+        {#if ['processing', 'building'].includes(status)}
             <Button size="xs" text on:click={cancelDeployment}>Cancel deployment</Button>
         {/if}
     </Layout.Stack>

From 2ba910158c936d72451f2fd5ee3b5841402dc873 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 2 Jan 2025 13:58:43 +0530
Subject: [PATCH 2/2] address comment.

---
 .../(console)/project-[project]/sites/(components)/logs.svelte  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
index 08aaa0aee..4ae294c95 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
@@ -30,8 +30,6 @@
                 // Models.Deployment has no `logs`, the payload sends `logs` though
                 buildLogs = response.payload.logs;
 
-                console.log(`realtime logs: ${JSON.stringify(response.payload, null, 2)}`);
-
                 if (status === 'ready') {
                     goto(
                         `${base}/project-${$page.params.project}/sites/create-site/finish?site=${site.$id}`