From 84a1ccfc4c8776685da057540b3f77c96d21a9c1 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Feb 2025 14:59:04 +0000
Subject: [PATCH 01/42] Fixing an issue with scrollbar always appearing on end
 user portal.

---
 packages/bbui/src/Layout/Page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte
index e469927e60..e8dad8bc38 100644
--- a/packages/bbui/src/Layout/Page.svelte
+++ b/packages/bbui/src/Layout/Page.svelte
@@ -47,7 +47,7 @@
     overflow-x: hidden;
   }
   .main {
-    overflow-y: scroll;
+    overflow-y: auto;
   }
   .content {
     display: flex;

From f5a7e5bf4951c5c1cc62adfb88f2d51b291fdfb4 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Feb 2025 15:34:30 +0000
Subject: [PATCH 02/42] Fixing app count in user page.

---
 .../src/pages/builder/portal/users/users/index.svelte |  2 +-
 packages/shared-core/src/sdk/documents/users.ts       | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index c77e40c964..6a1facfd01 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -128,7 +128,7 @@
           $auth.user?.email === user.email
             ? false
             : true,
-        apps: [...new Set(Object.keys(user.roles))],
+        apps: sdk.users.userAppAccessList(user, $groups),
         access: role.sortOrder,
       }
     })
diff --git a/packages/shared-core/src/sdk/documents/users.ts b/packages/shared-core/src/sdk/documents/users.ts
index 17aa8a1e58..c4f1a16025 100644
--- a/packages/shared-core/src/sdk/documents/users.ts
+++ b/packages/shared-core/src/sdk/documents/users.ts
@@ -4,6 +4,7 @@ import {
   SEPARATOR,
   User,
   InternalTable,
+  UserGroup,
 } from "@budibase/types"
 import { getProdAppID } from "./applications"
 import * as _ from "lodash/fp"
@@ -129,3 +130,13 @@ export function containsUserID(value: string | undefined): boolean {
   }
   return value.includes(`${DocumentType.USER}${SEPARATOR}`)
 }
+
+export function userAppAccessList(user: User, groups?: UserGroup[]) {
+  const userGroups =
+    groups?.filter(group => group.users?.find(u => u._id === user._id)) || []
+  const userGroupApps = userGroups.flatMap(userGroup =>
+    Object.keys(userGroup.roles || {})
+  )
+  const fullList = [...Object.keys(user.roles), ...userGroupApps]
+  return [...new Set(fullList)]
+}

From a1589b0dc05af57d65aa9ac6dda7dd81d3ea814f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Feb 2025 18:07:01 +0000
Subject: [PATCH 03/42] Adding group badges to users.

---
 packages/bbui/src/Badge/Badge.svelte                     | 2 ++
 .../[application]/_components/BuilderSidePanel.svelte    | 5 +++++
 packages/shared-core/src/sdk/documents/users.ts          | 9 +++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/bbui/src/Badge/Badge.svelte b/packages/bbui/src/Badge/Badge.svelte
index e4ec7d4f33..03aa544dfe 100644
--- a/packages/bbui/src/Badge/Badge.svelte
+++ b/packages/bbui/src/Badge/Badge.svelte
@@ -11,6 +11,7 @@
   export let active = false
   export let inactive = false
   export let hoverable = false
+  export let customColor = null
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -29,6 +30,7 @@
   class:spectrum-Label--seafoam={seafoam}
   class:spectrum-Label--active={active}
   class:spectrum-Label--inactive={inactive}
+  style={customColor ? `background-color: ${customColor};` : ""}
 >
   <slot />
 </span>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 2260892913..5b1bf852aa 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -13,6 +13,7 @@
     FancyInput,
     Button,
     FancySelect,
