From 03779660555c3ebaa8d834f85d849ec714745e3d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 15:58:01 +0200
Subject: [PATCH 01/13] Type screens

---
 packages/bbui/src/Layout/Layout.svelte                 |  2 +-
 .../[screenId]/_components/ScreenList/index.svelte     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/bbui/src/Layout/Layout.svelte b/packages/bbui/src/Layout/Layout.svelte
index b3de7b49db..61d33e3ab2 100644
--- a/packages/bbui/src/Layout/Layout.svelte
+++ b/packages/bbui/src/Layout/Layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   export let horizontal: boolean = false
   export let paddingX: "S" | "M" | "L" | "XL" | "XXL" = "M"
-  export let paddingY: "S" | "M" | "L" | "XL" | "XXL" = "M"
+  export let paddingY: "none" | "S" | "M" | "L" | "XL" | "XXL" = "M"
   export let noPadding: boolean = false
   export let gap: "XXS" | "XS" | "S" | "M" | "L" | "XL" = "M"
   export let noGap: boolean = false
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
index a5f00f2c7a..893e22244c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
@@ -1,16 +1,17 @@
-<script>
+<script lang="ts">
   import { Layout } from "@budibase/bbui"
   import { sortedScreens } from "@/stores/builder"
   import ScreenNavItem from "./ScreenNavItem.svelte"
   import { goto } from "@roxi/routify"
   import { getVerticalResizeActions } from "@/components/common/resizable"
   import NavHeader from "@/components/common/NavHeader.svelte"
+  import type { Screen } from "@budibase/types"
 
   const [resizable, resizableHandle] = getVerticalResizeActions()
 
   let searching = false
   let searchValue = ""
-  let screensContainer
+  let screensContainer: HTMLDivElement
   let scrolling = false
 
   $: filteredScreens = getFilteredScreens($sortedScreens, searchValue)
@@ -25,13 +26,13 @@
     }
   }
 
-  const getFilteredScreens = (screens, searchValue) => {
+  const getFilteredScreens = (screens: Screen[], searchValue: string) => {
     return screens.filter(screen => {
       return !searchValue || screen.routing.route.includes(searchValue)
     })
   }
 
-  const handleScroll = e => {
+  const handleScroll = (e: any) => {
     scrolling = e.target.scrollTop !== 0
   }
 </script>
@@ -62,7 +63,6 @@
 
   <div
     role="separator"
-    disabled={searching}
     class="divider"
     class:disabled={searching}
     use:resizableHandle

From 474a3bc76ba6248c74dfc2c689b1fefba28d1db4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:01:02 +0200
Subject: [PATCH 02/13] More types

---
 .../src/components/common/NavHeader.svelte       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte
index d83d7f578b..bf9d26f09f 100644
--- a/packages/builder/src/components/common/NavHeader.svelte
+++ b/packages/builder/src/components/common/NavHeader.svelte
@@ -1,15 +1,15 @@
-<script>
+<script lang="ts">
   import { tick } from "svelte"
   import { Icon, Body } from "@budibase/bbui"
   import { keyUtils } from "@/helpers/keyUtils"
 
-  export let title
-  export let placeholder
-  export let value
-  export let onAdd
-  export let search
+  export let title: string
+  export let placeholder: string
+  export let value: string
+  export let onAdd: () => void
+  export let search: boolean
 
-  let searchInput
+  let searchInput: HTMLInputElement
 
   const openSearch = async () => {
     search = true
@@ -22,7 +22,7 @@
     value = ""
   }
 
-  const onKeyDown = e => {
+  const onKeyDown = (e: KeyboardEvent) => {
     if (e.key === "Escape") {
       closeSearch()
     }

From 59fda14c4fe16d2a67b85ccdef05d7567f97e75a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:09:07 +0200
Subject: [PATCH 03/13] More typing

---
 .../design/ScreenDetailsModal.svelte          | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index 410ddee8a9..d7af9d8102 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -1,25 +1,25 @@
-<script>
+<script lang="ts">
   import { ModalContent, Input } from "@budibase/bbui"
   import sanitizeUrl from "@/helpers/sanitizeUrl"
   import { get } from "svelte/store"
   import { screenStore } from "@/stores/builder"
 
-  export let onConfirm
-  export let onCancel
-  export let route
-  export let role
+  export let onConfirm: (_data: { route: string }) => Promise<void>
+  export let onCancel: (() => Promise<void>) | undefined = undefined
+  export let route: string
+  export let role: string | undefined
   export let confirmText = "Continue"
 
   const appPrefix = "/app"
   let touched = false
-  let error
-  let modal
+  let error: string | undefined
+  let modal: ModalContent
 
   $: appUrl = route
     ? `${window.location.origin}${appPrefix}${route}`
     : `${window.location.origin}${appPrefix}`
 
-  const routeChanged = event => {
+  const routeChanged = (event: { detail: string }) => {
     if (!event.detail.startsWith("/")) {
       route = "/" + event.detail
     }
@@ -28,11 +28,11 @@
     if (routeExists(route)) {
       error = "This URL is already taken for this access role"
     } else {
-      error = null
+      error = undefined
     }
   }
 
-  const routeExists = url => {
+  const routeExists = (url: string) => {
     if (!role) {
       return false
     }
@@ -58,7 +58,7 @@
   onConfirm={confirmScreenDetails}
   {onCancel}
   cancelText={"Back"}
-  disabled={!route || error || !touched}
+  disabled={!route || !!error || !touched}
 >
   <form on:submit|preventDefault={() => modal.confirm()}>
     <Input

From 22c25c67a99bc6121f24f57dea3e0401b19ba549 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:15:05 +0200
Subject: [PATCH 04/13] Type scroll context

---
 packages/bbui/src/context.d.ts           | 4 ++--
 packages/bbui/src/types/index.ts         | 1 +
 packages/bbui/src/types/scrollContext.ts | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 packages/bbui/src/types/scrollContext.ts

diff --git a/packages/bbui/src/context.d.ts b/packages/bbui/src/context.d.ts
index c0da577450..de84a0bb0d 100644
--- a/packages/bbui/src/context.d.ts
+++ b/packages/bbui/src/context.d.ts
@@ -1,9 +1,9 @@
-import { ActionMenu } from "./types"
-import { ModalContext } from "./types"
+import { ActionMenu, ModalContext, ScrollContext } from "./types"
 
 declare module "svelte" {
   export function getContext(key: "actionMenu"): ActionMenu | undefined
   export function getContext(key: "bbui-modal"): ModalContext
+  export function getContext(key: "scroll"): ScrollContext
 }
 
 export const Modal = "bbui-modal"
diff --git a/packages/bbui/src/types/index.ts b/packages/bbui/src/types/index.ts
index e191a22a72..86fdcf1231 100644
--- a/packages/bbui/src/types/index.ts
+++ b/packages/bbui/src/types/index.ts
@@ -1,3 +1,4 @@
 export * from "./actionMenu"
 export * from "./envDropdown"
 export * from "./modalContext"
+export * from "./scrollContext"
diff --git a/packages/bbui/src/types/scrollContext.ts b/packages/bbui/src/types/scrollContext.ts
new file mode 100644
index 0000000000..cb88707e6f
--- /dev/null
+++ b/packages/bbui/src/types/scrollContext.ts
@@ -0,0 +1,3 @@
+export interface ScrollContext {
+  scrollTo: (bounds: DOMRect) => void
+}

From bf77de137ade37e76b8c5cd7a011b573cfc2348b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:37:07 +0200
Subject: [PATCH 05/13] Type UserAvatar components

---
 packages/bbui/src/Icon/Icon.svelte            |  2 +-
 .../src/components/UserAvatar.svelte          | 13 +++----
 .../src/components/UserAvatars.svelte         | 35 ++++++++++++-------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte
index c74421a261..f7e101b547 100644
--- a/packages/bbui/src/Icon/Icon.svelte
+++ b/packages/bbui/src/Icon/Icon.svelte
@@ -11,7 +11,7 @@
   export let hoverColor: string | undefined = undefined
   export let tooltip: string | undefined = undefined
   export let tooltipPosition: TooltipPosition = TooltipPosition.Bottom
-  export let tooltipType = TooltipType.Default
+  export let tooltipType: TooltipType = TooltipType.Default
   export let tooltipColor: string | undefined = undefined
   export let tooltipWrap: boolean = true
   export let newStyles: boolean = false
diff --git a/packages/frontend-core/src/components/UserAvatar.svelte b/packages/frontend-core/src/components/UserAvatar.svelte
index bc630ed473..3c1b2d7bee 100644
--- a/packages/frontend-core/src/components/UserAvatar.svelte
+++ b/packages/frontend-core/src/components/UserAvatar.svelte
@@ -1,16 +1,17 @@
-<script>
+<script lang="ts">
   import { Avatar, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { helpers } from "@budibase/shared-core"
+  import type { UIUser } from "@budibase/types"
 
-  export let user
-  export let size = "S"
-  export let tooltipPosition = TooltipPosition.Top
-  export let showTooltip = true
+  export let user: UIUser
+  export let size: "XS" | "S" = "S"
+  export let tooltipPosition: TooltipPosition = TooltipPosition.Top
+  export let showTooltip: boolean = true
 </script>
 
 {#if user}
   <AbsTooltip
-    text={showTooltip ? helpers.getUserLabel(user) : null}
+    text={showTooltip ? helpers.getUserLabel(user) : ""}
     position={tooltipPosition}
     color={helpers.getUserColor(user)}
   >
diff --git a/packages/frontend-core/src/components/UserAvatars.svelte b/packages/frontend-core/src/components/UserAvatars.svelte
index 2399c659cc..eaf4727811 100644
--- a/packages/frontend-core/src/components/UserAvatars.svelte
+++ b/packages/frontend-core/src/components/UserAvatars.svelte
@@ -1,27 +1,31 @@
-<script>
+<script lang="ts">
   import { UserAvatar } from "@budibase/frontend-core"
   import { TooltipPosition, Avatar } from "@budibase/bbui"
+  import type { UIUser } from "@budibase/types"
 
-  export let users = []
-  export let order = "ltr"
-  export let size = "S"
-  export let tooltipPosition = TooltipPosition.Top
+  type OrderType = "ltr" | "rtl"
 
-  $: uniqueUsers = unique(users, order)
+  export let users: UIUser[] = []
+  export let order: OrderType = "ltr"
+  export let size: "XS" | "S" = "S"
+  export let tooltipPosition: TooltipPosition = TooltipPosition.Top
+
+  $: uniqueUsers = unique(users)
   $: avatars = getAvatars(uniqueUsers, order)
 
-  const unique = users => {
-    let uniqueUsers = {}
-    users?.forEach(user => {
+  const unique = (users: UIUser[]) => {
+    const uniqueUsers: Record<string, UIUser> = {}
+    users.forEach(user => {
       uniqueUsers[user.email] = user
     })
     return Object.values(uniqueUsers)
   }
 
-  const getAvatars = (users, order) => {
-    const avatars = users.slice(0, 3)
+  type Overflow = { _id: "overflow"; label: string }
+  const getAvatars = (users: UIUser[], order: OrderType) => {
+    const avatars: (Overflow | UIUser)[] = users.slice(0, 3)
     if (users.length > 3) {
-      const overflow = {
+      const overflow: Overflow = {
         _id: "overflow",
         label: `+${users.length - 3}`,
       }
@@ -31,17 +35,22 @@
         avatars.unshift(overflow)
       }
     }
+
     return avatars.map((user, idx) => ({
       ...user,
       zIndex: order === "ltr" ? idx : uniqueUsers.length - idx,
     }))
   }
+
+  function isUser(value: Overflow | UIUser): value is UIUser {
+    return value._id !== "overflow"
+  }
 </script>
 
 <div class="avatars">
   {#each avatars as user}
     <span style="z-index:{user.zIndex};">
-      {#if user._id === "overflow"}
+      {#if !isUser(user)}
         <Avatar
           {size}
           initials={user.label}

From 5b60bbe2eaffcf2b22b3f3976cec4ee3a820f588 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:45:51 +0200
Subject: [PATCH 06/13] Type NavItem

---
 .../src/components/common/NavItem.svelte      | 59 +++++++++----------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index ea61c8cecf..859f859be7 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -1,46 +1,46 @@
-<script>
+<script lang="ts">
   import { Icon, TooltipType, TooltipPosition } from "@budibase/bbui"
   import { createEventDispatcher, getContext } from "svelte"
-  import { helpers } from "@budibase/shared-core"
   import { UserAvatars } from "@budibase/frontend-core"
+  import type { UIUser } from "@budibase/types"
 
-  export let icon
-  export let iconTooltip
-  export let withArrow = false
-  export let withActions = true
-  export let showActions = false
-  export let indentLevel = 0
-  export let text
-  export let border = true
-  export let selected = false
-  export let opened = false
-  export let draggable = false
-  export let iconText
-  export let iconColor
-  export let scrollable = false
-  export let highlighted = false
-  export let rightAlignIcon = false
-  export let id
-  export let showTooltip = false
-  export let selectedBy = null
-  export let compact = false
-  export let hovering = false
-  export let disabled = false
+  export let icon: string | null
+  export let iconTooltip: string
+  export let withArrow: boolean = false
+  export let withActions: boolean = true
+  export let showActions: boolean = false
+  export let indentLevel: number = 0
+  export let text: string
+  export let border: boolean = true
+  export let selected: boolean = false
+  export let opened: boolean = false
+  export let draggable: boolean = false
+  export let iconText: string
+  export let iconColor: string
+  export let scrollable: boolean = false
+  export let highlighted: boolean = false
+  export let rightAlignIcon: boolean = false
+  export let id: string
+  export let showTooltip: boolean = false
+  export let selectedBy: UIUser[] | null = null
+  export let compact: boolean = false
+  export let hovering: boolean = false
+  export let disabled: boolean = false
 
   const scrollApi = getContext("scroll")
   const dispatch = createEventDispatcher()
 
-  let contentRef
+  let contentRef: HTMLDivElement
 
   $: selected && contentRef && scrollToView()
-  $: style = getStyle(indentLevel, selectedBy)
+  $: style = getStyle(indentLevel)
 
   const onClick = () => {
     scrollToView()
     dispatch("click")
   }
 
-  const onIconClick = e => {
+  const onIconClick = (e: Event) => {
     e.stopPropagation()
     dispatch("iconClick")
   }
@@ -53,11 +53,8 @@
     scrollApi.scrollTo(bounds)
   }
 
-  const getStyle = (indentLevel, selectedBy) => {
+  const getStyle = (indentLevel: number) => {
     let style = `padding-left:calc(${indentLevel * 14}px);`
-    if (selectedBy) {
-      style += `--selected-by-color:${helpers.getUserColor(selectedBy)};`
-    }
     return style
   }
 </script>

From e1e1d9d9e6b46b7a77e985217fef2b131848e2a5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 16:59:13 +0200
Subject: [PATCH 07/13] Extra types

---
 .../src/components/common/NavItem.svelte       |  8 ++++----
 .../ScreenList/ScreenNavItem.svelte            | 18 ++++++++++--------
 .../builder/src/stores/builder/contextMenu.ts  |  9 ++++++---
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 859f859be7..26529fdee4 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -5,7 +5,7 @@
   import type { UIUser } from "@budibase/types"
 
   export let icon: string | null
-  export let iconTooltip: string
+  export let iconTooltip: string = ""
   export let withArrow: boolean = false
   export let withActions: boolean = true
   export let showActions: boolean = false
@@ -15,12 +15,12 @@
   export let selected: boolean = false
   export let opened: boolean = false
   export let draggable: boolean = false
-  export let iconText: string
-  export let iconColor: string
+  export let iconText: string = ""
+  export let iconColor: string = ""
   export let scrollable: boolean = false
   export let highlighted: boolean = false
   export let rightAlignIcon: boolean = false
-  export let id: string
+  export let id: string = ""
   export let showTooltip: boolean = false
   export let selectedBy: UIUser[] | null = null
   export let compact: boolean = false
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
index 6377e1ca33..5588961447 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { Modal, Helpers, notifications, Icon } from "@budibase/bbui"
   import {
     navigationStore,
@@ -14,13 +14,15 @@
   import { makeComponentUnique } from "@/helpers/components"
   import { capitalise } from "@/helpers"
   import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import type { Screen } from "@budibase/types"
+  import type { MenuItem } from "@/stores/builder/contextMenu"
 
   export let screen
 
-  let confirmDeleteDialog
-  let screenDetailsModal
+  let confirmDeleteDialog: ConfirmDialog
+  let screenDetailsModal: Modal
 
-  const createDuplicateScreen = async ({ route }) => {
+  const createDuplicateScreen = async ({ route }: { route: string }) => {
     // Create a dupe and ensure it is unique
     let duplicateScreen = Helpers.cloneDeep(screen)
     delete duplicateScreen._id
@@ -57,7 +59,7 @@
 
   $: noPaste = !$componentStore.componentToPaste
 
-  const pasteComponent = mode => {
+  const pasteComponent = (mode: "inside") => {
     try {
       componentStore.paste(screen.props, mode, screen)
     } catch (error) {
@@ -65,11 +67,11 @@
     }
   }
 
-  const openContextMenu = (e, screen) => {
+  const openContextMenu = (e: MouseEvent, screen: Screen) => {
     e.preventDefault()
     e.stopPropagation()
 
-    const items = [
+    const items: MenuItem[] = [
       {
         icon: "ShowOneLayer",
         name: "Paste inside",
@@ -96,7 +98,7 @@
       },
     ]
 
-    contextMenuStore.open(screen._id, items, { x: e.clientX, y: e.clientY })
+    contextMenuStore.open(screen._id!, items, { x: e.clientX, y: e.clientY })
   }
 </script>
 
diff --git a/packages/builder/src/stores/builder/contextMenu.ts b/packages/builder/src/stores/builder/contextMenu.ts
index dc205c7fea..96701eca45 100644
--- a/packages/builder/src/stores/builder/contextMenu.ts
+++ b/packages/builder/src/stores/builder/contextMenu.ts
@@ -5,10 +5,13 @@ interface Position {
   y: number
 }
 
-interface MenuItem {
-  label: string
+export interface MenuItem {
   icon?: string
-  action: () => void
+  name: string
+  keyBind: string | null
+  visible: boolean
+  disabled: boolean
+  callback: () => void
 }
 
 interface ContextMenuState {

From 9216c1f54d0d80fc8fd5559f8f6e5e71bd694b9f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 17:01:33 +0200
Subject: [PATCH 08/13] Remove unnecessary export

---
 .../[screenId]/_components/ScreenList/ScreenNavItem.svelte     | 3 +--
 packages/builder/src/stores/builder/contextMenu.ts             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
index 5588961447..65353fc314 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
@@ -15,7 +15,6 @@
   import { capitalise } from "@/helpers"
   import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import type { Screen } from "@budibase/types"
-  import type { MenuItem } from "@/stores/builder/contextMenu"
 
   export let screen
 
@@ -71,7 +70,7 @@
     e.preventDefault()
     e.stopPropagation()
 
-    const items: MenuItem[] = [
+    const items = [
       {
         icon: "ShowOneLayer",
         name: "Paste inside",
diff --git a/packages/builder/src/stores/builder/contextMenu.ts b/packages/builder/src/stores/builder/contextMenu.ts
index 96701eca45..2ebed83c46 100644
--- a/packages/builder/src/stores/builder/contextMenu.ts
+++ b/packages/builder/src/stores/builder/contextMenu.ts
@@ -5,7 +5,7 @@ interface Position {
   y: number
 }
 
-export interface MenuItem {
+ interface MenuItem {
   icon?: string
   name: string
   keyBind: string | null

From 15eaac2b043879fa8adb237414798a909fac68d4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 17:10:38 +0200
Subject: [PATCH 09/13] Fix types

---
 packages/client/src/components/app/UserMenu.svelte      | 4 +++-
 packages/frontend-core/src/components/UserAvatar.svelte | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/app/UserMenu.svelte b/packages/client/src/components/app/UserMenu.svelte
index 59d76fcd48..6babba2c58 100644
--- a/packages/client/src/components/app/UserMenu.svelte
+++ b/packages/client/src/components/app/UserMenu.svelte
@@ -42,13 +42,15 @@
   const goToPortal = () => {
     window.location.href = isBuilder ? "/builder/portal/apps" : "/builder/apps"
   }
+
+  $: user = $authStore as User
 </script>
 
 {#if $authStore}
   <ActionMenu align={compact ? "right" : "left"}>
     <svelte:fragment slot="control">
       <div class="container">
-        <UserAvatar user={$authStore} size="M" showTooltip={false} />
+        <UserAvatar {user} size="M" showTooltip={false} />
         {#if !compact}
           <div class="text">
             <div class="name">
diff --git a/packages/frontend-core/src/components/UserAvatar.svelte b/packages/frontend-core/src/components/UserAvatar.svelte
index 3c1b2d7bee..c5023d77ec 100644
--- a/packages/frontend-core/src/components/UserAvatar.svelte
+++ b/packages/frontend-core/src/components/UserAvatar.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { Avatar, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { helpers } from "@budibase/shared-core"
-  import type { UIUser } from "@budibase/types"
+  import type { User } from "@budibase/types"
 
-  export let user: UIUser
-  export let size: "XS" | "S" = "S"
+  export let user: User
+  export let size: "XS" | "S" | "M" = "S"
   export let tooltipPosition: TooltipPosition = TooltipPosition.Top
   export let showTooltip: boolean = true
 </script>

From 8c60888a739fc8fab5f4cd7c170144a16e3a1535 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 30 Apr 2025 17:31:32 +0200
Subject: [PATCH 10/13] Lint

---
 packages/builder/src/stores/builder/contextMenu.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/stores/builder/contextMenu.ts b/packages/builder/src/stores/builder/contextMenu.ts
index 2ebed83c46..43a27f615e 100644
--- a/packages/builder/src/stores/builder/contextMenu.ts
+++ b/packages/builder/src/stores/builder/contextMenu.ts
@@ -5,7 +5,7 @@ interface Position {
   y: number
 }
 
- interface MenuItem {
+interface MenuItem {
   icon?: string
   name: string
   keyBind: string | null

From 4a971771de4a7790a088df125217c8c2effc594e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 1 May 2025 13:54:14 +0100
Subject: [PATCH 11/13] Add option to refresh all data providers

---
 .../actions/RefreshDataProvider.svelte                |  5 ++++-
 packages/client/src/components/ClientApp.svelte       | 10 +++++++++-
 packages/client/src/stores/dataSource.js              | 11 ++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 9cbe4baf7f..81ac8123c9 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
@@ -11,7 +11,10 @@
     $componentStore.selectedComponentId,
     "RefreshDatasource",
     { includeSelf: nested }
-  )
+  ).concat({
+    readableBinding: "All data providers",
+    runtimeBinding: "all",
+  })
 </script>
 
 <div class="root">
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 0c53ff4017..3a4b0c2b64 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -22,6 +22,7 @@
     environmentStore,
     sidePanelStore,
     modalStore,
+    dataSourceStore,
   } from "@/stores"
   import NotificationDisplay from "./overlay/NotificationDisplay.svelte"
   import ConfirmationDisplay from "./overlay/ConfirmationDisplay.svelte"
@@ -47,11 +48,18 @@
   import SnippetsProvider from "./context/SnippetsProvider.svelte"
   import EmbedProvider from "./context/EmbedProvider.svelte"
   import DNDSelectionIndicators from "./preview/DNDSelectionIndicators.svelte"
+  import { ActionTypes } from "@/constants"
 
   // Provide contexts
+  const context = createContextStore()
   setContext("sdk", SDK)
   setContext("component", writable({ id: null, ancestors: [] }))
-  setContext("context", createContextStore())
+  setContext("context", context)
+
+  // Seed context with an action to refresh all datasources
+  context.actions.provideAction("all", ActionTypes.RefreshDatasource, () => {
+    dataSourceStore.actions.refreshAll()
+  })
 
   let dataLoaded = false
   let permissionError = false
diff --git a/packages/client/src/stores/dataSource.js b/packages/client/src/stores/dataSource.js
index cf1e5b83a8..436032ac94 100644
--- a/packages/client/src/stores/dataSource.js
+++ b/packages/client/src/stores/dataSource.js
@@ -115,9 +115,18 @@ export const createDataSourceStore = () => {
     })
   }
 
+  const refreshAll = () => {
+    get(store).forEach(instance => instance.refresh())
+  }
+
   return {
     subscribe: store.subscribe,
-    actions: { registerDataSource, unregisterInstance, invalidateDataSource },
+    actions: {
+      registerDataSource,
+      unregisterInstance,
+      invalidateDataSource,
+      refreshAll,
+    },
   }
 }
 

From bb343e3a1c2d66d6e6cbbf3addbaea2c791405f3 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 2 May 2025 14:29:05 +0100
Subject: [PATCH 12/13] Notify when a request to get a user fails

---
 packages/builder/src/stores/portal/users.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/builder/src/stores/portal/users.ts b/packages/builder/src/stores/portal/users.ts
index 605f8612aa..b282e5af19 100644
--- a/packages/builder/src/stores/portal/users.ts
+++ b/packages/builder/src/stores/portal/users.ts
@@ -13,6 +13,7 @@ import {
   UnsavedUser,
 } from "@budibase/types"
 import { BudiStore } from "../BudiStore"
+import { notifications } from "@budibase/bbui"
 
 interface UserInfo {
   email: string
@@ -43,6 +44,7 @@ class UserStore extends BudiStore<UserState> {
     try {
       return await API.getUser(userId)
     } catch (err) {
+      notifications.error("Error fetching user")
       return null
     }
   }

From bc80a23adc27ef2bb7db9e6f54f4177d88ce0b51 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 5 May 2025 10:57:36 +0200
Subject: [PATCH 13/13] Enable adding oauth2 config when none is yet created

---
 .../src/components/integration/rest/AuthPicker.svelte | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/integration/rest/AuthPicker.svelte b/packages/builder/src/components/integration/rest/AuthPicker.svelte
index fd7773a7d2..5f30019564 100644
--- a/packages/builder/src/components/integration/rest/AuthPicker.svelte
+++ b/packages/builder/src/components/integration/rest/AuthPicker.svelte
@@ -109,13 +109,12 @@
         />
       {/each}
     </List>
-
-    <div>
-      <Button secondary icon="Add" on:click={addOAuth2Configuration}
-        >Add OAuth2</Button
-      >
-    </div>
   {/if}
+  <div>
+    <Button secondary icon="Add" on:click={addOAuth2Configuration}
+      >Add OAuth2</Button
+    >
+  </div>
 </DetailPopover>
 
 <style>