Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More fixes #10784

Merged
merged 4 commits into from
Jun 5, 2023
Merged

More fixes #10784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a352d85
Fix user avatar in audit logs page
aptkingston Jun 5, 2023
ce7d03f
Fix not being able to navigate away from the design section
aptkingston Jun 5, 2023
86d8aac
Remove log from websocket heartbeat
aptkingston Jun 5, 2023
6b7fe62
Lint
aptkingston Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/builder/src/pages/builder/app/[application]/_layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
35 changes: 1 addition & 34 deletions packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
1 change: 0 additions & 1 deletion packages/server/src/websockets/websocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down