+    Badge,
   } from "@budibase/bbui"
   import { builderStore, appStore, roles, appPublished } from "@/stores/builder"
   import {
@@ -741,11 +742,15 @@
                 <div class="auth-entity-access-title">Access</div>
               </div>
               {#each allUsers as user}
+                {@const userGroups = sdk.users.getUserGroups(user, $groups)}
                 <div class="auth-entity">
                   <div class="details">
                     <div class="user-email" title={user.email}>
                       {user.email}
                     </div>
+                    {#each userGroups as group}
+                      <Badge size="S" customColor={group.color}>{group.name}</Badge>
+                    {/each}
                   </div>
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
diff --git a/packages/shared-core/src/sdk/documents/users.ts b/packages/shared-core/src/sdk/documents/users.ts
index c4f1a16025..8b5abfd822 100644
--- a/packages/shared-core/src/sdk/documents/users.ts
+++ b/packages/shared-core/src/sdk/documents/users.ts
@@ -131,9 +131,14 @@ export function containsUserID(value: string | undefined): boolean {
   return value.includes(`${DocumentType.USER}${SEPARATOR}`)
 }
 
-export function userAppAccessList(user: User, groups?: UserGroup[]) {
-  const userGroups =
+export function getUserGroups(user: User, groups?: UserGroup[]) {
+  return (
     groups?.filter(group => group.users?.find(u => u._id === user._id)) || []
+  )
+}
+
+export function userAppAccessList(user: User, groups?: UserGroup[]) {
+  const userGroups = getUserGroups(user, groups)
   const userGroupApps = userGroups.flatMap(userGroup =>
     Object.keys(userGroup.roles || {})
   )

From f7d216c188562cf793673e04d3a17e5face33264 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 24 Feb 2025 18:08:20 +0000
Subject: [PATCH 04/42] Setting override placeholder.

---
 .../app/[application]/_components/BuilderSidePanel.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 5b1bf852aa..a9d3bb70ba 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -755,7 +755,7 @@
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
                       footer={getRoleFooter(user)}
-                      placeholder={false}
+                      placeholder={userGroups?.length ? "Override" : false}
                       value={parseRole(user)}
                       allowRemove={user.role && !user.group}
                       allowPublic={false}

From b7f34b5f57408c111f2165301e21486fe3d34492 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 25 Feb 2025 10:45:50 +0000
Subject: [PATCH 05/42] Changing how badges are displayed.

---
 .../_components/BuilderSidePanel.svelte       | 27 ++++++++++++++-----
 .../shared-core/src/sdk/documents/users.ts    | 12 +++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index a9d3bb70ba..8136dd256c 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -742,15 +742,19 @@
                 <div class="auth-entity-access-title">Access</div>
               </div>
               {#each allUsers as user}
-                {@const userGroups = sdk.users.getUserGroups(user, $groups)}
+                {@const userGroups = sdk.users.getUserAppGroups($appStore.appId, user, $groups)}
                 <div class="auth-entity">
                   <div class="details">
-                    <div class="user-email" title={user.email}>
-                      {user.email}
+                    <div class="user-groups">
+                      <div class="user-email" title={user.email}>
+                        {user.email}
+                      </div>
+                      <div class="group-badges">
+                        {#each userGroups as group}
+                          <Badge size="S" customColor={group.color}>{group.name}</Badge>
+                        {/each}
+                      </div>
                     </div>
-                    {#each userGroups as group}
-                      <Badge size="S" customColor={group.color}>{group.name}</Badge>
-                    {/each}
                   </div>
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
@@ -1053,4 +1057,15 @@
   .alert {
     padding: 0 var(--spacing-xl);
   }
+
+  .user-groups {
+    display: flex;
+    flex-direction: column;
+  }
+  .group-badges {
+    padding-top: var(--spacing-s);
+    display: flex;
+    gap: var(--spacing-s);
+    flex-wrap: wrap;
+  }
 </style>
diff --git a/packages/shared-core/src/sdk/documents/users.ts b/packages/shared-core/src/sdk/documents/users.ts
index 8b5abfd822..d2ee2dec00 100644
--- a/packages/shared-core/src/sdk/documents/users.ts
+++ b/packages/shared-core/src/sdk/documents/users.ts
@@ -137,6 +137,18 @@ export function getUserGroups(user: User, groups?: UserGroup[]) {
   )
 }
 
+export function getUserAppGroups(
+  appId: string,
+  user: User,
+  groups?: UserGroup[]
+) {
+  const prodAppId = getProdAppID(appId)
+  const userGroups = getUserGroups(user, groups)
+  return userGroups.filter(group =>
+    Object.keys(group.roles || {}).find(app => app === prodAppId)
+  )
+}
+
 export function userAppAccessList(user: User, groups?: UserGroup[]) {
   const userGroups = getUserGroups(user, groups)
   const userGroupApps = userGroups.flatMap(userGroup =>

From fd100c3ec4d491abd35093c395511978a63e120b Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Feb 2025 11:37:26 +0000
Subject: [PATCH 06/42] typescript conversions of bbui components

---
 packages/bbui/src/Form/Checkbox.svelte        | 22 +++---
 packages/bbui/src/Link/Link.svelte            |  2 +-
 .../bbui/src/Stores/{banner.js => banner.ts}  | 37 +++++++---
 .../{notifications.js => notifications.ts}    | 41 ++++++++---
 packages/bbui/src/Table/ArrayRenderer.svelte  |  4 +-
 .../bbui/src/Table/AttachmentRenderer.svelte  | 10 +--
 packages/bbui/src/Table/BoldRenderer.svelte   |  4 +-
 .../bbui/src/Table/BooleanRenderer.svelte     |  4 +-
 packages/bbui/src/Table/CellRenderer.svelte   | 20 ++---
 packages/bbui/src/Table/CodeRenderer.svelte   |  4 +-
 .../bbui/src/Table/DateTimeRenderer.svelte    |  8 +-
 .../bbui/src/Table/InternalRenderer.svelte    |  6 +-
 .../src/Table/RelationshipRenderer.svelte     | 10 +--
 .../bbui/src/Table/SelectEditRenderer.svelte  | 12 +--
 packages/bbui/src/Table/StringRenderer.svelte |  6 +-
 packages/bbui/src/Tabs/Tabs.svelte            | 73 +++++++++++++------
 packages/bbui/src/Tags/Tag.svelte             | 12 +--
 packages/bbui/src/Tags/Tags.svelte            |  2 +-
 .../bbui/src/Tooltip/TooltipWrapper.svelte    |  8 +-
 packages/bbui/src/TreeView/Item.svelte        | 12 +--
 packages/bbui/src/TreeView/Tree.svelte        |  8 +-
 packages/bbui/src/Typography/Code.svelte      |  4 +-
 packages/bbui/src/Typography/Detail.svelte    |  8 +-
 23 files changed, 189 insertions(+), 128 deletions(-)
 rename packages/bbui/src/Stores/{banner.js => banner.ts} (57%)
 rename packages/bbui/src/Stores/{notifications.js => notifications.ts} (63%)

diff --git a/packages/bbui/src/Form/Checkbox.svelte b/packages/bbui/src/Form/Checkbox.svelte
index 6e6cf0d8e8..4a7268f102 100644
--- a/packages/bbui/src/Form/Checkbox.svelte
+++ b/packages/bbui/src/Form/Checkbox.svelte
@@ -1,24 +1,24 @@
-<script>
+<script lang="ts">
   import Field from "./Field.svelte"
   import Checkbox from "./Core/Checkbox.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let value = null
-  export let label = null
-  export let labelPosition = "above"
-  export let text = null
-  export let disabled = false
-  export let error = null
-  export let size = "M"
-  export let helpText = null
+  export let value: boolean | undefined = undefined
+  export let label: string | undefined = undefined
+  export let labelPosition: "above" | "below" = "above"
+  export let text: string | undefined = undefined
+  export let disabled: boolean = false
+  export let error: string | undefined = undefined
+  export let size: "S" | "M" | "L" | "XL" = "M"
+  export let helpText: string | undefined = undefined
 
   const dispatch = createEventDispatcher()
-  const onChange = e => {
+  const onChange = (e: CustomEvent<boolean>) => {
     value = e.detail
     dispatch("change", e.detail)
   }
 </script>
 
 <Field {helpText} {label} {labelPosition} {error}>
-  <Checkbox {error} {disabled} {text} {value} {size} on:change={onChange} />
+  <Checkbox {disabled} {text} {value} {size} on:change={onChange} />
 </Field>
diff --git a/packages/bbui/src/Link/Link.svelte b/packages/bbui/src/Link/Link.svelte
index 6f8aba1f4e..60706c42cb 100644
--- a/packages/bbui/src/Link/Link.svelte
+++ b/packages/bbui/src/Link/Link.svelte
@@ -10,7 +10,7 @@
   export let secondary: boolean = false
   export let overBackground: boolean = false
   export let target: string | undefined = undefined
-  export let download: boolean | undefined = undefined
+  export let download: string | undefined = undefined
   export let disabled: boolean = false
   export let tooltip: string | null = null
 
diff --git a/packages/bbui/src/Stores/banner.js b/packages/bbui/src/Stores/banner.ts
similarity index 57%
rename from packages/bbui/src/Stores/banner.js
rename to packages/bbui/src/Stores/banner.ts
index fc93e7be99..bf70acfa9b 100644
--- a/packages/bbui/src/Stores/banner.js
+++ b/packages/bbui/src/Stores/banner.ts
@@ -7,17 +7,26 @@ export const BANNER_TYPES = {
   WARNING: "warning",
 }
 
+interface BannerConfig {
+  message?: string
+  type?: string
+  extraButtonText?: string
+  extraButtonAction?: () => void
+  onChange?: () => void
+}
+
+interface DefaultConfig {
+  messages: BannerConfig[]
+}
+
 export function createBannerStore() {
-  const DEFAULT_CONFIG = {
+  const DEFAULT_CONFIG: DefaultConfig = {
     messages: [],
   }
 
-  const banner = writable(DEFAULT_CONFIG)
+  const banner = writable<DefaultConfig>(DEFAULT_CONFIG)
 
-  const show = async (
-    // eslint-disable-next-line
-    config = { message, type, extraButtonText, extraButtonAction, onChange }
-  ) => {
+  const show = async (config: BannerConfig = {}) => {
     banner.update(store => {
       return {
         ...store,
@@ -27,7 +36,7 @@ export function createBannerStore() {
   }
 
   const showStatus = async () => {
-    const config = {
+    const config: BannerConfig = {
       message: "Some systems are experiencing issues",
       type: BANNER_TYPES.NEGATIVE,
       extraButtonText: "View Status",
@@ -37,18 +46,24 @@ export function createBannerStore() {
     await queue([config])
   }
 
-  const queue = async entries => {
-    const priority = {
+  const queue = async (entries: Array<BannerConfig>) => {
+    const priority: Record<string, number> = {
       [BANNER_TYPES.NEGATIVE]: 0,
       [BANNER_TYPES.WARNING]: 1,
       [BANNER_TYPES.INFO]: 2,
     }
     banner.update(store => {
       const sorted = [...store.messages, ...entries].sort((a, b) => {
-        if (priority[a.type] == priority[b.type]) {
+        if (
+          priority[a.type as keyof typeof priority] ===
+          priority[b.type as keyof typeof priority]
+        ) {
           return 0
         }
-        return priority[a.type] < priority[b.type] ? -1 : 1
+        return priority[a.type as keyof typeof priority] <
+          priority[b.type as keyof typeof priority]
+          ? -1
+          : 1
       })
       return {
         ...store,
diff --git a/packages/bbui/src/Stores/notifications.js b/packages/bbui/src/Stores/notifications.ts
similarity index 63%
rename from packages/bbui/src/Stores/notifications.js
rename to packages/bbui/src/Stores/notifications.ts
index 28331fffd8..f4d6625491 100644
--- a/packages/bbui/src/Stores/notifications.js
+++ b/packages/bbui/src/Stores/notifications.ts
@@ -2,9 +2,21 @@ import { writable } from "svelte/store"
 
 const NOTIFICATION_TIMEOUT = 3000
 
+interface Notification {
+  id: string
+  type: string
+  message: string
+  icon: string
+  dismissable: boolean
+  action: (() => void) | null
+  actionMessage: string | null
+  wide: boolean
+  dismissTimeout: number
+}
+
 export const createNotificationStore = () => {
-  const timeoutIds = new Set()
-  const _notifications = writable([], () => {
+  const timeoutIds = new Set<NodeJS.Timeout>()
+  const _notifications = writable<Notification[]>([], () => {
     return () => {
       // clear all the timers
       timeoutIds.forEach(timeoutId => {
@@ -21,7 +33,7 @@ export const createNotificationStore = () => {
   }
 
   const send = (
-    message,
+    message: string,
     {
       type = "default",
       icon = "",
@@ -30,7 +42,15 @@ export const createNotificationStore = () => {
       actionMessage = null,
       wide = false,
       dismissTimeout = NOTIFICATION_TIMEOUT,
-    }
+    }: {
+      type?: string
+      icon?: string
+      autoDismiss?: boolean
+      action?: (() => void) | null
+      actionMessage?: string | null
+      wide?: boolean
+      dismissTimeout?: number
+    } = {}
   ) => {
     if (block) {
       return
@@ -60,7 +80,7 @@ export const createNotificationStore = () => {
     }
   }
 
-  const dismissNotification = id => {
+  const dismissNotification = (id: string) => {
     _notifications.update(state => {
       return state.filter(n => n.id !== id)
     })
@@ -71,17 +91,18 @@ export const createNotificationStore = () => {
   return {
     subscribe,
     send,
-    info: msg => send(msg, { type: "info", icon: "Info" }),
-    error: msg =>
+    info: (msg: string) => send(msg, { type: "info", icon: "Info" }),
+    error: (msg: string) =>
       send(msg, { type: "error", icon: "Alert", autoDismiss: false }),
-    warning: msg => send(msg, { type: "warning", icon: "Alert" }),
-    success: msg => send(msg, { type: "success", icon: "CheckmarkCircle" }),
+    warning: (msg: string) => send(msg, { type: "warning", icon: "Alert" }),
+    success: (msg: string) =>
+      send(msg, { type: "success", icon: "CheckmarkCircle" }),
     blockNotifications,
     dismiss: dismissNotification,
   }
 }
 
-function id() {
+function id(): string {
   return "_" + Math.random().toString(36).slice(2, 9)
 }
 
diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte
index 303397054a..8dc23d8604 100644
--- a/packages/bbui/src/Table/ArrayRenderer.svelte
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@@ -1,8 +1,8 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/label/dist/index-vars.css"
   import Badge from "../Badge/Badge.svelte"
 
-  export let value
+  export let value: string | string[]
 
   const displayLimit = 5
 
diff --git a/packages/bbui/src/Table/AttachmentRenderer.svelte b/packages/bbui/src/Table/AttachmentRenderer.svelte
index b4de8672ae..550ae11e8b 100644
--- a/packages/bbui/src/Table/AttachmentRenderer.svelte
+++ b/packages/bbui/src/Table/AttachmentRenderer.svelte
@@ -1,15 +1,15 @@
-<script>
+<script lang="ts">
   import Link from "../Link/Link.svelte"
 
-  export let value
+  export let value: { name: string; url: string; extension: string }[]
 
   const displayLimit = 5
   $: attachments = value?.slice(0, displayLimit) ?? []
   $: leftover = (value?.length ?? 0) - attachments.length
 
-  const imageExtensions = ["png", "tiff", "gif", "raw", "jpg", "jpeg"]
-  const isImage = extension => {
-    return imageExtensions.includes(extension?.toLowerCase())
+  const imageExtensions: string[] = ["png", "tiff", "gif", "raw", "jpg", "jpeg"]
+  const isImage = (extension: string | undefined): boolean => {
+    return imageExtensions.includes(extension?.toLowerCase() ?? "")
   }
 </script>
 
diff --git a/packages/bbui/src/Table/BoldRenderer.svelte b/packages/bbui/src/Table/BoldRenderer.svelte
index ae9ca24c42..93df68d2dc 100644
--- a/packages/bbui/src/Table/BoldRenderer.svelte
+++ b/packages/bbui/src/Table/BoldRenderer.svelte
@@ -1,5 +1,5 @@
-<script>
-  export let value
+<script lang="ts">
+  export let value: string
 </script>
 
 <div class="bold">{value}</div>
diff --git a/packages/bbui/src/Table/BooleanRenderer.svelte b/packages/bbui/src/Table/BooleanRenderer.svelte
index 4e1aa3b4e1..0f4f7b2d68 100644
--- a/packages/bbui/src/Table/BooleanRenderer.svelte
+++ b/packages/bbui/src/Table/BooleanRenderer.svelte
@@ -1,7 +1,7 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/checkbox/dist/index-vars.css"
 
-  export let value
+  export let value: boolean
 </script>
 
 <label
diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index eff1178f6d..a1609bb725 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import StringRenderer from "./StringRenderer.svelte"
   import BooleanRenderer from "./BooleanRenderer.svelte"
   import DateTimeRenderer from "./DateTimeRenderer.svelte"
@@ -8,14 +8,14 @@
   import InternalRenderer from "./InternalRenderer.svelte"
   import { processStringSync } from "@budibase/string-templates"
 
-  export let row
-  export let schema
-  export let value
-  export let customRenderers = []
-  export let snippets
+  export let row: any
+  export let schema: any
+  export let value: any
+  export let customRenderers: { column: string; component: any }[] = []
+  export let snippets: any
 
-  let renderer
-  const typeMap = {
+  let renderer: any
+  const typeMap: Record<string, any> = {
     boolean: BooleanRenderer,
     datetime: DateTimeRenderer,
     link: RelationshipRenderer,
@@ -33,7 +33,7 @@
   $: renderer = customRenderer?.component ?? typeMap[type] ?? StringRenderer
   $: cellValue = getCellValue(value, schema.template)
 
-  const getType = schema => {
+  const getType = (schema: any): string => {
     // Use a string renderer for dates if we use a custom template
     if (schema?.type === "datetime" && schema?.template) {
       return "string"
@@ -41,7 +41,7 @@
     return schema?.type || "string"
   }
 
-  const getCellValue = (value, template) => {
+  const getCellValue = (value: any, template: string | undefined): any => {
     if (!template) {
       return value
     }
diff --git a/packages/bbui/src/Table/CodeRenderer.svelte b/packages/bbui/src/Table/CodeRenderer.svelte
index 5658851197..a16352e1a6 100644
--- a/packages/bbui/src/Table/CodeRenderer.svelte
+++ b/packages/bbui/src/Table/CodeRenderer.svelte
@@ -1,5 +1,5 @@
-<script>
-  export let value
+<script lang="ts">
+  export let value: string
 </script>
 
 <code>{value}</code>
diff --git a/packages/bbui/src/Table/DateTimeRenderer.svelte b/packages/bbui/src/Table/DateTimeRenderer.svelte
index f4b0821069..607f71e163 100644
--- a/packages/bbui/src/Table/DateTimeRenderer.svelte
+++ b/packages/bbui/src/Table/DateTimeRenderer.svelte
@@ -1,13 +1,13 @@
-<script>
+<script lang="ts">
   import dayjs from "dayjs"
 
-  export let value
-  export let schema
+  export let value: string | Date
+  export let schema: { timeOnly?: boolean; dateOnly?: boolean }
 
   // adding the 0- will turn a string like 00:00:00 into a valid ISO
   // date, but will make actual ISO dates invalid
   $: time = new Date(`0-${value}`)
-  $: isTimeOnly = !isNaN(time) || schema?.timeOnly
+  $: isTimeOnly = !isNaN(time.getTime()) || schema?.timeOnly
   $: isDateOnly = schema?.dateOnly
   $: format = isTimeOnly
     ? "HH:mm:ss"
diff --git a/packages/bbui/src/Table/InternalRenderer.svelte b/packages/bbui/src/Table/InternalRenderer.svelte
index 9a09f5c601..56adebbe1e 100644
--- a/packages/bbui/src/Table/InternalRenderer.svelte
+++ b/packages/bbui/src/Table/InternalRenderer.svelte
@@ -1,11 +1,11 @@
-<script>
+<script lang="ts">
   import Icon from "../Icon/Icon.svelte"
   import { copyToClipboard } from "../helpers"
   import { notifications } from "../Stores/notifications"
 
-  export let value
+  export let value: string
 
-  const onClick = async e => {
+  const onClick = async (e: MouseEvent): Promise<void> => {
     e.stopPropagation()
     try {
       await copyToClipboard(value)
diff --git a/packages/bbui/src/Table/RelationshipRenderer.svelte b/packages/bbui/src/Table/RelationshipRenderer.svelte
index b70eaeb07d..0a4c37aa51 100644
--- a/packages/bbui/src/Table/RelationshipRenderer.svelte
+++ b/packages/bbui/src/Table/RelationshipRenderer.svelte
@@ -1,11 +1,11 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/label/dist/index-vars.css"
   import { createEventDispatcher } from "svelte"
   import Badge from "../Badge/Badge.svelte"
 
-  export let row
-  export let value
-  export let schema
+  export let row: { tableId: string; _id: string }
+  export let value: { primaryDisplay?: string }[] | undefined
+  export let schema: { name?: string }
 
   const dispatch = createEventDispatcher()
   const displayLimit = 5
@@ -13,7 +13,7 @@
   $: relationships = value?.slice(0, displayLimit) ?? []
   $: leftover = (value?.length ?? 0) - relationships.length
 
-  const onClick = e => {
+  const onClick = (e: MouseEvent) => {
     e.stopPropagation()
     dispatch("clickrelationship", {
       tableId: row.tableId,
diff --git a/packages/bbui/src/Table/SelectEditRenderer.svelte b/packages/bbui/src/Table/SelectEditRenderer.svelte
index 0c88fa3167..eca239ab9f 100644
--- a/packages/bbui/src/Table/SelectEditRenderer.svelte
+++ b/packages/bbui/src/Table/SelectEditRenderer.svelte
@@ -1,12 +1,12 @@
-<script>
+<script lang="ts">
   import Checkbox from "../Form/Checkbox.svelte"
   import ActionButton from "../ActionButton/ActionButton.svelte"
 
-  export let selected
-  export let onEdit
-  export let allowSelectRows = false
-  export let allowEditRows = false
-  export let data
+  export let selected: boolean | undefined
+  export let onEdit: () => void
+  export let allowSelectRows: boolean = false
+  export let allowEditRows: boolean = false
+  export let data: Record<string, any>
 </script>
 
 <div>
diff --git a/packages/bbui/src/Table/StringRenderer.svelte b/packages/bbui/src/Table/StringRenderer.svelte
index fd7ff3bcda..00516480bf 100644
--- a/packages/bbui/src/Table/StringRenderer.svelte
+++ b/packages/bbui/src/Table/StringRenderer.svelte
@@ -1,6 +1,6 @@
-<script>
-  export let value
-  export let schema
+<script lang="ts">
+  export let value: string | object
+  export let schema: { capitalise?: boolean }
 </script>
 
 <div class:capitalise={schema?.capitalise}>
diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte
index 3955145ad1..2af2d07558 100644
--- a/packages/bbui/src/Tabs/Tabs.svelte
+++ b/packages/bbui/src/Tabs/Tabs.svelte
@@ -1,28 +1,48 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/tabs/dist/index-vars.css"
   import { writable } from "svelte/store"
   import { onMount, setContext, createEventDispatcher } from "svelte"
 
-  export let selected
-  export let vertical = false
-  export let noPadding = false
-  // added as a separate option as noPadding is used for vertical padding
-  export let noHorizPadding = false
-  export let quiet = false
-  export let emphasized = false
-  export let onTop = false
-  export let size = "M"
-  export let beforeSwitch = null
+  interface TabInfo {
+    width?: number
+    height?: number
+    left?: number
+    top?: number
+  }
 
-  let thisSelected = undefined
+  interface TabState {
+    title: string
+    id: string
+    emphasized: boolean
+    info?: TabInfo
+  }
+
+  export let selected: string
+  export let vertical: boolean = false
+  export let noPadding: boolean = false
+  // added as a separate option as noPadding is used for vertical padding
+  export let noHorizPadding: boolean = false
+  export let quiet: boolean = false
+  export let emphasized: boolean = false
+  export let onTop: boolean = false
+  export let size: "S" | "M" | "L" = "M"
+  export let beforeSwitch: ((_title: string) => boolean) | null = null
+
+  let thisSelected: string | undefined = undefined
+  let container: HTMLElement | undefined
 
   let _id = id()
-  const tab = writable({ title: selected, id: _id, emphasized })
+  const tab = writable<TabState>({ title: selected, id: _id, emphasized })
   setContext("tab", tab)
 
-  let container
+  let top: string | undefined
+  let left: string | undefined
+  let width: string | undefined
+  let height: string | undefined
 
-  const dispatch = createEventDispatcher()
+  const dispatch = createEventDispatcher<{
+    select: string
+  }>()
 
   $: {
     if (thisSelected !== selected) {
@@ -44,29 +64,34 @@
     }
     if ($tab.title !== thisSelected) {
       tab.update(state => {
-        state.title = thisSelected
+        state.title = thisSelected as string
         return state
       })
     }
   }
 
-  let top, left, width, height
-  $: calculateIndicatorLength($tab)
-  $: calculateIndicatorOffset($tab)
+  $: $tab && calculateIndicatorLength()
+  $: $tab && calculateIndicatorOffset()
 
   function calculateIndicatorLength() {
     if (!vertical) {
-      width = $tab.info?.width + "px"
+      width = ($tab.info?.width ?? 0) + "px"
     } else {
-      height = $tab.info?.height + 4 + "px"
+      height = ($tab.info?.height ?? 0) + 4 + "px"
     }
   }
 
   function calculateIndicatorOffset() {
     if (!vertical) {
-      left = $tab.info?.left - container?.getBoundingClientRect().left + "px"
+      left =
+        ($tab.info?.left ?? 0) -
+        (container?.getBoundingClientRect().left ?? 0) +
+        "px"
     } else {
-      top = $tab.info?.top - container?.getBoundingClientRect().top + "px"
+      top =
+        ($tab.info?.top ?? 0) -
+        (container?.getBoundingClientRect().top ?? 0) +
+        "px"
     }
   }
 
@@ -75,7 +100,7 @@
     calculateIndicatorOffset()
   })
 
-  function id() {
+  function id(): string {
     return "_" + Math.random().toString(36).slice(2, 9)
   }
 </script>
diff --git a/packages/bbui/src/Tags/Tag.svelte b/packages/bbui/src/Tags/Tag.svelte
index 0cdd6c385d..d10459435b 100644
--- a/packages/bbui/src/Tags/Tag.svelte
+++ b/packages/bbui/src/Tags/Tag.svelte
@@ -1,13 +1,13 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/tags/dist/index-vars.css"
   import Avatar from "../Avatar/Avatar.svelte"
   import ClearButton from "../ClearButton/ClearButton.svelte"
 
-  export let icon = ""
-  export let avatar = ""
-  export let invalid = false
-  export let disabled = false
-  export let closable = false
+  export let icon: string = ""
+  export let avatar: string = ""
+  export let invalid: boolean = false
+  export let disabled: boolean = false
+  export let closable: boolean = false
 </script>
 
 <div
diff --git a/packages/bbui/src/Tags/Tags.svelte b/packages/bbui/src/Tags/Tags.svelte
index ebca64b774..c095f4103c 100644
--- a/packages/bbui/src/Tags/Tags.svelte
+++ b/packages/bbui/src/Tags/Tags.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/tags/dist/index-vars.css"
 </script>
 
diff --git a/packages/bbui/src/Tooltip/TooltipWrapper.svelte b/packages/bbui/src/Tooltip/TooltipWrapper.svelte
index 8d12b88086..cfebd6625e 100644
--- a/packages/bbui/src/Tooltip/TooltipWrapper.svelte
+++ b/packages/bbui/src/Tooltip/TooltipWrapper.svelte
@@ -1,10 +1,10 @@
-<script>
+<script lang="ts">
   import Icon from "../Icon/Icon.svelte"
   import AbsTooltip from "./AbsTooltip.svelte"
 
-  export let tooltip = ""
-  export let size = "M"
-  export let disabled = true
+  export let tooltip: string = ""
+  export let size: "S" | "M" = "M"
+  export let disabled: boolean = true
 </script>
 
 <div class:container={!!tooltip}>
diff --git a/packages/bbui/src/TreeView/Item.svelte b/packages/bbui/src/TreeView/Item.svelte
index 104c392b65..0d414e7fa2 100644
--- a/packages/bbui/src/TreeView/Item.svelte
+++ b/packages/bbui/src/TreeView/Item.svelte
@@ -1,9 +1,9 @@
-<script>
-  export let selected = false
-  export let open = false
-  export let href = false
-  export let title
-  export let icon
+<script lang="ts">
+  export let selected: boolean = false
+  export let open: boolean = false
+  export let href: string | null = null
+  export let title: string
+  export let icon: string | undefined
 </script>
 
 <li
diff --git a/packages/bbui/src/TreeView/Tree.svelte b/packages/bbui/src/TreeView/Tree.svelte
index cecc357243..34eaf5aad5 100644
--- a/packages/bbui/src/TreeView/Tree.svelte
+++ b/packages/bbui/src/TreeView/Tree.svelte
@@ -1,9 +1,9 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/treeview/dist/index-vars.css"
 
-  export let quiet = false
-  export let standalone = true
-  export let width = "250px"
+  export let quiet: boolean = false
+  export let standalone: boolean = true
+  export let width: string = "250px"
 </script>
 
 <ul
diff --git a/packages/bbui/src/Typography/Code.svelte b/packages/bbui/src/Typography/Code.svelte
index ebb100a108..c6a91162ff 100644
--- a/packages/bbui/src/Typography/Code.svelte
+++ b/packages/bbui/src/Typography/Code.svelte
@@ -1,8 +1,8 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/typography/dist/index-vars.css"
 
   // Sizes
-  export let size = "M"
+  export let size: "S" | "M" | "L" = "M"
 </script>
 
 <code class="spectrum-Code spectrum-Code--size{size}">
diff --git a/packages/bbui/src/Typography/Detail.svelte b/packages/bbui/src/Typography/Detail.svelte
index 80e5e1cbe9..dfec234e10 100644
--- a/packages/bbui/src/Typography/Detail.svelte
+++ b/packages/bbui/src/Typography/Detail.svelte
@@ -1,9 +1,9 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/typography/dist/index-vars.css"
 
-  export let size = "M"
-  export let serif = false
-  export let weight = 600
+  export let size: "S" | "M" | "L" = "M"
+  export let serif: boolean = false
+  export let weight: number | null = null
 </script>
 
 <p

From 609f967c178688075677bdae9b3aadb82ed2d278 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Feb 2025 14:33:53 +0000
Subject: [PATCH 07/42] clear button ts update

---
 packages/bbui/src/ClearButton/ClearButton.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/ClearButton/ClearButton.svelte b/packages/bbui/src/ClearButton/ClearButton.svelte
index 5a2f6bc04c..720a462546 100644
--- a/packages/bbui/src/ClearButton/ClearButton.svelte
+++ b/packages/bbui/src/ClearButton/ClearButton.svelte
@@ -1,6 +1,6 @@
-<script>
-  export let small = false
-  export let disabled
+<script lang="ts">
+  export let small: boolean = false
+  export let disabled: boolean = false
 </script>
 
 <button

From 60f5dbe8b47bc897ebfe9364d12fd3074154b71f Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Feb 2025 15:03:22 +0000
Subject: [PATCH 08/42] more ts updates

---
 .../bbui/src/Table/SelectEditRenderer.svelte  |   2 +-
 packages/bbui/src/Table/Table.svelte          | 121 ++++++++++--------
 .../bbui/src/Table/{index.js => index.ts}     |   0
 3 files changed, 72 insertions(+), 51 deletions(-)
 rename packages/bbui/src/Table/{index.js => index.ts} (100%)

diff --git a/packages/bbui/src/Table/SelectEditRenderer.svelte b/packages/bbui/src/Table/SelectEditRenderer.svelte
index eca239ab9f..75ae183333 100644
--- a/packages/bbui/src/Table/SelectEditRenderer.svelte
+++ b/packages/bbui/src/Table/SelectEditRenderer.svelte
@@ -3,7 +3,7 @@
   import ActionButton from "../ActionButton/ActionButton.svelte"
 
   export let selected: boolean | undefined
-  export let onEdit: () => void
+  export let onEdit: (_e: Event) => void
   export let allowSelectRows: boolean = false
   export let allowEditRows: boolean = false
   export let data: Record<string, any>
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 228838e477..530d729a35 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { createEventDispatcher } from "svelte"
   import "@spectrum-css/table/dist/index-vars.css"
   import CellRenderer from "./CellRenderer.svelte"
@@ -8,6 +8,7 @@
   import Checkbox from "../Form/Checkbox.svelte"
 
   /**
+   /**
    * The expected schema is our normal couch schemas for our tables.
    * Each field schema can be enriched with a few extra properties to customise
    * the behaviour.
@@ -24,42 +25,42 @@
    * borderLeft: show a left border
    * borderRight: show a right border
    */
-  export let data = []
-  export let schema = {}
-  export let showAutoColumns = false
-  export let rowCount = 0
-  export let quiet = false
-  export let loading = false
-  export let allowSelectRows
-  export let allowEditRows = true
-  export let allowEditColumns = true
-  export let allowClickRows = true
-  export let selectedRows = []
-  export let customRenderers = []
-  export let disableSorting = false
-  export let autoSortColumns = true
-  export let compact = false
-  export let customPlaceholder = false
-  export let showHeaderBorder = true
-  export let placeholderText = "No rows found"
-  export let snippets = []
-  export let defaultSortColumn = undefined
-  export let defaultSortOrder = "Ascending"
+  export let data: any[] = []
+  export let schema: Record<string, any> = {}
+  export let showAutoColumns: boolean = false
+  export let rowCount: number = 0
+  export let quiet: boolean = false
+  export let loading: boolean = false
+  export let allowSelectRows: boolean = false
+  export let allowEditRows: boolean = true
+  export let allowEditColumns: boolean = true
+  export let allowClickRows: boolean = true
+  export let selectedRows: any[] = []
+  export let customRenderers: any[] = []
+  export let disableSorting: boolean = false
+  export let autoSortColumns: boolean = true
+  export let compact: boolean = false
+  export let customPlaceholder: boolean = false
+  export let showHeaderBorder: boolean = true
+  export let placeholderText: string = "No rows found"
+  export let snippets: any[] = []
+  export let defaultSortColumn: string | undefined = undefined
+  export let defaultSortOrder: "Ascending" | "Descending" = "Ascending"
 
   const dispatch = createEventDispatcher()
 
   // Config
-  const headerHeight = 36
+  const headerHeight: number = 36
   $: rowHeight = compact ? 46 : 55
 
   // Sorting state
-  let sortColumn
-  let sortOrder
+  let sortColumn: string | undefined
+  let sortOrder: "Ascending" | "Descending" | undefined
 
   // Table state
-  let height = 0
-  let loaded = false
-  let checkboxStatus = false
+  let height: number = 0
+  let loaded: boolean = false
+  let checkboxStatus: boolean = false
 
   $: schema = fixSchema(schema)
   $: if (!loading) loaded = true
@@ -95,8 +96,8 @@
     }
   }
 
-  const fixSchema = schema => {
-    let fixedSchema = {}
+  const fixSchema = (schema: Record<string, any>): Record<string, any> => {
+    let fixedSchema: Record<string, any> = {}
     Object.entries(schema || {}).forEach(([fieldName, fieldSchema]) => {
       if (typeof fieldSchema === "string") {
         fixedSchema[fieldName] = {
@@ -120,7 +121,13 @@
     return fixedSchema
   }
 
-  const getVisibleRowCount = (loaded, height, allRows, rowCount, rowHeight) => {
+  const getVisibleRowCount = (
+    loaded: boolean,
+    height: number,
+    allRows: number,
+    rowCount: number,
+    rowHeight: number
+  ): number => {
     if (!loaded) {
       return rowCount || 0
     }
@@ -131,12 +138,12 @@
   }
 
   const getHeightStyle = (
-    visibleRowCount,
-    rowCount,
-    totalRowCount,
-    rowHeight,
-    loading
-  ) => {
+    visibleRowCount: number,
+    rowCount: number,
+    totalRowCount: number,
+    rowHeight: number,
+    loading: boolean
+  ): string => {
     if (loading) {
       return `height: ${headerHeight + visibleRowCount * rowHeight}px;`
     }
@@ -146,7 +153,11 @@
     return `height: ${headerHeight + visibleRowCount * rowHeight}px;`
   }
 
-  const getGridStyle = (fields, schema, showEditColumn) => {
+  const getGridStyle = (
+    fields: string[],
+    schema: Record<string, any>,
+    showEditColumn: boolean
+  ): string => {
     let style = "grid-template-columns:"
     if (showEditColumn) {
       style += " auto"
@@ -163,7 +174,11 @@
     return style
   }
 
-  const sortRows = (rows, sortColumn, sortOrder) => {
+  const sortRows = (
+    rows: any[],
+    sortColumn: string | undefined,
+    sortOrder: string | undefined
+  ): any[] => {
     sortColumn = sortColumn ?? defaultSortColumn
     sortOrder = sortOrder ?? defaultSortOrder
     if (!sortColumn || !sortOrder || disableSorting) {
@@ -180,7 +195,7 @@
     })
   }
 
-  const sortBy = fieldSchema => {
+  const sortBy = (fieldSchema: Record<string, any>): void => {
     if (fieldSchema.sortable === false) {
       return
     }
@@ -193,7 +208,7 @@
     dispatch("sort", { column: sortColumn, order: sortOrder })
   }
 
-  const getDisplayName = schema => {
+  const getDisplayName = (schema: Record<string, any>): string => {
     let name = schema?.displayName
     if (schema && name === undefined) {
       name = schema.name
@@ -201,9 +216,13 @@
     return name || ""
   }
 
-  const getFields = (schema, showAutoColumns, autoSortColumns) => {
-    let columns = []
-    let autoColumns = []
+  const getFields = (
+    schema: Record<string, any>,
+    showAutoColumns: boolean,
+    autoSortColumns: boolean
+  ): string[] => {
+    let columns: any[] = []
+    let autoColumns: any[] = []
     Object.entries(schema || {}).forEach(([field, fieldSchema]) => {
       if (!field || !fieldSchema) {
         return
@@ -235,17 +254,17 @@
       .map(column => column.name)
   }
 
-  const editColumn = (e, field) => {
+  const editColumn = (e: Event, field: any): void => {
     e.stopPropagation()
     dispatch("editcolumn", field)
   }
 
-  const editRow = (e, row) => {
+  const editRow = (e: Event, row: any): void => {
     e.stopPropagation()
     dispatch("editrow", cloneDeep(row))
   }
 
-  const toggleSelectRow = row => {
+  const toggleSelectRow = (row: any): void => {
     if (!allowSelectRows) {
       return
     }
@@ -258,7 +277,7 @@
     }
   }
 
-  const toggleSelectAll = e => {
+  const toggleSelectAll = (e: CustomEvent): void => {
     const select = !!e.detail
     if (select) {
       // Add any rows which are not already in selected rows
@@ -278,8 +297,10 @@
     }
   }
 
-  const computeCellStyles = schema => {
-    let styles = {}
+  const computeCellStyles = (
+    schema: Record<string, any>
+  ): Record<string, string> => {
+    let styles: Record<string, string> = {}
     Object.keys(schema || {}).forEach(field => {
       styles[field] = ""
       if (schema[field].color) {
diff --git a/packages/bbui/src/Table/index.js b/packages/bbui/src/Table/index.ts
similarity index 100%
rename from packages/bbui/src/Table/index.js
rename to packages/bbui/src/Table/index.ts

From a0c4093645de20d0580355b59a4755f7e86f1012 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 25 Feb 2025 15:15:10 +0000
Subject: [PATCH 09/42] removes some unused components

---
 packages/bbui/src/SideNavigation/Item.svelte  | 63 -------------------
 .../bbui/src/SideNavigation/Navigation.svelte | 13 ----
 packages/bbui/src/index.ts                    |  2 -
 3 files changed, 78 deletions(-)
 delete mode 100644 packages/bbui/src/SideNavigation/Item.svelte
 delete mode 100644 packages/bbui/src/SideNavigation/Navigation.svelte

diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte
deleted file mode 100644
index 717a7988b8..0000000000
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ /dev/null
@@ -1,63 +0,0 @@
-<script>
-  import { getContext } from "svelte"
-
-  const multilevel = getContext("sidenav-type")
-  import Badge from "../Badge/Badge.svelte"
-
-  export let href = ""
-  export let external = false
-  export let heading = ""
-  export let icon = ""
-  export let selected = false
-  export let disabled = false
-  export let badge = ""
-</script>
-
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
-<li
-  class="spectrum-SideNav-item"
-  class:is-selected={selected}
-  class:is-disabled={disabled}
-  on:click
->
-  {#if heading}
-    <h2 class="spectrum-SideNav-heading" id="nav-heading-{heading}">
-      {heading}
-    </h2>
-  {/if}
-  <a
-    target={external ? "_blank" : ""}
-    {href}
-    class="spectrum-SideNav-itemLink"
-    aria-current="page"
-  >
-    {#if icon}
-      <svg
-        class="spectrum-Icon spectrum-Icon--sizeM spectrum-SideNav-itemIcon"
-        focusable="false"
-        aria-hidden="true"
-      >
-        <use xlink:href="#spectrum-icon-18-{icon}" />
-      </svg>
-    {/if}
-    <slot />
-    {#if badge}
-      <div class="badge">
-        <Badge active size="S">{badge}</Badge>
-      </div>
-    {/if}
-  </a>
-
-  {#if multilevel && $$slots.subnav}
-    <ul class="spectrum-SideNav">
-      <slot name="subnav" />
-    </ul>
-  {/if}
-</li>
-
-<style>
-  .badge {
-    margin-left: 10px;
-  }
-</style>
diff --git a/packages/bbui/src/SideNavigation/Navigation.svelte b/packages/bbui/src/SideNavigation/Navigation.svelte
deleted file mode 100644
index c13b6b56c8..0000000000
--- a/packages/bbui/src/SideNavigation/Navigation.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-  import { setContext } from "svelte"
-  import "@spectrum-css/sidenav/dist/index-vars.css"
-
-  export let multilevel = false
-  setContext("sidenav-type", multilevel)
-</script>
-
-<nav>
-  <ul class="spectrum-SideNav" class:spectrum-SideNav--multiLevel={multilevel}>
-    <slot />
-  </ul>
-</nav>
diff --git a/packages/bbui/src/index.ts b/packages/bbui/src/index.ts
index 2809cbf99f..b0b52c1722 100644
--- a/packages/bbui/src/index.ts
+++ b/packages/bbui/src/index.ts
@@ -65,8 +65,6 @@ export { default as Modal } from "./Modal/Modal.svelte"
 export { default as ModalContent, keepOpen } from "./Modal/ModalContent.svelte"
 export { default as NotificationDisplay } from "./Notification/NotificationDisplay.svelte"
 export { default as Notification } from "./Notification/Notification.svelte"
-export { default as SideNavigation } from "./SideNavigation/Navigation.svelte"
-export { default as SideNavigationItem } from "./SideNavigation/Item.svelte"
 export { default as Context } from "./context"
 export { default as Table } from "./Table/Table.svelte"
 export { default as Tabs } from "./Tabs/Tabs.svelte"

From df102e7b6b6e9e518bfec8907eba79782f06b551 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 25 Feb 2025 17:18:27 +0000
Subject: [PATCH 10/42] Opacity of group badges.

---
 packages/bbui/src/Badge/Badge.svelte                        | 2 +-
 .../app/[application]/_components/BuilderSidePanel.svelte   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Badge/Badge.svelte b/packages/bbui/src/Badge/Badge.svelte
index 03aa544dfe..15bb6c62c2 100644
--- a/packages/bbui/src/Badge/Badge.svelte
+++ b/packages/bbui/src/Badge/Badge.svelte
@@ -30,7 +30,7 @@
   class:spectrum-Label--seafoam={seafoam}
   class:spectrum-Label--active={active}
   class:spectrum-Label--inactive={inactive}
-  style={customColor ? `background-color: ${customColor};` : ""}
+  style={customColor ? `background-color: ${customColor}` : ""}
 >
   <slot />
 </span>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 8136dd256c..ff4b872153 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -742,7 +742,7 @@
                 <div class="auth-entity-access-title">Access</div>
               </div>
               {#each allUsers as user}
-                {@const userGroups = sdk.users.getUserAppGroups($appStore.appId, user, $groups)}
+                {@const userGroups = sdk.users.getUserAppGroups($appStore.appId, user, $groups).slice(0, 3)}
                 <div class="auth-entity">
                   <div class="details">
                     <div class="user-groups">
@@ -751,7 +751,7 @@
                       </div>
                       <div class="group-badges">
                         {#each userGroups as group}
-                          <Badge size="S" customColor={group.color}>{group.name}</Badge>
+                          <Badge size="S" customColor={`color-mix(in srgb, ${group.color} 30%, transparent)`}>{group.name}</Badge>
                         {/each}
                       </div>
                     </div>
@@ -949,6 +949,8 @@
     grid-template-columns: 1fr 220px;
     align-items: center;
     gap: var(--spacing-xl);
+    border-bottom: var(--border-light);
+    padding-bottom: var(--spacing-s);
   }
 
   .auth-entity .details {

From c3de44a6a9270fba6b8184ed379fa4b304ba4efe Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 25 Feb 2025 18:17:41 +0000
Subject: [PATCH 11/42] Adding a way to limit the groups shown and then display
 a popover.

---
 packages/bbui/src/Icon/Icon.svelte            |  3 ++
 .../_components/BuilderGroupPopover.svelte    | 49 +++++++++++++++++++
 .../_components/BuilderSidePanel.svelte       | 15 ++++--
 .../_components/GroupBadge.svelte             | 10 ++++
 4 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
 create mode 100644 packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte

diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte
index 2f12935f53..46b3140be8 100644
--- a/packages/bbui/src/Icon/Icon.svelte
+++ b/packages/bbui/src/Icon/Icon.svelte
@@ -28,6 +28,9 @@
     <svg
       on:contextmenu
       on:click
+      on:mouseover
+      on:mouseleave
+      on:focus
       class:hoverable
       class:disabled
       class="spectrum-Icon spectrum-Icon--size{size}"
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
new file mode 100644
index 0000000000..47811cbcb9
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
@@ -0,0 +1,49 @@
+<script>
+  import { Icon, Popover } from "@budibase/bbui"
+  import GroupBadge from "./GroupBadge.svelte"
+
+  export let groups = []
+
+  let anchor, popover
+
+  function show() {
+    popover.show()
+  }
+
+  function hide() {
+    popover.hide()
+  }
+</script>
+
+<div class="icon" bind:this={anchor}>
+  <Icon name="More" size="S" hoverable on:mouseover={show} on:mouseleave={hide} />
+</div>
+
+<Popover
+  customZIndex={1002}
+  bind:this={popover}
+  align="center"
+  {anchor}
+  showPopover={true}
+  minWidth={0}
+>
+  <div class="badges">
+    {#each groups as group}
+      <GroupBadge color={group.color} name={group.name} />
+    {/each}
+  </div>
+</Popover>
+
+<style>
+  .icon {
+    height: auto;
+    display: flex;
+    justify-content: center;
+  }
+  .badges {
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--spacing-s);
+    padding: var(--spacing-m);
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index ff4b872153..11a36706cf 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -38,6 +38,8 @@
   import { emailValidator } from "@/helpers/validation"
   import { fly } from "svelte/transition"
   import InfoDisplay from "../design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import BuilderGroupPopover from "./BuilderGroupPopover.svelte"
+  import GroupBadge from "./GroupBadge.svelte"
 
   let query = null
   let loaded = false
@@ -742,7 +744,11 @@
                 <div class="auth-entity-access-title">Access</div>
               </div>
               {#each allUsers as user}
-                {@const userGroups = sdk.users.getUserAppGroups($appStore.appId, user, $groups).slice(0, 3)}
+                {@const userGroups = sdk.users.getUserAppGroups(
+                  $appStore.appId,
+                  user,
+                  $groups
+                )}
                 <div class="auth-entity">
                   <div class="details">
                     <div class="user-groups">
@@ -750,9 +756,12 @@
                         {user.email}
                       </div>
                       <div class="group-badges">
-                        {#each userGroups as group}
-                          <Badge size="S" customColor={`color-mix(in srgb, ${group.color} 30%, transparent)`}>{group.name}</Badge>
+                        {#each userGroups.slice(0, 3) as group}
+                          <GroupBadge color={group.color} name={group.name} />
                         {/each}
+                        {#if userGroups.length > 3}
+                          <BuilderGroupPopover groups={userGroups.slice(3)} />
+                        {/if}
                       </div>
                     </div>
                   </div>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte b/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
new file mode 100644
index 0000000000..f10e2aa220
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
@@ -0,0 +1,10 @@
+<script>
+  import { Badge } from "@budibase/bbui"
+
+  export let color
+  export let name
+</script>
+
+<Badge size="S" customColor={`color-mix(in srgb, ${color} 30%, transparent)`}
+  >{name}</Badge
+>

From 336bc72de27860e8941e3a984929d2b83062de01 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Feb 2025 12:53:18 +0000
Subject: [PATCH 12/42] Design after discussion with Cheeks and Joe.

---
 packages/bbui/src/Badge/Badge.svelte          |  4 +-
 .../_components/BuilderGroupPopover.svelte    | 41 +++-------------
 .../_components/BuilderSidePanel.svelte       | 48 ++++++++++---------
 .../_components/GroupBadge.svelte             | 10 ----
 packages/shared-core/src/helpers/index.ts     |  1 +
 packages/shared-core/src/helpers/lists.ts     |  7 +++
 6 files changed, 43 insertions(+), 68 deletions(-)
 delete mode 100644 packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
 create mode 100644 packages/shared-core/src/helpers/lists.ts

diff --git a/packages/bbui/src/Badge/Badge.svelte b/packages/bbui/src/Badge/Badge.svelte
index 15bb6c62c2..dadbaa3317 100644
--- a/packages/bbui/src/Badge/Badge.svelte
+++ b/packages/bbui/src/Badge/Badge.svelte
@@ -11,7 +11,7 @@
   export let active = false
   export let inactive = false
   export let hoverable = false
-  export let customColor = null
+  export let outlineColor = null
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -30,7 +30,7 @@
   class:spectrum-Label--seafoam={seafoam}
   class:spectrum-Label--active={active}
   class:spectrum-Label--inactive={inactive}
-  style={customColor ? `background-color: ${customColor}` : ""}
+  style={outlineColor ? `border: 2px solid ${outlineColor}` : ""}
 >
   <slot />
 </span>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
index 47811cbcb9..43c662a6d2 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
@@ -1,49 +1,22 @@
 <script>
-  import { Icon, Popover } from "@budibase/bbui"
-  import GroupBadge from "./GroupBadge.svelte"
+  import { Icon } from "@budibase/bbui"
+  import { helpers } from "@budibase/shared-core"
 
   export let groups = []
-
-  let anchor, popover
-
-  function show() {
-    popover.show()
-  }
-
-  function hide() {
-    popover.hide()
+  function tooltip(groups) {
+    const sortedNames = groups.sort((a, b) => a.name.localeCompare(b.name)).map(group => group.name)
+    return `Member of ${helpers.lists.punctuateList(sortedNames)}`
   }
 </script>
 
-<div class="icon" bind:this={anchor}>
-  <Icon name="More" size="S" hoverable on:mouseover={show} on:mouseleave={hide} />
+<div class="icon">
+  <Icon name="Info" size="XS" color="grey" hoverable tooltip={tooltip(groups)} tooltipPosition="top" />
 </div>
 
-<Popover
-  customZIndex={1002}
-  bind:this={popover}
-  align="center"
-  {anchor}
-  showPopover={true}
-  minWidth={0}
->
-  <div class="badges">
-    {#each groups as group}
-      <GroupBadge color={group.color} name={group.name} />
-    {/each}
-  </div>
-</Popover>
-
 <style>
   .icon {
     height: auto;
     display: flex;
     justify-content: center;
   }
-  .badges {
-    display: flex;
-    flex-wrap: wrap;
-    gap: var(--spacing-s);
-    padding: var(--spacing-m);
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 11a36706cf..0bf32e4b76 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -13,7 +13,6 @@
     FancyInput,
     Button,
     FancySelect,
-    Badge,
   } from "@budibase/bbui"
   import { builderStore, appStore, roles, appPublished } from "@/stores/builder"
   import {
@@ -39,7 +38,6 @@
   import { fly } from "svelte/transition"
   import InfoDisplay from "../design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
   import BuilderGroupPopover from "./BuilderGroupPopover.svelte"
-  import GroupBadge from "./GroupBadge.svelte"
 
   let query = null
   let loaded = false
@@ -542,6 +540,12 @@
       creationAccessType = Constants.Roles.CREATOR
     }
   }
+
+  const itemCountText = (word, count) => {
+    return `${count} ${word}${
+      count !== 1 ? "s" : ""
+    }`
+  }
 </script>
 
 <svelte:window on:keydown={handleKeyDown} />
@@ -708,9 +712,7 @@
                       {group.name}
                     </div>
                     <div class="auth-entity-meta">
-                      {`${group.users?.length} user${
-                        group.users?.length != 1 ? "s" : ""
-                      }`}
+                      {itemCountText("user", group.users?.length)}
                     </div>
                   </div>
                   <div class="auth-entity-access">
@@ -755,20 +757,20 @@
                       <div class="user-email" title={user.email}>
                         {user.email}
                       </div>
-                      <div class="group-badges">
-                        {#each userGroups.slice(0, 3) as group}
-                          <GroupBadge color={group.color} name={group.name} />
-                        {/each}
-                        {#if userGroups.length > 3}
-                          <BuilderGroupPopover groups={userGroups.slice(3)} />
-                        {/if}
-                      </div>
+                      {#if userGroups.length}
+                        <div class="group-info">
+                          <div class="auth-entity-meta">
+                            {itemCountText("group", userGroups.length)}
+                          </div>
+                          <BuilderGroupPopover groups={userGroups} />
+                        </div>
+                      {/if}
                     </div>
                   </div>
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
                       footer={getRoleFooter(user)}
-                      placeholder={userGroups?.length ? "Override" : false}
+                      placeholder={userGroups?.length ? "Controlled by group" : false}
                       value={parseRole(user)}
                       allowRemove={user.role && !user.group}
                       allowPublic={false}
@@ -949,7 +951,7 @@
 
   .auth-entity,
   .auth-entity-header {
-    padding: 0px var(--spacing-xl);
+    padding: 0 var(--spacing-xl);
   }
 
   .auth-entity,
@@ -958,8 +960,6 @@
     grid-template-columns: 1fr 220px;
     align-items: center;
     gap: var(--spacing-xl);
-    border-bottom: var(--border-light);
-    padding-bottom: var(--spacing-s);
   }
 
   .auth-entity .details {
@@ -1071,12 +1071,16 @@
 
   .user-groups {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    gap: var(--spacing-m);
   }
-  .group-badges {
-    padding-top: var(--spacing-s);
+
+  .group-info {
     display: flex;
-    gap: var(--spacing-s);
-    flex-wrap: wrap;
+    flex-direction: row;
+    gap: var(--spacing-xs);
+    justify-content: center;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte b/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
deleted file mode 100644
index f10e2aa220..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/_components/GroupBadge.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  import { Badge } from "@budibase/bbui"
-
-  export let color
-  export let name
-</script>
-
-<Badge size="S" customColor={`color-mix(in srgb, ${color} 30%, transparent)`}
-  >{name}</Badge
->
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
index 0aa378b46a..b924617a0f 100644
--- a/packages/shared-core/src/helpers/index.ts
+++ b/packages/shared-core/src/helpers/index.ts
@@ -6,3 +6,4 @@ export * as cron from "./cron"
 export * as schema from "./schema"
 export * as views from "./views"
 export * as roles from "./roles"
+export * as lists from "./lists"
diff --git a/packages/shared-core/src/helpers/lists.ts b/packages/shared-core/src/helpers/lists.ts
new file mode 100644
index 0000000000..64b906fef8
--- /dev/null
+++ b/packages/shared-core/src/helpers/lists.ts
@@ -0,0 +1,7 @@
+export function punctuateList(list: string[]) {
+  if (list.length === 0) return ""
+  if (list.length === 1) return list[0]
+  if (list.length === 2) return list.join(" and ")
+  // For more than 2 elements: join all but the last with commas, then add "and" before the last element.
+  return list.slice(0, -1).join(", ") + " and " + list[list.length - 1]
+}

From c2841b824d5ad83a12fe777f356ae0ef55548152 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Feb 2025 13:25:58 +0000
Subject: [PATCH 13/42] Linting.

---
 .../_components/BuilderGroupPopover.svelte          | 13 +++++++++++--
 .../_components/BuilderSidePanel.svelte             |  8 ++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
index 43c662a6d2..367d84e029 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderGroupPopover.svelte
@@ -4,13 +4,22 @@
 
   export let groups = []
   function tooltip(groups) {
-    const sortedNames = groups.sort((a, b) => a.name.localeCompare(b.name)).map(group => group.name)
+    const sortedNames = groups
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map(group => group.name)
     return `Member of ${helpers.lists.punctuateList(sortedNames)}`
   }
 </script>
 
 <div class="icon">
-  <Icon name="Info" size="XS" color="grey" hoverable tooltip={tooltip(groups)} tooltipPosition="top" />
+  <Icon
+    name="Info"
+    size="XS"
+    color="grey"
+    hoverable
+    tooltip={tooltip(groups)}
+    tooltipPosition="top"
+  />
 </div>
 
 <style>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 0bf32e4b76..7a9b6ba7a0 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -542,9 +542,7 @@
   }
 
   const itemCountText = (word, count) => {
-    return `${count} ${word}${
-      count !== 1 ? "s" : ""
-    }`
+    return `${count} ${word}${count !== 1 ? "s" : ""}`
   }
 </script>
 
@@ -770,7 +768,9 @@
                   <div class="auth-entity-access" class:muted={user.group}>
                     <RoleSelect
                       footer={getRoleFooter(user)}
-                      placeholder={userGroups?.length ? "Controlled by group" : false}
+                      placeholder={userGroups?.length
+                        ? "Controlled by group"
+                        : false}
                       value={parseRole(user)}
                       allowRemove={user.role && !user.group}
                       allowPublic={false}

From 1d35f2a029b2fcc0e37564bf8ee563bf94629c04 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Feb 2025 13:41:45 +0000
Subject: [PATCH 14/42] Remove comment

---
 packages/shared-core/src/helpers/lists.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/shared-core/src/helpers/lists.ts b/packages/shared-core/src/helpers/lists.ts
index 64b906fef8..3a2cf743a3 100644
--- a/packages/shared-core/src/helpers/lists.ts
+++ b/packages/shared-core/src/helpers/lists.ts
@@ -2,6 +2,5 @@ export function punctuateList(list: string[]) {
   if (list.length === 0) return ""
   if (list.length === 1) return list[0]
   if (list.length === 2) return list.join(" and ")
-  // For more than 2 elements: join all but the last with commas, then add "and" before the last element.
   return list.slice(0, -1).join(", ") + " and " + list[list.length - 1]
 }

From 2022aa1c742bb8ce695d762a15fff80bc9778158 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Feb 2025 15:18:43 +0000
Subject: [PATCH 15/42] Attempting to remove elasticsearch

---
 .github/workflows/budibase_ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6a9aa3e8d0..5e769fc8dc 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -164,7 +164,6 @@ jobs:
             mariadb,
             oracle,
             sqs,
-            elasticsearch,
             none,
           ]
     steps:

From 04324e6220a7c8783bcab1ed72fb84f17e397fa5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Feb 2025 15:31:17 +0000
Subject: [PATCH 16/42] Undo.

---
 .github/workflows/budibase_ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 5e769fc8dc..6a9aa3e8d0 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -164,6 +164,7 @@ jobs:
             mariadb,
             oracle,
             sqs,
+            elasticsearch,
             none,
           ]
     steps:

From 0a17ba7767a5655310a7687e0a752829bb6961bc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 12:55:53 +0100
Subject: [PATCH 17/42] Wrap readable bindings on []

---
 packages/builder/src/dataBinding.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 739ecc9494..80bcd1984a 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -463,6 +463,10 @@ const generateComponentContextBindings = (asset, componentContext) => {
       }
       readableBinding += `.${fieldSchema.name || key}`
 
+      if (readableBinding.includes(" ")) {
+        readableBinding = `[${readableBinding}]`
+      }
+
       // Determine which category this binding belongs in
       const bindingCategory = getComponentBindingCategory(
         component,

From 470cc6bb1ff1ec1eae4aaa9d035793911f3a80a0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 13:02:26 +0100
Subject: [PATCH 18/42] Add options args to date

---
 packages/string-templates/scripts/gen-collection-info.ts | 4 ++--
 packages/string-templates/src/manifest.json              | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/string-templates/scripts/gen-collection-info.ts b/packages/string-templates/scripts/gen-collection-info.ts
index f7df88ee85..61edd0d2fb 100644
--- a/packages/string-templates/scripts/gen-collection-info.ts
+++ b/packages/string-templates/scripts/gen-collection-info.ts
@@ -34,8 +34,8 @@ const outputJSON: Manifest = {}
 const ADDED_HELPERS = {
   date: {
     date: {
-      args: ["datetime", "format"],
-      numArgs: 2,
+      args: ["datetime", "format", "options"],
+      numArgs: 3,
       example: '{{date now "DD-MM-YYYY" "America/New_York" }} -> 21-01-2021',
       description:
         "Format a date using moment.js date formatting - the timezone is optional and uses the tz database.",
diff --git a/packages/string-templates/src/manifest.json b/packages/string-templates/src/manifest.json
index 7931c60641..f36746f3d0 100644
--- a/packages/string-templates/src/manifest.json
+++ b/packages/string-templates/src/manifest.json
@@ -1345,9 +1345,10 @@
     "date": {
       "args": [
         "datetime",
-        "format"
+        "format",
+        "options"
       ],
-      "numArgs": 2,
+      "numArgs": 3,
       "example": "{{date now \"DD-MM-YYYY\" \"America/New_York\" }} -> 21-01-2021",
       "description": "<p>Format a date using moment.js date formatting - the timezone is optional and uses the tz database.</p>\n"
     },

From 5c20b496b720f58e768ce36b4397f528e53a240c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 27 Feb 2025 12:08:00 +0000
Subject: [PATCH 19/42] Handling long email addresses.

---
 .../_components/BuilderSidePanel.svelte         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 7a9b6ba7a0..16af731e02 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -966,15 +966,16 @@
     display: flex;
     align-items: center;
     gap: var(--spacing-m);
-    color: var(--spectrum-global-color-gray-900);
     overflow: hidden;
+    width: 100%;
   }
 
   .auth-entity .user-email {
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    flex: 1 1 0;
+    min-width: 0;
     overflow: hidden;
-    color: var(--spectrum-global-color-gray-900);
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   #builder-side-panel-container {
@@ -1072,15 +1073,19 @@
   .user-groups {
     display: flex;
     flex-direction: row;
-    justify-content: center;
+    justify-content: flex-start; /* or space-between */
     align-items: center;
     gap: var(--spacing-m);
+    width: 100%;
+    min-width: 0;
   }
 
   .group-info {
     display: flex;
     flex-direction: row;
     gap: var(--spacing-xs);
-    justify-content: center;
+    justify-content: end;
+    width: 60px;
+    flex: 0 0 auto;
   }
 </style>

From b0c4bc5d3dbb887b0597c63d0293de9cb6845942 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 13:10:09 +0100
Subject: [PATCH 20/42] Remove unnecessary numArgs

---
 .../scripts/gen-collection-info.ts            |   5 -
 packages/string-templates/src/manifest.json   | 138 ------------------
 2 files changed, 143 deletions(-)

diff --git a/packages/string-templates/scripts/gen-collection-info.ts b/packages/string-templates/scripts/gen-collection-info.ts
index 61edd0d2fb..ffe9f68add 100644
--- a/packages/string-templates/scripts/gen-collection-info.ts
+++ b/packages/string-templates/scripts/gen-collection-info.ts
@@ -17,7 +17,6 @@ type BudibaseAnnotation = Annotation & {
 
 type Helper = {
   args: string[]
-  numArgs: number
   example?: string
   description: string
   requiresBlock?: boolean
@@ -35,14 +34,12 @@ const ADDED_HELPERS = {
   date: {
     date: {
       args: ["datetime", "format", "options"],
-      numArgs: 3,
       example: '{{date now "DD-MM-YYYY" "America/New_York" }} -> 21-01-2021',
       description:
         "Format a date using moment.js date formatting - the timezone is optional and uses the tz database.",
     },
     duration: {
       args: ["time", "durationType"],
-      numArgs: 2,
       example: '{{duration 8 "seconds"}} -> a few seconds',
       description:
         "Produce a humanized duration left/until given an amount of time and the type of time measurement.",
@@ -53,7 +50,6 @@ const ADDED_HELPERS = {
 function fixSpecialCases(name: string, obj: Helper) {
   if (name === "ifNth") {
     obj.args = ["a", "b", "options"]
-    obj.numArgs = 3
   }
   if (name === "eachIndex") {
     obj.description = "Iterates the array, listing an item and the index of it."
@@ -163,7 +159,6 @@ function run() {
         .map(tag => tag.description!.replace(/`/g, "").split(" ")[0].trim())
       collectionInfo[name] = fixSpecialCases(name, {
         args,
-        numArgs: args.length,
         example: jsDocInfo.example || undefined,
         description: jsDocInfo.description,
         requiresBlock: jsDocInfo.acceptsBlock && !jsDocInfo.acceptsInline,
diff --git a/packages/string-templates/src/manifest.json b/packages/string-templates/src/manifest.json
index f36746f3d0..e47af7d69a 100644
--- a/packages/string-templates/src/manifest.json
+++ b/packages/string-templates/src/manifest.json
@@ -4,7 +4,6 @@
       "args": [
         "a"
       ],
-      "numArgs": 1,
       "example": "{{ abs 12012.1000 }} -> 12012.1",
       "description": "<p>Return the magnitude of <code>a</code>.</p>\n",
       "requiresBlock": false
@@ -14,7 +13,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ add 1 2 }} -> 3",
       "description": "<p>Return the sum of <code>a</code> plus <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -23,7 +21,6 @@
       "args": [
         "array"
       ],
-      "numArgs": 1,
       "example": "{{ avg 1 2 3 4 5 }} -> 3",
       "description": "<p>Returns the average of all numbers in the given array.</p>\n",
       "requiresBlock": false
@@ -32,7 +29,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{ ceil 1.2 }} -> 2",
       "description": "<p>Get the <code>Math.ceil()</code> of the given value.</p>\n",
       "requiresBlock": false
@@ -42,7 +38,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ divide 10 5 }} -> 2",
       "description": "<p>Divide <code>a</code> by <code>b</code></p>\n",
       "requiresBlock": false
@@ -51,7 +46,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{ floor 1.2 }} -> 1",
       "description": "<p>Get the <code>Math.floor()</code> of the given value.</p>\n",
       "requiresBlock": false
@@ -61,7 +55,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ subtract 10 5 }} -> 5",
       "description": "<p>Return the product of <code>a</code> minus <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -71,7 +64,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ modulo 10 5 }} -> 0",
       "description": "<p>Get the remainder of a division operation.</p>\n",
       "requiresBlock": false
@@ -81,7 +73,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ multiply 10 5 }} -> 50",
       "description": "<p>Multiply number <code>a</code> by number <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -91,7 +82,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ plus 10 5 }} -> 15",
       "description": "<p>Add <code>a</code> by <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -101,7 +91,6 @@
         "min",
         "max"
       ],
-      "numArgs": 2,
       "example": "{{ random 0 20 }} -> 10",
       "description": "<p>Generate a random number between two values</p>\n",
       "requiresBlock": false
@@ -111,7 +100,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ remainder 10 6 }} -> 4",
       "description": "<p>Get the remainder when <code>a</code> is divided by <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -120,7 +108,6 @@
       "args": [
         "number"
       ],
-      "numArgs": 1,
       "example": "{{ round 10.3 }} -> 10",
       "description": "<p>Round the given number.</p>\n",
       "requiresBlock": false
@@ -130,7 +117,6 @@
         "a",
         "b"
       ],
-      "numArgs": 2,
       "example": "{{ subtract 10 5 }} -> 5",
       "description": "<p>Return the product of <code>a</code> minus <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -139,7 +125,6 @@
       "args": [
         "array"
       ],
-      "numArgs": 1,
       "example": "{{ sum [1, 2, 3] }} -> 6",
       "description": "<p>Returns the sum of all numbers in the given array.</p>\n",
       "requiresBlock": false
@@ -151,7 +136,6 @@
         "array",
         "n"
       ],
-      "numArgs": 2,
       "example": "{{ after ['a', 'b', 'c', 'd'] 2}} -> ['c', 'd']",
       "description": "<p>Returns all of the items in an array after the specified index. Opposite of <a href=\"#before\">before</a>.</p>\n",
       "requiresBlock": false
@@ -160,7 +144,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{ arrayify 'foo' }} -> ['foo']",
       "description": "<p>Cast the given <code>value</code> to an array.</p>\n",
       "requiresBlock": false
@@ -170,7 +153,6 @@
         "array",
         "n"
       ],
-      "numArgs": 2,
       "example": "{{ before ['a', 'b', 'c', 'd'] 3}} -> ['a', 'b']",
       "description": "<p>Return all of the items in the collection before the specified count. Opposite of <a href=\"#after\">after</a>.</p>\n",
       "requiresBlock": false
@@ -180,7 +162,6 @@
         "array",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#eachIndex [1, 2, 3]}} {{item}} is {{index}} {{/eachIndex}} -> ' 1 is 0  2 is 1  3 is 2 '",
       "description": "<p>Iterates the array, listing an item and the index of it.</p>\n",
       "requiresBlock": true
@@ -191,7 +172,6 @@
         "value",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#filter [1, 2, 3] 2}}2 Found{{else}}2 not found{{/filter}} -> 2 Found",
       "description": "<p>Block helper that filters the given array and renders the block for values that evaluate to <code>true</code>, otherwise the inverse block is returned.</p>\n",
       "requiresBlock": true
@@ -201,7 +181,6 @@
         "array",
         "n"
       ],
-      "numArgs": 2,
       "example": "{{first [1, 2, 3, 4] 2}} -> 1,2",
       "description": "<p>Returns the first item, or first <code>n</code> items of an array.</p>\n",
       "requiresBlock": false
@@ -211,7 +190,6 @@
         "array",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#forEach [{ 'name': 'John' }] }} {{ name }} {{/forEach}} -> ' John '",
       "description": "<p>Iterates over each item in an array and exposes the current item in the array as context to the inner block. In addition to the current array item, the helper exposes the following variables to the inner block: - <code>index</code> - <code>total</code> - <code>isFirst</code> - <code>isLast</code> Also, <code>@index</code> is exposed as a private variable, and additional private variables may be defined as hash arguments.</p>\n",
       "requiresBlock": true
@@ -222,7 +200,6 @@
         "value",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#inArray [1, 2, 3] 2}} 2 exists {{else}} 2 does not exist {{/inArray}} -> ' 2 exists '",
       "description": "<p>Block helper that renders the block if an array has the given <code>value</code>. Optionally specify an inverse block to render when the array does not have the given value.</p>\n",
       "requiresBlock": true
@@ -231,7 +208,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{isArray [1, 2]}} -> true",
       "description": "<p>Returns true if <code>value</code> is an es5 array.</p>\n",
       "requiresBlock": false
@@ -241,7 +217,6 @@
         "array",
         "idx"
       ],
-      "numArgs": 2,
       "example": "{{itemAt [1, 2, 3] 1}} -> 2",
       "description": "<p>Returns the item from <code>array</code> at index <code>idx</code>.</p>\n",
       "requiresBlock": false
@@ -251,7 +226,6 @@
         "array",
         "separator"
       ],
-      "numArgs": 2,
       "example": "{{join [1, 2, 3]}} -> 1, 2, 3",
       "description": "<p>Join all elements of array into a string, optionally using a given separator.</p>\n",
       "requiresBlock": false
@@ -261,7 +235,6 @@
         "value",
         "length"
       ],
-      "numArgs": 2,
       "example": "{{equalsLength [1, 2, 3] 3}} -> true",
       "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n",
       "requiresBlock": false
@@ -271,7 +244,6 @@
         "value",
         "n"
       ],
-      "numArgs": 2,
       "example": "{{last [1, 2, 3]}} -> 3",
       "description": "<p>Returns the last item, or last <code>n</code> items of an array or string. Opposite of <a href=\"#first\">first</a>.</p>\n",
       "requiresBlock": false
@@ -280,7 +252,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{length [1, 2, 3]}} -> 3",
       "description": "<p>Returns the length of the given string or array.</p>\n",
       "requiresBlock": false
@@ -290,7 +261,6 @@
         "value",
         "length"
       ],
-      "numArgs": 2,
       "example": "{{equalsLength [1, 2, 3] 3}} -> true",
       "description": "<p>Returns true if the the length of the given <code>value</code> is equal to the given <code>length</code>. Can be used as a block or inline helper.</p>\n",
       "requiresBlock": false
@@ -300,7 +270,6 @@
         "array",
         "fn"
       ],
-      "numArgs": 2,
       "example": "{{map [1, 2, 3] double}} -> [2, 4, 6]",
       "description": "<p>Returns a new array, created by calling <code>function</code> on each element of the given <code>array</code>. For example,</p>\n",
       "requiresBlock": false
@@ -310,7 +279,6 @@
         "collection",
         "prop"
       ],
-      "numArgs": 2,
       "example": "{{pluck [{ 'name': 'Bob' }] 'name' }} -> ['Bob']",
       "description": "<p>Map over the given object or array or objects and create an array of values from the given <code>prop</code>. Dot-notation may be used (as a string) to get nested properties.</p>\n",
       "requiresBlock": false
@@ -319,7 +287,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{reverse [1, 2, 3]}} -> [3, 2, 1]",
       "description": "<p>Reverse the elements in an array, or the characters in a string.</p>\n",
       "requiresBlock": false
@@ -330,7 +297,6 @@
         "iter",
         "provided"
       ],
-      "numArgs": 3,
       "example": "{{#some [1, \"b\", 3] isString}} string found {{else}} No string found {{/some}} -> ' string found '",
       "description": "<p>Block helper that returns the block if the callback returns true for some value in the given array.</p>\n",
       "requiresBlock": true
@@ -340,7 +306,6 @@
         "array",
         "key"
       ],
-      "numArgs": 2,
       "example": "{{ sort ['b', 'a', 'c'] }} -> ['a', 'b', 'c']",
       "description": "<p>Sort the given <code>array</code>. If an array of objects is passed, you may optionally pass a <code>key</code> to sort on as the second argument. You may alternatively pass a sorting function as the second argument.</p>\n",
       "requiresBlock": false
@@ -350,7 +315,6 @@
         "array",
         "props"
       ],
-      "numArgs": 2,
       "example": "{{ sortBy [{'a': 'zzz'}, {'a': 'aaa'}] 'a' }} -> [{'a':'aaa'},{'a':'zzz'}]",
       "description": "<p>Sort an <code>array</code>. If an array of objects is passed, you may optionally pass a <code>key</code> to sort on as the second argument. You may alternatively pass a sorting function as the second argument.</p>\n",
       "requiresBlock": false
@@ -361,7 +325,6 @@
         "idx",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withAfter [1, 2, 3] 1 }} {{this}} {{/withAfter}} -> ' 2  3 '",
       "description": "<p>Use the items in the array <em>after</em> the specified index as context inside a block. Opposite of <a href=\"#withBefore\">withBefore</a>.</p>\n",
       "requiresBlock": true
@@ -372,7 +335,6 @@
         "idx",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withBefore [1, 2, 3] 2 }} {{this}} {{/withBefore}} -> ' 1 '",
       "description": "<p>Use the items in the array <em>before</em> the specified index as context inside a block. Opposite of <a href=\"#withAfter\">withAfter</a>.</p>\n",
       "requiresBlock": true
@@ -383,7 +345,6 @@
         "idx",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withFirst [1, 2, 3] }}{{this}}{{/withFirst}} -> 1",
       "description": "<p>Use the first item in a collection inside a handlebars block expression. Opposite of <a href=\"#withLast\">withLast</a>.</p>\n",
       "requiresBlock": true
@@ -394,7 +355,6 @@
         "size",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withGroup [1, 2, 3, 4] 2}}{{#each this}}{{.}}{{/each}}<br>{{/withGroup}} -> 12<br>34<br>",
       "description": "<p>Block helper that groups array elements by given group <code>size</code>.</p>\n",
       "requiresBlock": true
@@ -405,7 +365,6 @@
         "idx",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withLast [1, 2, 3, 4]}}{{this}}{{/withLast}} -> 4",
       "description": "<p>Use the last item or <code>n</code> items in an array as context inside a block. Opposite of <a href=\"#withFirst\">withFirst</a>.</p>\n",
       "requiresBlock": true
@@ -416,7 +375,6 @@
         "prop",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#withSort ['b', 'a', 'c']}}{{this}}{{/withSort}} -> abc",
       "description": "<p>Block helper that sorts a collection and exposes the sorted collection as context inside the block.</p>\n",
       "requiresBlock": true
@@ -426,7 +384,6 @@
         "array",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#each (unique ['a', 'a', 'c', 'b', 'e', 'e']) }}{{.}}{{/each}} -> acbe",
       "description": "<p>Block helper that return an array with all duplicate values removed. Best used along with a <a href=\"#each\">each</a> helper.</p>\n",
       "requiresBlock": true
@@ -437,7 +394,6 @@
       "args": [
         "number"
       ],
-      "numArgs": 1,
       "example": "{{ bytes 1386 1 }} -> 1.4 kB",
       "description": "<p>Format a number to it&#39;s equivalent in bytes. If a string is passed, it&#39;s length will be formatted and returned. <strong>Examples:</strong> - <code>&#39;foo&#39; =&gt; 3 B</code> - <code>13661855 =&gt; 13.66 MB</code> - <code>825399 =&gt; 825.39 kB</code> - <code>1396 =&gt; 1.4 kB</code></p>\n",
       "requiresBlock": false
@@ -446,7 +402,6 @@
       "args": [
         "num"
       ],
-      "numArgs": 1,
       "example": "{{ addCommas 1000000 }} -> 1,000,000",
       "description": "<p>Add commas to numbers</p>\n",
       "requiresBlock": false
@@ -455,7 +410,6 @@
       "args": [
         "num"
       ],
-      "numArgs": 1,
       "example": "{{ phoneNumber 8005551212 }} -> (800) 555-1212",
       "description": "<p>Convert a string or number to a formatted phone number.</p>\n",
       "requiresBlock": false
@@ -465,7 +419,6 @@
         "number",
         "precision"
       ],
-      "numArgs": 2,
       "example": "{{ toAbbr 10123 2 }} -> 10.12k",
       "description": "<p>Abbreviate numbers to the given number of <code>precision</code>. This for general numbers, not size in bytes.</p>\n",
       "requiresBlock": false
@@ -475,7 +428,6 @@
         "number",
         "fractionDigits"
       ],
-      "numArgs": 2,
       "example": "{{ toExponential 10123 2 }} -> 1.01e+4",
       "description": "<p>Returns a string representing the given number in exponential notation.</p>\n",
       "requiresBlock": false
@@ -485,7 +437,6 @@
         "number",
         "digits"
       ],
-      "numArgs": 2,
       "example": "{{ toFixed 1.1234 2 }} -> 1.12",
       "description": "<p>Formats the given number using fixed-point notation.</p>\n",
       "requiresBlock": false
@@ -494,7 +445,6 @@
       "args": [
         "number"
       ],
-      "numArgs": 1,
       "description": "<p>Convert input to a float.</p>\n",
       "requiresBlock": false
     },
@@ -502,7 +452,6 @@
       "args": [
         "number"
       ],
-      "numArgs": 1,
       "description": "<p>Convert input to an integer.</p>\n",
       "requiresBlock": false
     },
@@ -511,7 +460,6 @@
         "number",
         "precision"
       ],
-      "numArgs": 2,
       "example": "{{toPrecision '1.1234' 2}} -> 1.1",
       "description": "<p>Returns a string representing the <code>Number</code> object to the specified precision.</p>\n",
       "requiresBlock": false
@@ -522,7 +470,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ encodeURI 'https://myurl?Hello There' }} -> https%3A%2F%2Fmyurl%3FHello%20There",
       "description": "<p>Encodes a Uniform Resource Identifier (URI) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.</p>\n",
       "requiresBlock": false
@@ -531,7 +478,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ escape 'https://myurl?Hello+There' }} -> https%3A%2F%2Fmyurl%3FHello%2BThere",
       "description": "<p>Escape the given string by replacing characters with escape sequences. Useful for allowing the string to be used in a URL, etc.</p>\n",
       "requiresBlock": false
@@ -540,7 +486,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ decodeURI 'https://myurl?Hello%20There' }} -> https://myurl?Hello There",
       "description": "<p>Decode a Uniform Resource Identifier (URI) component.</p>\n",
       "requiresBlock": false
@@ -550,7 +495,6 @@
         "base",
         "href"
       ],
-      "numArgs": 2,
       "example": "{{ urlResolve 'https://myurl' '/api/test' }} -> https://myurl/api/test",
       "description": "<p>Take a base URL, and a href URL, and resolve them as a browser would for an anchor tag.</p>\n",
       "requiresBlock": false
@@ -559,7 +503,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ urlParse 'https://myurl/api/test' }}",
       "description": "<p>Parses a <code>url</code> string into an object.</p>\n",
       "requiresBlock": false
@@ -568,7 +511,6 @@
       "args": [
         "url"
       ],
-      "numArgs": 1,
       "example": "{{ stripQuerystring 'https://myurl/api/test?foo=bar' }} -> 'https://myurl/api/test'",
       "description": "<p>Strip the query string from the given <code>url</code>.</p>\n",
       "requiresBlock": false
@@ -577,7 +519,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ stripProtocol 'https://myurl/api/test' }} -> '//myurl/api/test'",
       "description": "<p>Strip protocol from a <code>url</code>. Useful for displaying media that may have an &#39;http&#39; protocol on secure connections.</p>\n",
       "requiresBlock": false
@@ -589,7 +530,6 @@
         "str",
         "suffix"
       ],
-      "numArgs": 2,
       "example": "{{append 'index' '.html'}} -> index.html",
       "description": "<p>Append the specified <code>suffix</code> to the given string.</p>\n",
       "requiresBlock": false
@@ -598,7 +538,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{camelcase 'foo bar baz'}} ->  fooBarBaz",
       "description": "<p>camelCase the characters in the given <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -607,7 +546,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{capitalize 'foo bar baz'}} ->  Foo bar baz",
       "description": "<p>Capitalize the first word in a sentence.</p>\n",
       "requiresBlock": false
@@ -616,7 +554,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{ capitalizeAll 'foo bar baz'}} ->  Foo Bar Baz",
       "description": "<p>Capitalize all words in a string.</p>\n",
       "requiresBlock": false
@@ -626,7 +563,6 @@
         "str",
         "spaces"
       ],
-      "numArgs": 2,
       "example": "{{ center 'test' 1}} -> ' test '",
       "description": "<p>Center a string using non-breaking spaces</p>\n",
       "requiresBlock": false
@@ -635,7 +571,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{ chop ' ABC '}} -> ABC",
       "description": "<p>Like trim, but removes both extraneous whitespace <strong>and non-word characters</strong> from the beginning and end of a string.</p>\n",
       "requiresBlock": false
@@ -644,7 +579,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{dashcase 'a-b-c d_e'}} -> a-b-c-d-e",
       "description": "<p>dash-case the characters in <code>string</code>. Replaces non-word characters and periods with hyphens.</p>\n",
       "requiresBlock": false
@@ -653,7 +587,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{dotcase 'a-b-c d_e'}} -> a.b.c.d.e",
       "description": "<p>dot.case the characters in <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -662,7 +595,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{downcase 'aBcDeF'}} -> abcdef",
       "description": "<p>Lowercase all of the characters in the given string. Alias for <a href=\"#lowercase\">lowercase</a>.</p>\n",
       "requiresBlock": false
@@ -672,7 +604,6 @@
         "str",
         "length"
       ],
-      "numArgs": 2,
       "example": "{{ellipsis 'foo bar baz' 7}} -> foo bar…",
       "description": "<p>Truncates a string to the specified <code>length</code>, and appends it with an elipsis, <code>…</code>.</p>\n",
       "requiresBlock": false
@@ -681,7 +612,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{hyphenate 'foo bar baz qux'}} -> foo-bar-baz-qux",
       "description": "<p>Replace spaces in a string with hyphens.</p>\n",
       "requiresBlock": false
@@ -690,7 +620,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "example": "{{isString 'foo'}} -> true",
       "description": "<p>Return true if <code>value</code> is a string.</p>\n",
       "requiresBlock": false
@@ -699,7 +628,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{lowercase 'Foo BAR baZ'}} -> foo bar baz",
       "description": "<p>Lowercase all characters in the given string.</p>\n",
       "requiresBlock": false
@@ -709,7 +637,6 @@
         "str",
         "substring"
       ],
-      "numArgs": 2,
       "example": "{{occurrences 'foo bar foo bar baz' 'foo'}} -> 2",
       "description": "<p>Return the number of occurrences of <code>substring</code> within the given <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -718,7 +645,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{pascalcase 'foo bar baz'}} -> FooBarBaz",
       "description": "<p>PascalCase the characters in <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -727,7 +653,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{pathcase 'a-b-c d_e'}} -> a/b/c/d/e",
       "description": "<p>path/case the characters in <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -736,7 +661,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{plusify 'foo bar baz'}} -> foo+bar+baz",
       "description": "<p>Replace spaces in the given string with pluses.</p>\n",
       "requiresBlock": false
@@ -746,7 +670,6 @@
         "str",
         "prefix"
       ],
-      "numArgs": 2,
       "example": "{{prepend 'bar' 'foo-'}} -> foo-bar",
       "description": "<p>Prepends the given <code>string</code> with the specified <code>prefix</code>.</p>\n",
       "requiresBlock": false
@@ -756,7 +679,6 @@
         "str",
         "substring"
       ],
-      "numArgs": 2,
       "example": "{{remove 'a b a b a b' 'a '}} -> b b b",
       "description": "<p>Remove all occurrences of <code>substring</code> from the given <code>str</code>.</p>\n",
       "requiresBlock": false
@@ -766,7 +688,6 @@
         "str",
         "substring"
       ],
-      "numArgs": 2,
       "example": "{{removeFirst 'a b a b a b' 'a'}} -> ' b a b a b'",
       "description": "<p>Remove the first occurrence of <code>substring</code> from the given <code>str</code>.</p>\n",
       "requiresBlock": false
@@ -777,7 +698,6 @@
         "a",
         "b"
       ],
-      "numArgs": 3,
       "example": "{{replace 'a b a b a b' 'a' 'z'}} -> z b z b z b",
       "description": "<p>Replace all occurrences of substring <code>a</code> with substring <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -788,7 +708,6 @@
         "a",
         "b"
       ],
-      "numArgs": 3,
       "example": "{{replaceFirst 'a b a b a b' 'a' 'z'}} -> z b a b a b",
       "description": "<p>Replace the first occurrence of substring <code>a</code> with substring <code>b</code>.</p>\n",
       "requiresBlock": false
@@ -797,7 +716,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{sentence 'hello world. goodbye world.'}} -> Hello world. Goodbye world.",
       "description": "<p>Sentence case the given string</p>\n",
       "requiresBlock": false
@@ -806,7 +724,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{snakecase 'a-b-c d_e'}} -> a_b_c_d_e",
       "description": "<p>snake_case the characters in the given <code>string</code>.</p>\n",
       "requiresBlock": false
@@ -815,7 +732,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{split 'a,b,c'}} -> ['a', 'b', 'c']",
       "description": "<p>Split <code>string</code> by the given <code>character</code>.</p>\n",
       "requiresBlock": false
@@ -826,7 +742,6 @@
         "testString",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#startsWith 'Goodbye' 'Hello, world!'}}Yep{{else}}Nope{{/startsWith}} -> Nope",
       "description": "<p>Tests whether a string begins with the given prefix.</p>\n",
       "requiresBlock": true
@@ -835,7 +750,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{titleize 'this is title case' }} -> This Is Title Case",
       "description": "<p>Title case the given string.</p>\n",
       "requiresBlock": false
@@ -844,7 +758,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{trim '  ABC  ' }} -> ABC",
       "description": "<p>Removes extraneous whitespace from the beginning and end of a string.</p>\n",
       "requiresBlock": false
@@ -853,7 +766,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{trimLeft '  ABC ' }} -> 'ABC '",
       "description": "<p>Removes extraneous whitespace from the beginning of a string.</p>\n",
       "requiresBlock": false
@@ -862,7 +774,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{trimRight '  ABC ' }} ->  '  ABC'",
       "description": "<p>Removes extraneous whitespace from the end of a string.</p>\n",
       "requiresBlock": false
@@ -873,7 +784,6 @@
         "limit",
         "suffix"
       ],
-      "numArgs": 3,
       "example": "{{truncate 'foo bar baz' 7 }} -> foo bar",
       "description": "<p>Truncate a string to the specified <code>length</code>. Also see <a href=\"#ellipsis\">ellipsis</a>.</p>\n",
       "requiresBlock": false
@@ -884,7 +794,6 @@
         "limit",
         "suffix"
       ],
-      "numArgs": 3,
       "example": "{{truncateWords 'foo bar baz' 1 }} -> foo…",
       "description": "<p>Truncate a string to have the specified number of words. Also see <a href=\"#truncate\">truncate</a>.</p>\n",
       "requiresBlock": false
@@ -893,7 +802,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "example": "{{upcase 'aBcDef'}} -> ABCDEF",
       "description": "<p>Uppercase all of the characters in the given string. Alias for <a href=\"#uppercase\">uppercase</a>.</p>\n",
       "requiresBlock": false
@@ -903,7 +811,6 @@
         "str",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{uppercase 'aBcDef'}} -> ABCDEF",
       "description": "<p>Uppercase all of the characters in the given string. If used as a block helper it will uppercase the entire block. This helper does not support inverse blocks.</p>\n",
       "requiresBlock": false
@@ -912,7 +819,6 @@
       "args": [
         "num"
       ],
-      "numArgs": 1,
       "example": "{{lorem 11}} -> Lorem ipsum",
       "description": "<p>Takes a number and returns that many charaters of Lorem Ipsum</p>\n",
       "requiresBlock": false
@@ -925,7 +831,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#and great magnificent}}both{{else}}no{{/and}} -> no",
       "description": "<p>Helper that renders the block if <strong>both</strong> of the given values are truthy. If an inverse block is specified it will be rendered when falsy. Works as a block helper, inline helper or subexpression.</p>\n",
       "requiresBlock": true
@@ -937,7 +842,6 @@
         "b",
         "options"
       ],
-      "numArgs": 4,
       "example": "{{compare 10 '<' 5 }} -> false",
       "description": "<p>Render a block when a comparison of the first and third arguments returns true. The second argument is the [arithemetic operator][operators] to use. You may also optionally specify an inverse block to render when falsy.</p>\n",
       "requiresBlock": false
@@ -949,7 +853,6 @@
         "[startIndex=0]",
         "options"
       ],
-      "numArgs": 4,
       "example": "{{#contains ['a', 'b', 'c'] 'd'}} This will not be rendered. {{else}} This will be rendered. {{/contains}} -> ' This will be rendered. '",
       "description": "<p>Block helper that renders the block if <code>collection</code> has the given <code>value</code>, using strict equality (<code>===</code>) for comparison, otherwise the inverse block is rendered (if specified). If a <code>startIndex</code> is specified and is negative, it is used as the offset from the end of the collection.</p>\n",
       "requiresBlock": true
@@ -959,7 +862,6 @@
         "value",
         "defaultValue"
       ],
-      "numArgs": 2,
       "example": "{{default null null 'default'}} -> default",
       "description": "<p>Returns the first value that is not undefined, otherwise the &#39;default&#39; value is returned.</p>\n",
       "requiresBlock": false
@@ -970,7 +872,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#eq 3 3}}equal{{else}}not equal{{/eq}} -> equal",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n",
       "requiresBlock": true
@@ -981,7 +882,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#gt 4 3}} greater than{{else}} not greater than{{/gt}} -> ' greater than'",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n",
       "requiresBlock": true
@@ -992,7 +892,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#gte 4 3}} greater than or equal{{else}} not greater than{{/gte}} -> ' greater than or equal'",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>greater than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n",
       "requiresBlock": true
@@ -1003,7 +902,6 @@
         "pattern",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#has 'foobar' 'foo'}}has it{{else}}doesn't{{/has}} -> has it",
       "description": "<p>Block helper that renders a block if <code>value</code> has <code>pattern</code>. If an inverse block is specified it will be rendered when falsy.</p>\n",
       "requiresBlock": true
@@ -1013,7 +911,6 @@
         "val",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{isFalsey '' }} -> true",
       "description": "<p>Returns true if the given <code>value</code> is falsey. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.</p>\n",
       "requiresBlock": false
@@ -1023,7 +920,6 @@
         "val",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{isTruthy '12' }} -> true",
       "description": "<p>Returns true if the given <code>value</code> is truthy. Uses the [falsey][] library for comparisons. Please see that library for more information or to report bugs with this helper.</p>\n",
       "requiresBlock": false
@@ -1033,7 +929,6 @@
         "number",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#ifEven 2}} even {{else}} odd {{/ifEven}} -> ' even '",
       "description": "<p>Return true if the given value is an even number.</p>\n",
       "requiresBlock": true
@@ -1044,7 +939,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#ifNth 2 10}}remainder{{else}}no remainder{{/ifNth}} -> remainder",
       "description": "<p>Conditionally renders a block if the remainder is zero when <code>b</code> operand is divided by <code>a</code>. If an inverse block is specified it will be rendered when the remainder is <strong>not zero</strong>.</p>\n",
       "requiresBlock": true
@@ -1054,7 +948,6 @@
         "value",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#ifOdd 3}}odd{{else}}even{{/ifOdd}} -> odd",
       "description": "<p>Block helper that renders a block if <code>value</code> is <strong>an odd number</strong>. If an inverse block is specified it will be rendered when falsy.</p>\n",
       "requiresBlock": true
@@ -1065,7 +958,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#is 3 3}} is {{else}} is not {{/is}} -> ' is '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#eq\">eq</a> but does not do strict equality.</p>\n",
       "requiresBlock": true
@@ -1076,7 +968,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#isnt 3 3}} isnt {{else}} is {{/isnt}} -> ' is '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>not equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. Similar to <a href=\"#unlesseq\">unlessEq</a> but does not use strict equality for comparisons.</p>\n",
       "requiresBlock": true
@@ -1086,7 +977,6 @@
         "context",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#lt 2 3}} less than {{else}} more than or equal {{/lt}} -> ' less than '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n",
       "requiresBlock": true
@@ -1097,7 +987,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#lte 2 3}} less than or equal {{else}} more than {{/lte}} -> ' less than or equal '",
       "description": "<p>Block helper that renders a block if <code>a</code> is <strong>less than or equal to</strong> <code>b</code>. If an inverse block is specified it will be rendered when falsy. You may optionally use the <code>compare=&#39;&#39;</code> hash argument for the second value.</p>\n",
       "requiresBlock": true
@@ -1108,7 +997,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#neither null null}}both falsey{{else}}both not falsey{{/neither}} -> both falsey",
       "description": "<p>Block helper that renders a block if <strong>neither of</strong> the given values are truthy. If an inverse block is specified it will be rendered when falsy.</p>\n",
       "requiresBlock": true
@@ -1118,7 +1006,6 @@
         "val",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#not undefined }}falsey{{else}}not falsey{{/not}} -> falsey",
       "description": "<p>Returns true if <code>val</code> is falsey. Works as a block or inline helper.</p>\n",
       "requiresBlock": true
@@ -1128,7 +1015,6 @@
         "arguments",
         "options"
       ],
-      "numArgs": 2,
       "example": "{{#or 1 2 undefined }} at least one truthy {{else}} all falsey {{/or}} -> ' at least one truthy '",
       "description": "<p>Block helper that renders a block if <strong>any of</strong> the given values is truthy. If an inverse block is specified it will be rendered when falsy.</p>\n",
       "requiresBlock": true
@@ -1139,7 +1025,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#unlessEq 2 1 }} not equal {{else}} equal {{/unlessEq}} -> ' not equal '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is equal to <code>b</code></strong>.</p>\n",
       "requiresBlock": true
@@ -1150,7 +1035,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#unlessGt 20 1 }} not greater than {{else}} greater than {{/unlessGt}} -> ' greater than '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than <code>b</code></strong>.</p>\n",
       "requiresBlock": true
@@ -1161,7 +1045,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#unlessLt 20 1 }}greater than or equal{{else}}less than{{/unlessLt}} -> greater than or equal",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than <code>b</code></strong>.</p>\n",
       "requiresBlock": true
@@ -1172,7 +1055,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#unlessGteq 20 1 }} less than {{else}}greater than or equal to{{/unlessGteq}} -> greater than or equal to",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is greater than or equal to <code>b</code></strong>.</p>\n",
       "requiresBlock": true
@@ -1183,7 +1065,6 @@
         "b",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{#unlessLteq 20 1 }} greater than {{else}} less than or equal to {{/unlessLteq}} -> ' greater than '",
       "description": "<p>Block helper that always renders the inverse block <strong>unless <code>a</code> is less than or equal to <code>b</code></strong>.</p>\n",
       "requiresBlock": true
@@ -1194,7 +1075,6 @@
       "args": [
         "objects"
       ],
-      "numArgs": 1,
       "description": "<p>Extend the context with the properties of other objects. A shallow merge is performed to avoid mutating the context.</p>\n",
       "requiresBlock": false
     },
@@ -1203,7 +1083,6 @@
         "context",
         "options"
       ],
-      "numArgs": 2,
       "description": "<p>Block helper that iterates over the properties of an object, exposing each key and value on the context.</p>\n",
       "requiresBlock": true
     },
@@ -1212,7 +1091,6 @@
         "obj",
         "options"
       ],
-      "numArgs": 2,
       "description": "<p>Block helper that iterates over the <strong>own</strong> properties of an object, exposing each key and value on the context.</p>\n",
       "requiresBlock": true
     },
@@ -1220,7 +1098,6 @@
       "args": [
         "prop"
       ],
-      "numArgs": 1,
       "description": "<p>Take arguments and, if they are string or number, convert them to a dot-delineated object property path.</p>\n",
       "requiresBlock": false
     },
@@ -1230,7 +1107,6 @@
         "context",
         "options"
       ],
-      "numArgs": 3,
       "description": "<p>Use property paths (<code>a.b.c</code>) to get a value or nested value from the context. Works as a regular helper or block helper.</p>\n",
       "requiresBlock": true
     },
@@ -1239,7 +1115,6 @@
         "prop",
         "context"
       ],
-      "numArgs": 2,
       "description": "<p>Use property paths (<code>a.b.c</code>) to get an object from the context. Differs from the <code>get</code> helper in that this helper will return the actual object, including the given property key. Also, this helper does not work as a block helper.</p>\n",
       "requiresBlock": false
     },
@@ -1248,7 +1123,6 @@
         "key",
         "context"
       ],
-      "numArgs": 2,
       "description": "<p>Return true if <code>key</code> is an own, enumerable property of the given <code>context</code> object.</p>\n",
       "requiresBlock": false
     },
@@ -1256,7 +1130,6 @@
       "args": [
         "value"
       ],
-      "numArgs": 1,
       "description": "<p>Return true if <code>value</code> is an object.</p>\n",
       "requiresBlock": false
     },
@@ -1264,7 +1137,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "description": "<p>Parses the given string using <code>JSON.parse</code>.</p>\n",
       "requiresBlock": true
     },
@@ -1272,7 +1144,6 @@
       "args": [
         "obj"
       ],
-      "numArgs": 1,
       "description": "<p>Stringify an object using <code>JSON.stringify</code>.</p>\n",
       "requiresBlock": false
     },
@@ -1281,7 +1152,6 @@
         "object",
         "objects"
       ],
-      "numArgs": 2,
       "description": "<p>Deeply merge the properties of the given <code>objects</code> with the context object.</p>\n",
       "requiresBlock": false
     },
@@ -1289,7 +1159,6 @@
       "args": [
         "string"
       ],
-      "numArgs": 1,
       "description": "<p>Parses the given string using <code>JSON.parse</code>.</p>\n",
       "requiresBlock": true
     },
@@ -1299,7 +1168,6 @@
         "context",
         "options"
       ],
-      "numArgs": 3,
       "description": "<p>Pick properties from the context object.</p>\n",
       "requiresBlock": true
     },
@@ -1307,7 +1175,6 @@
       "args": [
         "obj"
       ],
-      "numArgs": 1,
       "description": "<p>Stringify an object using <code>JSON.stringify</code>.</p>\n",
       "requiresBlock": false
     }
@@ -1317,7 +1184,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{toRegex 'foo'}} -> /foo/",
       "description": "<p>Convert the given string to a regular expression.</p>\n",
       "requiresBlock": false
@@ -1326,7 +1192,6 @@
       "args": [
         "str"
       ],
-      "numArgs": 1,
       "example": "{{test 'foobar' (toRegex 'foo')}} -> true",
       "description": "<p>Returns true if the given <code>str</code> matches the given regex. A regex can be passed on the context, or using the <a href=\"#toregex\">toRegex</a> helper as a subexpression.</p>\n",
       "requiresBlock": false
@@ -1335,7 +1200,6 @@
   "uuid": {
     "uuid": {
       "args": [],
-      "numArgs": 0,
       "example": "{{ uuid }} -> f34ebc66-93bd-4f7c-b79b-92b5569138bc",
       "description": "<p>Generates a UUID, using the V4 method (identical to the browser crypto.randomUUID function).</p>\n",
       "requiresBlock": false
@@ -1348,7 +1212,6 @@
         "format",
         "options"
       ],
-      "numArgs": 3,
       "example": "{{date now \"DD-MM-YYYY\" \"America/New_York\" }} -> 21-01-2021",
       "description": "<p>Format a date using moment.js date formatting - the timezone is optional and uses the tz database.</p>\n"
     },
@@ -1357,7 +1220,6 @@
         "time",
         "durationType"
       ],
-      "numArgs": 2,
       "example": "{{duration 8 \"seconds\"}} -> a few seconds",
       "description": "<p>Produce a humanized duration left/until given an amount of time and the type of time measurement.</p>\n"
     }

From 20c956e0d6ec2c66e50d96443252dbec94b69917 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 13:18:39 +0100
Subject: [PATCH 21/42] Validate blocks

---
 .../src/components/common/CodeEditor/validator/hbs.ts        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index c2b3b464da..cb55dfa7eb 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -45,7 +45,10 @@ export function validateHbsTemplate(
     ) {
       const ignoreMissing = options?.ignoreMissing || false
       nodes.forEach(node => {
-        if (isMustacheStatement(node) && isPathExpression(node.path)) {
+        if (
+          (isMustacheStatement(node) || isBlockStatement(node)) &&
+          isPathExpression(node.path)
+        ) {
           const helperName = node.path.original
 
           const from =

From 6c3382f2ae17fef71cce2a1f802eed98c774c87c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 13:20:22 +0100
Subject: [PATCH 22/42] Fix body count

---
 .../components/common/CodeEditor/validator/hbs.ts  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index cb55dfa7eb..284164a914 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -80,18 +80,22 @@ export function validateHbsTemplate(
             return
           }
 
-          const providedParams = node.params
+          let providedParamsCount = node.params.length
+          if (isBlockStatement(node)) {
+            // Block body counts as a parameter
+            providedParamsCount++
+          }
 
-          if (providedParams.length !== expectedArguments.length) {
+          if (providedParamsCount !== expectedArguments.length) {
             diagnostics.push({
               from,
               to,
               severity: "error",
               message: `Helper "${helperName}" expects ${
                 expectedArguments.length
-              } parameters (${expectedArguments.join(", ")}), but got ${
-                providedParams.length
-              }.`,
+              } parameters (${expectedArguments.join(
+                ", "
+              )}), but got ${providedParamsCount}.`,
             })
           }
         }

From 56e143625d5b2d30d23d227219e5d861a0509a27 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 13:22:53 +0100
Subject: [PATCH 23/42] Body checks

---
 .../src/components/common/CodeEditor/validator/hbs.ts     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index 284164a914..b954bb1e8f 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -78,6 +78,14 @@ export function validateHbsTemplate(
               message: `Helper "${helperName}" requires a body:\n{{#${helperName} ...}} [body] {{/${helperName}}}`,
             })
             return
+          } else if (!requiresBlock && isBlockStatement(node)) {
+            diagnostics.push({
+              from,
+              to,
+              severity: "error",
+              message: `Helper "${helperName}" should not contain a body.`,
+            })
+            return
           }
 
           let providedParamsCount = node.params.length

From 33b8751d7817b0f385cd0e9f081aad8177cd7a39 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 27 Feb 2025 12:36:42 +0000
Subject: [PATCH 24/42] Fixing users meta info for groups.

---
 .../app/[application]/_components/BuilderSidePanel.svelte  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 16af731e02..4a7af9342e 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -706,7 +706,7 @@
                 >
                   <div class="details">
                     <GroupIcon {group} size="S" />
-                    <div>
+                    <div class="group-name">
                       {group.name}
                     </div>
                     <div class="auth-entity-meta">
@@ -935,6 +935,7 @@
     color: var(--spectrum-global-color-gray-600);
     font-size: 12px;
     white-space: nowrap;
+    text-align: end;
   }
 
   .auth-entity-access {
@@ -970,7 +971,7 @@
     width: 100%;
   }
 
-  .auth-entity .user-email {
+  .auth-entity .user-email, .group-name {
     flex: 1 1 0;
     min-width: 0;
     overflow: hidden;
@@ -1073,7 +1074,7 @@
   .user-groups {
     display: flex;
     flex-direction: row;
-    justify-content: flex-start; /* or space-between */
+    justify-content: flex-start;
     align-items: center;
     gap: var(--spacing-m);
     width: 100%;

From 78e558c4aa4baa958062cff08d64038195457529 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 14:16:52 +0100
Subject: [PATCH 25/42] Handle conditional arguments

---
 .../common/CodeEditor/validator/hbs.ts        | 33 +++++++++-
 .../CodeEditor/validator/tests/hbs.spec.ts    | 64 +++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index b954bb1e8f..357cb04a86 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -94,7 +94,15 @@ export function validateHbsTemplate(
             providedParamsCount++
           }
 
-          if (providedParamsCount !== expectedArguments.length) {
+          const optionalArgMatcher = new RegExp(/^\[(.+)\]$/)
+          const optionalArgs = expectedArguments.filter(a =>
+            optionalArgMatcher.test(a)
+          )
+
+          if (
+            !optionalArgs.length &&
+            providedParamsCount !== expectedArguments.length
+          ) {
             diagnostics.push({
               from,
               to,
@@ -105,6 +113,29 @@ export function validateHbsTemplate(
                 ", "
               )}), but got ${providedParamsCount}.`,
             })
+          } else if (optionalArgs.length) {
+            const maxArgs = expectedArguments.length
+            const minArgs = maxArgs - optionalArgs.length
+            const parameters = expectedArguments
+              .map(a => {
+                const test = optionalArgMatcher.exec(a)
+                if (!test?.[1]) {
+                  return a
+                }
+                return `${test[1]} (optional)`
+              })
+              .join(", ")
+            if (
+              minArgs > providedParamsCount ||
+              maxArgs < providedParamsCount
+            ) {
+              diagnostics.push({
+                from,
+                to,
+                severity: "error",
+                message: `Helper "${helperName}" expects between ${minArgs} to ${expectedArguments.length} parameters (${parameters}), but got ${providedParamsCount}.`,
+              })
+            }
           }
         }
 
diff --git a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
index 9484c7a4a5..95ec2e540e 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
@@ -138,5 +138,69 @@ describe("hbs validator", () => {
         },
       ])
     })
+
+    describe("optional parameters", () => {
+      it("supports empty parameters", () => {
+        const validators: CodeValidator = {
+          helperFunction: {
+            arguments: ["a", "b", "[c]"],
+          },
+        }
+        const text = "{{ helperFunction 1 99 }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toHaveLength(0)
+      })
+
+      it("supports valid parameters", () => {
+        const validators: CodeValidator = {
+          helperFunction: {
+            arguments: ["a", "b", "[c]"],
+          },
+        }
+        const text = "{{ helperFunction 1 99 'a' }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toHaveLength(0)
+      })
+
+      it("returns a valid message on missing parameters", () => {
+        const validators: CodeValidator = {
+          helperFunction: {
+            arguments: ["a", "b", "[c]"],
+          },
+        }
+        const text = "{{ helperFunction 1 }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "helperFunction" expects between 2 to 3 parameters (a, b, c (optional)), but got 1.`,
+            severity: "error",
+            to: 22,
+          },
+        ])
+      })
+
+      it("returns a valid message on too many parameters", () => {
+        const validators: CodeValidator = {
+          helperFunction: {
+            arguments: ["a", "b", "[c]"],
+          },
+        }
+        const text = "{{ helperFunction 1 2 3 4 }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "helperFunction" expects between 2 to 3 parameters (a, b, c (optional)), but got 4.`,
+            severity: "error",
+            to: 28,
+          },
+        ])
+      })
+    })
   })
 })

From 7905df5a4a866857445cf8f8c04cbfd8de93a203 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 14:18:38 +0100
Subject: [PATCH 26/42] Date options as optional

---
 packages/string-templates/scripts/gen-collection-info.ts | 2 +-
 packages/string-templates/src/manifest.json              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/string-templates/scripts/gen-collection-info.ts b/packages/string-templates/scripts/gen-collection-info.ts
index ffe9f68add..f34d54b2e1 100644
--- a/packages/string-templates/scripts/gen-collection-info.ts
+++ b/packages/string-templates/scripts/gen-collection-info.ts
@@ -33,7 +33,7 @@ const outputJSON: Manifest = {}
 const ADDED_HELPERS = {
   date: {
     date: {
-      args: ["datetime", "format", "options"],
+      args: ["datetime", "format", "[options]"],
       example: '{{date now "DD-MM-YYYY" "America/New_York" }} -> 21-01-2021',
       description:
         "Format a date using moment.js date formatting - the timezone is optional and uses the tz database.",
diff --git a/packages/string-templates/src/manifest.json b/packages/string-templates/src/manifest.json
index e47af7d69a..931700bf1d 100644
--- a/packages/string-templates/src/manifest.json
+++ b/packages/string-templates/src/manifest.json
@@ -1210,7 +1210,7 @@
       "args": [
         "datetime",
         "format",
-        "options"
+        "[options]"
       ],
       "example": "{{date now \"DD-MM-YYYY\" \"America/New_York\" }} -> 21-01-2021",
       "description": "<p>Format a date using moment.js date formatting - the timezone is optional and uses the tz database.</p>\n"

From e8b6a3c90ee45b3d20bf66e09836df38b32b025c Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 14:39:13 +0100
Subject: [PATCH 27/42] Validate bodies

---
 .../CodeEditor/validator/tests/hbs.spec.ts    | 136 +++++++++++++-----
 1 file changed, 103 insertions(+), 33 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
index 95ec2e540e..4d303e6e27 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
@@ -98,45 +98,115 @@ describe("hbs validator", () => {
   })
 
   describe("expressions with parameters", () => {
-    const validators: CodeValidator = {
-      helperFunction: {
-        arguments: ["a", "b", "c"],
-      },
-    }
+    describe("basic expression", () => {
+      const validators: CodeValidator = {
+        helperFunction: {
+          arguments: ["a", "b", "c"],
+        },
+      }
 
-    it("validate valid params", () => {
-      const text = "{{ helperFunction 1 99 'a' }}"
+      it("validate valid params", () => {
+        const text = "{{ helperFunction 1 99 'a' }}"
 
-      const result = validateHbsTemplate(text, validators)
-      expect(result).toHaveLength(0)
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toHaveLength(0)
+      })
+
+      it("throws on too few params", () => {
+        const text = "{{ helperFunction 100 }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "helperFunction" expects 3 parameters (a, b, c), but got 1.`,
+            severity: "error",
+            to: 24,
+          },
+        ])
+      })
+
+      it("throws on too many params", () => {
+        const text = "{{ helperFunction  1 99 'a' 100 }}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "helperFunction" expects 3 parameters (a, b, c), but got 4.`,
+            severity: "error",
+            to: 34,
+          },
+        ])
+      })
     })
 
-    it("throws on too few params", () => {
-      const text = "{{ helperFunction 100 }}"
-
-      const result = validateHbsTemplate(text, validators)
-      expect(result).toEqual([
-        {
-          from: 0,
-          message: `Helper "helperFunction" expects 3 parameters (a, b, c), but got 1.`,
-          severity: "error",
-          to: 24,
+    describe("body expressions", () => {
+      const validators: CodeValidator = {
+        bodyFunction: {
+          arguments: ["a", "b", "c"],
+          requiresBlock: true,
         },
-      ])
-    })
-
-    it("throws on too many params", () => {
-      const text = "{{ helperFunction  1 99 'a' 100 }}"
-
-      const result = validateHbsTemplate(text, validators)
-      expect(result).toEqual([
-        {
-          from: 0,
-          message: `Helper "helperFunction" expects 3 parameters (a, b, c), but got 4.`,
-          severity: "error",
-          to: 34,
+        nonBodyFunction: {
+          arguments: ["a", "b"],
         },
-      ])
+      }
+
+      it("validate valid params", () => {
+        const text = "{{#bodyFunction 1 99  }}body{{/bodyFunction}}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toHaveLength(0)
+      })
+
+      it("validate empty bodies", () => {
+        const text = "{{#bodyFunction 1 99  }}{{/bodyFunction}}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toHaveLength(0)
+      })
+
+      it("validate too little parameters", () => {
+        const text = "{{#bodyFunction 1 }}{{/bodyFunction}}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "bodyFunction" expects 3 parameters (a, b, c), but got 2.`,
+            severity: "error",
+            to: 37,
+          },
+        ])
+      })
+
+      it("validate too many parameters", () => {
+        const text = "{{#bodyFunction 1 99 'a' 0 }}{{/bodyFunction}}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "bodyFunction" expects 3 parameters (a, b, c), but got 5.`,
+            severity: "error",
+            to: 46,
+          },
+        ])
+      })
+
+      it("validate non-supported body usages", () => {
+        const text = "{{#nonBodyFunction 1 99}}{{/nonBodyFunction}}"
+
+        const result = validateHbsTemplate(text, validators)
+        expect(result).toEqual([
+          {
+            from: 0,
+            message: `Helper "nonBodyFunction" should not contain a body.`,
+            severity: "error",
+            to: 45,
+          },
+        ])
+      })
     })
 
     describe("optional parameters", () => {

From af74d3df620e9232f2370057cbe5371dc96956c6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 14:41:37 +0100
Subject: [PATCH 28/42] Add wrong hbs tests

---
 .../CodeEditor/validator/tests/hbs.spec.ts    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
index 4d303e6e27..5d2cfa06c2 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/tests/hbs.spec.ts
@@ -2,7 +2,7 @@ import { validateHbsTemplate } from "../hbs"
 import { CodeValidator } from "@/types"
 
 describe("hbs validator", () => {
-  it("validate empty strings", () => {
+  it("validates empty strings", () => {
     const text = ""
     const validators = {}
 
@@ -10,7 +10,7 @@ describe("hbs validator", () => {
     expect(result).toHaveLength(0)
   })
 
-  it("validate strings without hbs expressions", () => {
+  it("validates strings without hbs expressions", () => {
     const text = "first line\nand another one"
     const validators = {}
 
@@ -23,7 +23,7 @@ describe("hbs validator", () => {
       fieldName: {},
     }
 
-    it("validate valid expressions", () => {
+    it("validates valid expressions", () => {
       const text = "{{ fieldName }}"
 
       const result = validateHbsTemplate(text, validators)
@@ -105,7 +105,7 @@ describe("hbs validator", () => {
         },
       }
 
-      it("validate valid params", () => {
+      it("validates valid params", () => {
         const text = "{{ helperFunction 1 99 'a' }}"
 
         const result = validateHbsTemplate(text, validators)
@@ -152,21 +152,21 @@ describe("hbs validator", () => {
         },
       }
 
-      it("validate valid params", () => {
+      it("validates valid params", () => {
         const text = "{{#bodyFunction 1 99  }}body{{/bodyFunction}}"
 
         const result = validateHbsTemplate(text, validators)
         expect(result).toHaveLength(0)
       })
 
-      it("validate empty bodies", () => {
+      it("validates empty bodies", () => {
         const text = "{{#bodyFunction 1 99  }}{{/bodyFunction}}"
 
         const result = validateHbsTemplate(text, validators)
         expect(result).toHaveLength(0)
       })
 
-      it("validate too little parameters", () => {
+      it("validates too little parameters", () => {
         const text = "{{#bodyFunction 1 }}{{/bodyFunction}}"
 
         const result = validateHbsTemplate(text, validators)
@@ -180,7 +180,7 @@ describe("hbs validator", () => {
         ])
       })
 
-      it("validate too many parameters", () => {
+      it("validates too many parameters", () => {
         const text = "{{#bodyFunction 1 99 'a' 0 }}{{/bodyFunction}}"
 
         const result = validateHbsTemplate(text, validators)
@@ -194,7 +194,7 @@ describe("hbs validator", () => {
         ])
       })
 
-      it("validate non-supported body usages", () => {
+      it("validates non-supported body usages", () => {
         const text = "{{#nonBodyFunction 1 99}}{{/nonBodyFunction}}"
 
         const result = validateHbsTemplate(text, validators)
@@ -273,4 +273,18 @@ describe("hbs validator", () => {
       })
     })
   })
+
+  it("validates wrong hbs code", () => {
+    const text = "{{#fieldName}}{{/wrong}}"
+
+    const result = validateHbsTemplate(text, {})
+    expect(result).toEqual([
+      {
+        from: 0,
+        message: `The handlebars code is not valid:\nfieldName doesn't match wrong - 1:3`,
+        severity: "error",
+        to: text.length,
+      },
+    ])
+  })
 })

From 6499f7a2706269075e9a4eda6ad32f8c8ed9f55a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 17:11:47 +0100
Subject: [PATCH 29/42] Support empty {{ date }}

---
 packages/string-templates/scripts/gen-collection-info.ts | 2 +-
 packages/string-templates/src/helpers/date.ts            | 6 ++++--
 packages/string-templates/src/manifest.json              | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/string-templates/scripts/gen-collection-info.ts b/packages/string-templates/scripts/gen-collection-info.ts
index f34d54b2e1..d231908a05 100644
--- a/packages/string-templates/scripts/gen-collection-info.ts
+++ b/packages/string-templates/scripts/gen-collection-info.ts
@@ -33,7 +33,7 @@ const outputJSON: Manifest = {}
 const ADDED_HELPERS = {
   date: {
     date: {
-      args: ["datetime", "format", "[options]"],
+      args: ["[datetime]", "[format]", "[options]"],
       example: '{{date now "DD-MM-YYYY" "America/New_York" }} -> 21-01-2021',
       description:
         "Format a date using moment.js date formatting - the timezone is optional and uses the tz database.",
diff --git a/packages/string-templates/src/helpers/date.ts b/packages/string-templates/src/helpers/date.ts
index 589cb3d978..8b52fb61e2 100644
--- a/packages/string-templates/src/helpers/date.ts
+++ b/packages/string-templates/src/helpers/date.ts
@@ -71,7 +71,7 @@ function getContext(thisArg: any, locals: any, options: any) {
 function initialConfig(str: any, pattern: any, options?: any) {
   if (isOptions(pattern)) {
     options = pattern
-    pattern = null
+    pattern = DEFAULT_FORMAT
   }
 
   if (isOptions(str)) {
@@ -93,13 +93,15 @@ function setLocale(this: any, str: any, pattern: any, options?: any) {
   dayjs.locale(opts.lang || opts.language)
 }
 
+const DEFAULT_FORMAT = "MMMM DD, YYYY"
+
 export const date = (str: any, pattern: any, options: any) => {
   const config = initialConfig(str, pattern, options)
 
   // if no args are passed, return a formatted date
   if (config.str == null && config.pattern == null) {
     dayjs.locale("en")
-    return dayjs().format("MMMM DD, YYYY")
+    return dayjs().format(DEFAULT_FORMAT)
   }
 
   setLocale(config.str, config.pattern, config.options)
diff --git a/packages/string-templates/src/manifest.json b/packages/string-templates/src/manifest.json
index 931700bf1d..e399dbff94 100644
--- a/packages/string-templates/src/manifest.json
+++ b/packages/string-templates/src/manifest.json
@@ -1208,8 +1208,8 @@
   "date": {
     "date": {
       "args": [
-        "datetime",
-        "format",
+        "[datetime]",
+        "[format]",
         "[options]"
       ],
       "example": "{{date now \"DD-MM-YYYY\" \"America/New_York\" }} -> 21-01-2021",

From aa2537c4b2af903e0193c17e3551802622b2ed40 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 17:15:58 +0100
Subject: [PATCH 30/42] Clean

---
 .../common/CodeEditor/validator/hbs.ts         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
index 357cb04a86..1fca3967fc 100644
--- a/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
+++ b/packages/builder/src/components/common/CodeEditor/validator/hbs.ts
@@ -116,19 +116,19 @@ export function validateHbsTemplate(
           } else if (optionalArgs.length) {
             const maxArgs = expectedArguments.length
             const minArgs = maxArgs - optionalArgs.length
-            const parameters = expectedArguments
-              .map(a => {
-                const test = optionalArgMatcher.exec(a)
-                if (!test?.[1]) {
-                  return a
-                }
-                return `${test[1]} (optional)`
-              })
-              .join(", ")
             if (
               minArgs > providedParamsCount ||
               maxArgs < providedParamsCount
             ) {
+              const parameters = expectedArguments
+                .map(a => {
+                  const test = optionalArgMatcher.exec(a)
+                  if (!test?.[1]) {
+                    return a
+                  }
+                  return `${test[1]} (optional)`
+                })
+                .join(", ")
               diagnostics.push({
                 from,
                 to,

From cca955da06530277b4ecc55a5e390a3dfa0ae2ab Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 27 Feb 2025 17:27:59 +0100
Subject: [PATCH 31/42] Fixing whitespaces on formulas

---
 .../src/components/backend/DataTable/formula.js        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index 9ec75b52c0..c0fdb96a07 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -26,7 +26,7 @@ export function getBindings({
   if (!table) {
     return bindings
   }
-  for (let [column, schema] of Object.entries(table.schema)) {
+  for (const [column, schema] of Object.entries(table.schema)) {
     const isRelationship = schema.type === FieldType.LINK
     // skip relationships after a certain depth and types which
     // can't bind to
@@ -62,6 +62,12 @@ export function getBindings({
 
     const label = path == null ? column : `${path}.0.${column}`
     const binding = path == null ? `[${column}]` : `[${path}].0.[${column}]`
+
+    let readableBinding = label
+    if (readableBinding.includes(" ")) {
+      readableBinding = `[${readableBinding}]`
+    }
+
     // only supply a description for relationship paths
     const description =
       path == null
@@ -75,7 +81,7 @@ export function getBindings({
       description,
       // don't include path, it messes things up, relationship path
       // will be replaced by the main array binding
-      readableBinding: label,
+      readableBinding,
       runtimeBinding: binding,
       display: {
         name: label,

From 4f697b7731a3e3eca298a69196383bd4f256e987 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 27 Feb 2025 17:12:20 +0000
Subject: [PATCH 32/42] Adding groups to user app list.

---
 .../_components/BuilderSidePanel.svelte       |  3 +-
 .../portal/users/users/[userId].svelte        | 40 ++++++++++++-------
 .../_components/AppRoleTableRenderer.svelte   |  4 +-
 packages/frontend-core/src/constants.ts       |  1 +
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 4a7af9342e..59d14770ae 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -971,7 +971,8 @@
     width: 100%;
   }
 
-  .auth-entity .user-email, .group-name {
+  .auth-entity .user-email,
+  .group-name {
     flex: 1 1 0;
     min-width: 0;
     overflow: hidden;
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 6c480d9ef8..f02c2fe058 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -98,7 +98,9 @@
   $: privileged = sdk.users.isAdminOrGlobalBuilder(user)
   $: nameLabel = getNameLabel(user)
   $: filteredGroups = getFilteredGroups(internalGroups, searchTerm)
-  $: availableApps = getAvailableApps($appsStore.apps, privileged, user?.roles)
+  $: availableApps = user
+    ? getApps(user, sdk.users.userAppAccessList(user, $groups || []))
+    : []
   $: userGroups = $groups.filter(x => {
     return x.users?.find(y => {
       return y._id === userId
@@ -107,23 +109,19 @@
   $: globalRole = users.getUserRole(user)
   $: isTenantOwner = tenantOwner?.email && tenantOwner.email === user?.email
 
-  const getAvailableApps = (appList, privileged, roles) => {
-    let availableApps = appList.slice()
-    if (!privileged) {
-      availableApps = availableApps.filter(x => {
-        let roleKeys = Object.keys(roles || {})
-        return roleKeys.concat(user?.builder?.apps).find(y => {
-          return x.appId === appsStore.extractAppId(y)
-        })
-      })
-    }
+  const getApps = (user, appIds) => {
+    let availableApps = $appsStore.apps
+      .slice()
+      .filter(app =>
+        appIds.find(id => id === appsStore.getProdAppID(app.devId))
+      )
     return availableApps.map(app => {
       const prodAppId = appsStore.getProdAppID(app.devId)
       return {
         name: app.name,
         devId: app.devId,
         icon: app.icon,
-        role: getRole(prodAppId, roles),
+        role: getRole(prodAppId, user),
       }
     })
   }
@@ -136,7 +134,7 @@
     return groups.filter(group => group.name?.toLowerCase().includes(search))
   }
 
-  const getRole = (prodAppId, roles) => {
+  const getRole = (prodAppId, user) => {
     if (privileged) {
       return Constants.Roles.ADMIN
     }
@@ -145,7 +143,21 @@
       return Constants.Roles.CREATOR
     }
 
-    return roles[prodAppId]
+    if (user?.roles[prodAppId]) {
+      return user.roles[prodAppId]
+    }
+
+    // check if access via group for creator
+    const foundGroup = $groups?.find(
+      group => group.roles[prodAppId] || group.builder?.apps[prodAppId]
+    )
+    if (foundGroup.builder?.apps[prodAppId]) {
+      return Constants.Roles.CREATOR
+    }
+    // can't tell how groups will control role
+    if (foundGroup.roles[prodAppId]) {
+      return Constants.Roles.GROUP
+    }
   }
 
   const getNameLabel = user => {
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
index 9429cfbc23..5adc38ebc6 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
@@ -15,7 +15,9 @@
   }
 </script>
 
-{#if value === Constants.Roles.CREATOR}
+{#if value === Constants.Roles.GROUP}
+  Controlled by group
+{:else if value === Constants.Roles.CREATOR}
   Can edit
 {:else}
   <StatusLight
diff --git a/packages/frontend-core/src/constants.ts b/packages/frontend-core/src/constants.ts
index 3e51719bfd..fdf4a8c36f 100644
--- a/packages/frontend-core/src/constants.ts
+++ b/packages/frontend-core/src/constants.ts
@@ -106,6 +106,7 @@ export const Roles = {
   PUBLIC: "PUBLIC",
   BUILDER: "BUILDER",
   CREATOR: "CREATOR",
+  GROUP: "GROUP",
 }
 
 export const EventPublishType = {

From f9d9722adbf2da7275c51ee359049f4df6e2b969 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 28 Feb 2025 10:12:58 +0100
Subject: [PATCH 33/42] Handle whitespaces on complex keys

---
 packages/builder/src/dataBinding.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 80bcd1984a..1b4c69be71 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -373,6 +373,18 @@ const getContextBindings = (asset, componentId) => {
     .flat()
 }
 
+const makeReadableKeyPropSafe = key => {
+  if (!key.includes(" ")) {
+    return key
+  }
+
+  if (new RegExp(/^\[(.+)\]$/).test(key.test)) {
+    return key
+  }
+
+  return `[${key}]`
+}
+
 /**
  * Generates a set of bindings for a given component context
  */
@@ -457,15 +469,11 @@ const generateComponentContextBindings = (asset, componentContext) => {
       const runtimeBinding = `${safeComponentId}.${safeKey}`
 
       // Optionally use a prefix with readable bindings
-      let readableBinding = component._instanceName
+      let readableBinding = makeReadableKeyPropSafe(component._instanceName)
       if (readablePrefix) {
         readableBinding += `.${readablePrefix}`
       }
-      readableBinding += `.${fieldSchema.name || key}`
-
-      if (readableBinding.includes(" ")) {
-        readableBinding = `[${readableBinding}]`
-      }
+      readableBinding += `.${makeReadableKeyPropSafe(fieldSchema.name || key)}`
 
       // Determine which category this binding belongs in
       const bindingCategory = getComponentBindingCategory(
@@ -477,7 +485,7 @@ const generateComponentContextBindings = (asset, componentContext) => {
       bindings.push({
         type: "context",
         runtimeBinding,
-        readableBinding: `${readableBinding}`,
+        readableBinding,
         // Field schema and provider are required to construct relationship
         // datasource options, based on bindable properties
         fieldSchema,
@@ -1358,13 +1366,14 @@ const bindingReplacement = (
   }
   // work from longest to shortest
   const convertFromProps = bindableProperties
+    // TODO check whitespaces
     .map(el => el[convertFrom])
     .sort((a, b) => {
       return b.length - a.length
     })
   const boundValues = textWithBindings.match(regex) || []
   let result = textWithBindings
-  for (let boundValue of boundValues) {
+  for (const boundValue of boundValues) {
     let newBoundValue = boundValue
     // we use a search string, where any time we replace something we blank it out
     // in the search, working from longest to shortest so always use best match first

From d7702810c2236fa5a69915d1ef4d2fc3771f8618 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 28 Feb 2025 10:27:36 +0100
Subject: [PATCH 34/42] Handle whitespaces on complex keys in formulas

---
 .../builder/src/components/backend/DataTable/formula.js  | 9 ++++-----
 packages/builder/src/dataBinding.js                      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index c0fdb96a07..8dcda83c27 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -2,6 +2,7 @@ import { FieldType } from "@budibase/types"
 import { FIELDS } from "@/constants/backend"
 import { tables } from "@/stores/builder"
 import { get as svelteGet } from "svelte/store"
+import { makeReadableKeyPropSafe } from "@/dataBinding"
 
 // currently supported level of relationship depth (server side)
 const MAX_DEPTH = 1
@@ -62,11 +63,9 @@ export function getBindings({
 
     const label = path == null ? column : `${path}.0.${column}`
     const binding = path == null ? `[${column}]` : `[${path}].0.[${column}]`
-
-    let readableBinding = label
-    if (readableBinding.includes(" ")) {
-      readableBinding = `[${readableBinding}]`
-    }
+    const readableBinding = (path == null ? [column] : [path, "0", column])
+      .map(makeReadableKeyPropSafe)
+      .join(".")
 
     // only supply a description for relationship paths
     const description =
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 1b4c69be71..c6171c72a4 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -373,7 +373,7 @@ const getContextBindings = (asset, componentId) => {
     .flat()
 }
 
-const makeReadableKeyPropSafe = key => {
+export const makeReadableKeyPropSafe = key => {
   if (!key.includes(" ")) {
     return key
   }

From 5cd5a201772b18863176d53d558ee44452be482d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 15:01:34 +0000
Subject: [PATCH 35/42] Fixing an issue switching back to controlled by group.

---
 .../_components/BuilderSidePanel.svelte           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 59d14770ae..737edd69f7 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -198,12 +198,19 @@
       return
     }
     const update = await users.get(user._id)
+    const newRoles = {
+      ...update.roles,
+      [prodAppId]: role,
+    }
+    // make sure no undefined/null roles (during removal)
+    for (let [appId, role] of Object.entries(newRoles)) {
+      if (!role) {
+        delete newRoles[appId]
+      }
+    }
     await users.save({
       ...update,
-      roles: {
-        ...update.roles,
-        [prodAppId]: role,
-      },
+      roles: newRoles,
     })
     await searchUsers(query, $builderStore.builderSidePanel, loaded)
   }

From 67d31b971a69e3d664606c36672c2758f51df7ab Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 16:56:31 +0000
Subject: [PATCH 36/42] Updating master reference.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index e3843dd4ea..b28dbd5492 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit e3843dd4eaced68ae063355b77df200dbc789c98
+Subproject commit b28dbd549284cf450be7f25ad85aadf614d08f0b

From ebfd8eb6c8a75e682ead8fd94d1079e11bd27c1f Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 17:14:19 +0000
Subject: [PATCH 37/42] Fixing readme action.

---
 .github/workflows/readme-openapi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
index 9f42f6141b..e6224156b6 100644
--- a/.github/workflows/readme-openapi.yml
+++ b/.github/workflows/readme-openapi.yml
@@ -20,7 +20,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Install OpenAPI pkg
-        run: yarn global add openapi
+        run: yarn global add rdme openapi
 
       - name: update specs
-        run: cd packages/server && yarn specs && openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841
+        run: cd packages/server && yarn specs && rdme openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841

From 415570b802b3eea7aa9e4d2b5a5d0b135d70eb17 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 17:21:57 +0000
Subject: [PATCH 38/42] Another readme action fix.

---
 .github/workflows/readme-openapi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
index e6224156b6..f7a563fc45 100644
--- a/.github/workflows/readme-openapi.yml
+++ b/.github/workflows/readme-openapi.yml
@@ -23,4 +23,4 @@ jobs:
         run: yarn global add rdme openapi
 
       - name: update specs
-        run: cd packages/server && yarn specs && rdme openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841
+        run: cd packages/server && yarn specs && rdme openapi upload specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841

From 4077a6df35c319bfdab9962ea7c2101388e7702c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 17:48:23 +0000
Subject: [PATCH 39/42] Final fix for rdme.

---
 .github/workflows/readme-openapi.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
index f7a563fc45..ec04e4001c 100644
--- a/.github/workflows/readme-openapi.yml
+++ b/.github/workflows/readme-openapi.yml
@@ -20,7 +20,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Install OpenAPI pkg
-        run: yarn global add rdme openapi
+        run: yarn global add rdme
 
       - name: update specs
-        run: cd packages/server && yarn specs && rdme openapi upload specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841
+        run: cd packages/server && yarn specs && rdme openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=67c16880add6da002352069a

From b4ad744261a9cb47fcadf8e25af57909311900ee Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Feb 2025 17:52:18 +0000
Subject: [PATCH 40/42] Set rdme cli version (hardcoded).

---
 .github/workflows/readme-openapi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
index ec04e4001c..27a68e69cf 100644
--- a/.github/workflows/readme-openapi.yml
+++ b/.github/workflows/readme-openapi.yml
@@ -20,7 +20,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Install OpenAPI pkg
-        run: yarn global add rdme
+        run: yarn global add rdme@8.6.6
 
       - name: update specs
         run: cd packages/server && yarn specs && rdme openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=67c16880add6da002352069a

From 2b090c3a62ae5fcd0244ed5258ecbe01cf36bd74 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Mon, 3 Mar 2025 09:00:02 +0000
Subject: [PATCH 41/42] pr comments

---
 packages/bbui/src/Stores/notifications.ts       | 2 +-
 packages/bbui/src/Table/CellRenderer.svelte     | 6 +++---
 packages/bbui/src/Table/DateTimeRenderer.svelte | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/src/Stores/notifications.ts b/packages/bbui/src/Stores/notifications.ts
index f4d6625491..174486e611 100644
--- a/packages/bbui/src/Stores/notifications.ts
+++ b/packages/bbui/src/Stores/notifications.ts
@@ -15,7 +15,7 @@ interface Notification {
 }
 
 export const createNotificationStore = () => {
-  const timeoutIds = new Set<NodeJS.Timeout>()
+  const timeoutIds = new Set<ReturnType<typeof setTimeout>>()
   const _notifications = writable<Notification[]>([], () => {
     return () => {
       // clear all the timers
diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte
index a1609bb725..e93eae3ca3 100644
--- a/packages/bbui/src/Table/CellRenderer.svelte
+++ b/packages/bbui/src/Table/CellRenderer.svelte
@@ -8,9 +8,9 @@
   import InternalRenderer from "./InternalRenderer.svelte"
   import { processStringSync } from "@budibase/string-templates"
 
-  export let row: any
-  export let schema: any
-  export let value: any
+  export let row: Record<string, any>
+  export let schema: Record<string, any>
+  export let value: Record<string, any>
   export let customRenderers: { column: string; component: any }[] = []
   export let snippets: any
 
diff --git a/packages/bbui/src/Table/DateTimeRenderer.svelte b/packages/bbui/src/Table/DateTimeRenderer.svelte
index 607f71e163..7e4d85cab1 100644
--- a/packages/bbui/src/Table/DateTimeRenderer.svelte
+++ b/packages/bbui/src/Table/DateTimeRenderer.svelte
@@ -7,7 +7,7 @@
   // adding the 0- will turn a string like 00:00:00 into a valid ISO
   // date, but will make actual ISO dates invalid
   $: time = new Date(`0-${value}`)
-  $: isTimeOnly = !isNaN(time.getTime()) || schema?.timeOnly
+  $: isTimeOnly = !isNaN(time as any) || schema?.timeOnly
   $: isDateOnly = schema?.dateOnly
   $: format = isTimeOnly
     ? "HH:mm:ss"

From a4eb5642a823451fe620b7992dfb23e8fc0ebe73 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 3 Mar 2025 11:13:29 +0000
Subject: [PATCH 42/42] Bump version to 3.4.22

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 8972a00565..d20097b6e5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.4.21",
+  "version": "3.4.22",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {