From d87e9437502e7bbc36e1dc37f3d0d4e45b6686a2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 5 Jun 2023 11:13:24 +0100
Subject: [PATCH 1/4] Fix user avatar in audit logs page

---
 .../auditLogs/_components/UserRenderer.svelte | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 22c35f9b6d..b655eac697 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -1,42 +1,9 @@
 <script>
-  import { Tooltip } from "@budibase/bbui"
   import { UserAvatar } from "@budibase/frontend-core"
 
   export let row
-
-  let showTooltip
 </script>
 
 {#if row?.user?.email}
-  <div
-    class="container"
-    on:mouseover={() => (showTooltip = true)}
-    on:focus={() => (showTooltip = true)}
-    on:mouseleave={() => (showTooltip = false)}
-  >
-    <UserAvatar user={row.user} />
-  </div>
-  {#if showTooltip}
-    <div class="tooltip">
-      <Tooltip textWrapping text={row.user.email} direction="bottom" />
-    </div>
-  {/if}
+  <UserAvatar user={row.user} />
 {/if}
-
-<style>
-  .container {
-    position: relative;
-  }
-  .tooltip {
-    z-index: 1;
-    position: absolute;
-    top: 75%;
-    left: 120%;
-    transform: translateX(-100%) translateY(-50%);
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    width: 130px;
-    pointer-events: none;
-  }
-</style>

From 29968df6d96215e4f2266e25d024d92b81669feb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 5 Jun 2023 11:55:18 +0100
Subject: [PATCH 2/4] Fix not being able to navigate away from the design
 section

---
 .../src/pages/builder/app/[application]/_layout.svelte    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 4da0da44f9..0f491ead70 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -15,7 +15,7 @@
   } from "@budibase/bbui"
   import AppActions from "components/deploy/AppActions.svelte"
   import { API } from "api"
-  import { isActive, goto, layout, redirect } from "@roxi/routify"
+  import { isActive, goto, layout, redirect, url } from "@roxi/routify"
   import { capitalise } from "helpers"
   import { onMount, onDestroy } from "svelte"
   import CommandPalette from "components/commandPalette/CommandPalette.svelte"
@@ -126,7 +126,11 @@
   })
 
   onDestroy(() => {
-    store.actions.reset()
+    // Run async on a slight delay to let other cleanup logic run without
+    // being confused by the store wiping
+    setTimeout(() => {
+      store.actions.reset()
+    }, 10)
   })
 </script>
 

From f7e21c33488e51e46e6564d1e5fe9b2d7b05fef7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 5 Jun 2023 11:55:45 +0100
Subject: [PATCH 3/4] Remove log from websocket heartbeat

---
 packages/server/src/websockets/websocket.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts
index d9c105d77c..3bf9f27416 100644
--- a/packages/server/src/websockets/websocket.ts
+++ b/packages/server/src/websockets/websocket.ts
@@ -92,7 +92,6 @@ export class BaseSocket {
       this.io.on("connection", async socket => {
         // Add built in handler for heartbeats
         socket.on(SocketEvent.Heartbeat, async () => {
-          console.log(socket.data.email, "heartbeat received")
           await this.extendSessionTTL(socket.data.sessionId)
         })
 

From 6de83a6ab4e831e432ac5d27d0f868a1dfd5c3ef Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 5 Jun 2023 11:57:36 +0100
Subject: [PATCH 4/4] Lint

---
 .../builder/src/pages/builder/app/[application]/_layout.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 0f491ead70..f13aa3dab6 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -15,7 +15,7 @@
   } from "@budibase/bbui"
   import AppActions from "components/deploy/AppActions.svelte"
   import { API } from "api"
-  import { isActive, goto, layout, redirect, url } from "@roxi/routify"
+  import { isActive, goto, layout, redirect } from "@roxi/routify"
   import { capitalise } from "helpers"
   import { onMount, onDestroy } from "svelte"
   import CommandPalette from "components/commandPalette/CommandPalette.svelte"