From dfdb23f2a7507d1f0f432aa7c29beecfa927a884 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 26 Mar 2025 09:48:44 +0000
Subject: [PATCH 01/31] Use slots to render lightning bolt icons in the correct
 position regardless of labels

---
 packages/bbui/src/Form/Core/TextArea.svelte   |  2 ++
 packages/bbui/src/Form/Core/TextField.svelte  |  1 +
 packages/bbui/src/Form/Input.svelte           |  4 ++-
 packages/bbui/src/Form/TextArea.svelte        | 11 +++++--
 .../bindings/DrawerBindableInput.svelte       | 29 ++++++++++---------
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/packages/bbui/src/Form/Core/TextArea.svelte b/packages/bbui/src/Form/Core/TextArea.svelte
index 30c1993f9b..15cc13a7fa 100644
--- a/packages/bbui/src/Form/Core/TextArea.svelte
+++ b/packages/bbui/src/Form/Core/TextArea.svelte
@@ -75,6 +75,7 @@
   class:is-disabled={disabled}
   class:is-focused={isFocused}
 >
+  <!-- We need to ignore prettier here as we want no whitespace -->
   <!-- prettier-ignore -->
   <textarea
     bind:this={textarea}
@@ -90,6 +91,7 @@
     on:blur
     on:keypress
   >{value || ""}</textarea>
+  <slot />
 </div>
 
 <style>
diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
index 5bb2774cdf..b6839c5558 100644
--- a/packages/bbui/src/Form/Core/TextField.svelte
+++ b/packages/bbui/src/Form/Core/TextField.svelte
@@ -114,6 +114,7 @@
     inputmode={getInputMode(type)}
     autocomplete={autocompleteValue}
   />
+  <slot />
 </div>
 
 <style>
diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte
index 09500d649e..8e260a46fe 100644
--- a/packages/bbui/src/Form/Input.svelte
+++ b/packages/bbui/src/Form/Input.svelte
@@ -41,5 +41,7 @@
     on:blur
     on:focus
     on:keyup
-  />
+  >
+    <slot />
+  </TextField>
 </Field>
diff --git a/packages/bbui/src/Form/TextArea.svelte b/packages/bbui/src/Form/TextArea.svelte
index 92563cd8e2..403dc4d0dd 100644
--- a/packages/bbui/src/Form/TextArea.svelte
+++ b/packages/bbui/src/Form/TextArea.svelte
@@ -7,11 +7,13 @@
   export let label: string | undefined = undefined
   export let labelPosition = "above"
   export let placeholder: string | undefined = undefined
-  export let disabled = false
+  export let readonly: boolean = false
+  export let disabled: boolean = false
   export let error: string | undefined = undefined
   export let height: number | undefined = undefined
   export let minHeight: number | undefined = undefined
   export let helpText: string | undefined = undefined
+  export let updateOnChange: boolean = false
 
   let textarea: TextArea
   export function focus() {
@@ -33,11 +35,16 @@
   <TextArea
     bind:this={textarea}
     {disabled}
+    {readonly}
     {value}
     {placeholder}
     {height}
     {minHeight}
+    {updateOnChange}
     on:change={onChange}
     on:keypress
-  />
+    on:scrollable
+  >
+    <slot />
+  </TextArea>
 </Field>
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index ae9ff92ecf..fec3020f7f 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Icon, Input, Drawer, Button, CoreTextArea } from "@budibase/bbui"
+  import { Icon, Input, Drawer, Button, TextArea } from "@budibase/bbui"
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
@@ -67,7 +67,7 @@
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div class="control" class:multiline class:disabled class:scrollable>
   <svelte:component
-    this={multiline ? CoreTextArea : Input}
+    this={multiline ? TextArea : Input}
     {label}
     {disabled}
     readonly={isJS}
@@ -78,18 +78,19 @@
     {placeholder}
     {updateOnChange}
     {autocomplete}
-  />
-  {#if !disabled && !disableBindings}
-    <div
-      class="icon"
-      on:click={() => {
-        builderStore.propertyFocus(key)
-        bindingDrawer.show()
-      }}
-    >
-      <Icon size="S" name="FlashOn" />
-    </div>
-  {/if}
+  >
+    {#if !disabled && !disableBindings}
+      <div
+        class="icon"
+        on:click={() => {
+          builderStore.propertyFocus(key)
+          bindingDrawer.show()
+        }}
+      >
+        <Icon size="S" name="FlashOn" />
+      </div>
+    {/if}
+  </svelte:component>
 </div>
 <Drawer
   on:drawerHide={onDrawerHide}

From 5153a33f546d13af147d67743ddc5f8cd9760bc5 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Wed, 26 Mar 2025 09:51:32 +0000
Subject: [PATCH 02/31] Restore the ability to always select rows in tables
 regardless of settings

---
 packages/frontend-core/src/components/grid/stores/config.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/stores/config.ts b/packages/frontend-core/src/components/grid/stores/config.ts
index 687ec73e3f..a77fdd8e74 100644
--- a/packages/frontend-core/src/components/grid/stores/config.ts
+++ b/packages/frontend-core/src/components/grid/stores/config.ts
@@ -82,8 +82,9 @@ export const deriveStores = (context: StoreContext): ConfigDerivedStore => {
         config.canEditColumns = false
       }
 
-      // Determine if we can select rows
-      config.canSelectRows = !!config.canDeleteRows || !!config.canAddRows
+      // Determine if we can select rows. Always true in the meantime as you can
+      // use the selected rows binding regardless of readonly state.
+      config.canSelectRows = true
 
       return config
     }

From 9dc27cbbb45514a9d0ea64fd8823fa0c92afdd09 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Mar 2025 14:29:02 +0000
Subject: [PATCH 03/31] Updating pro submodule reference to disable SCIM logs.

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

diff --git a/packages/pro b/packages/pro
index ae33c80d3a..abce0061dc 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit ae33c80d3a7f289535951669e48f8d8a437467cc
+Subproject commit abce0061dc90f4a12ee5607597623ac9d9ed6725

From d8ca9fb38684a7d63d18c5c0b575a74d7e3d95b2 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Mar 2025 14:38:09 +0000
Subject: [PATCH 04/31] Updating pro again.

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

diff --git a/packages/pro b/packages/pro
index abce0061dc..d9d2766261 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit abce0061dc90f4a12ee5607597623ac9d9ed6725
+Subproject commit d9d2766261e02b11318ae76ad0d79698e14f89a9

From e51780b1d0f3847afc8048f7e30909efb3b87c11 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Mar 2025 14:54:54 +0000
Subject: [PATCH 05/31] Bump version to 3.7.1

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

diff --git a/lerna.json b/lerna.json
index 5f1bcc6bf1..04ad23f118 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

From 9ecef8269de128141e9d503f1fddbea42063c68c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 26 Mar 2025 15:41:39 +0000
Subject: [PATCH 06/31] Dropping SCIM logs from writethrough cache queue.

---
 packages/backend-core/src/cache/docWritethrough.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/cache/docWritethrough.ts b/packages/backend-core/src/cache/docWritethrough.ts
index 30af16c977..c73fd0a46a 100644
--- a/packages/backend-core/src/cache/docWritethrough.ts
+++ b/packages/backend-core/src/cache/docWritethrough.ts
@@ -1,4 +1,4 @@
-import { AnyDocument, Database, Document } from "@budibase/types"
+import { AnyDocument, Database, Document, DocumentType } from "@budibase/types"
 
 import { JobQueue, Queue, createQueue } from "../queue"
 import * as dbUtils from "../db"
@@ -57,6 +57,10 @@ export class DocWritethroughProcessor {
     docId: string
     data: Record<string, any>
   }) {
+    // HACK - for now drop SCIM events
+    if (docId.startsWith(DocumentType.SCIM_LOG)) {
+      return
+    }
     const db = dbUtils.getDB(dbName)
     let doc: AnyDocument | undefined
     try {

From b1a4079e45cc949c15fc43f8e7f4ae0ac626de3d Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 26 Mar 2025 15:44:30 +0000
Subject: [PATCH 07/31] Bump version to 3.7.2

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

diff --git a/lerna.json b/lerna.json
index 04ad23f118..5b551ea7cf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

From 6037a9f9d725157e8570cf5d541e06ae5e97860c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 09:31:37 +0000
Subject: [PATCH 08/31] Update text component to handle non strings

---
 .../client/src/components/app/Text.svelte     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/app/Text.svelte b/packages/client/src/components/app/Text.svelte
index 1880669c15..17c12656af 100644
--- a/packages/client/src/components/app/Text.svelte
+++ b/packages/client/src/components/app/Text.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { MarkdownViewer } from "@budibase/bbui"
 
-  export let text: string = ""
+  export let text: any = ""
   export let color: string | undefined = undefined
   export let align: "left" | "center" | "right" | "justify" = "left"
 
@@ -12,6 +12,9 @@
   // Add in certain settings to styles
   $: styles = enrichStyles($component.styles, color, align)
 
+  // Ensure we're always passing in a string value to the markdown editor
+  $: safeText = stringify(text)
+
   const enrichStyles = (
     styles: any,
     colorStyle: typeof color,
@@ -31,10 +34,24 @@
       },
     }
   }
+
+  const stringify = (text: any): string => {
+    if (text == null) {
+      return ""
+    }
+    if (typeof text !== "string") {
+      try {
+        return JSON.stringify(text)
+      } catch (e) {
+        return ""
+      }
+    }
+    return text
+  }
 </script>
 
 <div use:styleable={styles}>
-  <MarkdownViewer value={text} />
+  <MarkdownViewer value={safeText} />
 </div>
 
 <style>

From 4329e1274c31dcf57a1fdc0baef5a919cbb7db24 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 11:49:09 +0000
Subject: [PATCH 09/31] Implement APM and metrics on our bull queues.

---
 packages/backend-core/package.json            |   1 +
 .../backend-core/src/cache/docWritethrough.ts |   6 +-
 .../src/cache/tests/docWritethrough.spec.ts   |   4 +-
 .../src/events/asyncEvents/queue.ts           |  16 +-
 .../events/processors/AuditLogsProcessor.ts   |  16 +-
 packages/backend-core/src/queue/queue.ts      | 225 ++++++++++++++----
 packages/pro                                  |   2 +-
 packages/server/src/api/index.ts              |   2 +-
 packages/server/src/appMigrations/queue.ts    |   2 +-
 packages/server/src/automations/bullboard.ts  |  21 +-
 .../src/automations/tests/utilities/index.ts  |   6 +-
 packages/server/src/automations/utils.ts      |  12 +-
 .../src/sdk/app/oauth2/tests/utils.spec.ts    |   6 +-
 13 files changed, 247 insertions(+), 72 deletions(-)

diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 8da06718ab..7510655ed7 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -56,6 +56,7 @@
     "koa-pino-logger": "4.0.0",
     "lodash": "4.17.21",
     "node-fetch": "2.6.7",
+    "object-sizeof": "2.6.1",
     "passport-google-oauth": "2.0.0",
     "passport-local": "1.0.0",
     "passport-oauth2-refresh": "^2.1.0",
diff --git a/packages/backend-core/src/cache/docWritethrough.ts b/packages/backend-core/src/cache/docWritethrough.ts
index c73fd0a46a..6f2f3cbc97 100644
--- a/packages/backend-core/src/cache/docWritethrough.ts
+++ b/packages/backend-core/src/cache/docWritethrough.ts
@@ -1,6 +1,6 @@
 import { AnyDocument, Database, Document, DocumentType } from "@budibase/types"
 
-import { JobQueue, Queue, createQueue } from "../queue"
+import { BudibaseQueue, JobQueue } from "../queue"
 import * as dbUtils from "../db"
 
 interface ProcessDocMessage {
@@ -13,11 +13,11 @@ const PERSIST_MAX_ATTEMPTS = 100
 let processor: DocWritethroughProcessor | undefined
 
 export class DocWritethroughProcessor {
-  private static _queue: Queue
+  private static _queue: BudibaseQueue<ProcessDocMessage>
 
   public static get queue() {
     if (!DocWritethroughProcessor._queue) {
-      DocWritethroughProcessor._queue = createQueue<ProcessDocMessage>(
+      DocWritethroughProcessor._queue = new BudibaseQueue<ProcessDocMessage>(
         JobQueue.DOC_WRITETHROUGH_QUEUE,
         {
           jobOptions: {
diff --git a/packages/backend-core/src/cache/tests/docWritethrough.spec.ts b/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
index b72651e21f..01944e68a8 100644
--- a/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
+++ b/packages/backend-core/src/cache/tests/docWritethrough.spec.ts
@@ -18,7 +18,9 @@ import {
 const initialTime = Date.now()
 
 async function waitForQueueCompletion() {
-  await utils.queue.processMessages(DocWritethroughProcessor.queue)
+  await utils.queue.processMessages(
+    DocWritethroughProcessor.queue.getBullQueue()
+  )
 }
 
 beforeAll(() => utils.queue.useRealQueues())
diff --git a/packages/backend-core/src/events/asyncEvents/queue.ts b/packages/backend-core/src/events/asyncEvents/queue.ts
index 196fd359b3..a393918625 100644
--- a/packages/backend-core/src/events/asyncEvents/queue.ts
+++ b/packages/backend-core/src/events/asyncEvents/queue.ts
@@ -1,5 +1,4 @@
-import BullQueue from "bull"
-import { createQueue, JobQueue } from "../../queue"
+import { BudibaseQueue, JobQueue } from "../../queue"
 import { Event, Identity } from "@budibase/types"
 
 export interface EventPayload {
@@ -9,10 +8,19 @@ export interface EventPayload {
   timestamp?: string | number
 }
 
-export let asyncEventQueue: BullQueue.Queue
+export let asyncEventQueue: BudibaseQueue<EventPayload>
 
 export function init() {
-  asyncEventQueue = createQueue<EventPayload>(JobQueue.SYSTEM_EVENT_QUEUE)
+  asyncEventQueue = new BudibaseQueue<EventPayload>(
+    JobQueue.SYSTEM_EVENT_QUEUE,
+    {
+      jobTags: (event: EventPayload) => {
+        return {
+          "event.name": event.event,
+        }
+      },
+    }
+  )
 }
 
 export async function shutdown() {
diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index 3dd2ab9d10..90d8389856 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -8,21 +8,27 @@ import {
 } from "@budibase/types"
 import { EventProcessor } from "./types"
 import { getAppId, doInTenant, getTenantId } from "../../context"
-import BullQueue from "bull"
-import { createQueue, JobQueue } from "../../queue"
+import { BudibaseQueue, JobQueue } from "../../queue"
 import { isAudited } from "../../utils"
 import env from "../../environment"
 
 export default class AuditLogsProcessor implements EventProcessor {
   static auditLogsEnabled = false
-  static auditLogQueue: BullQueue.Queue<AuditLogQueueEvent>
+  static auditLogQueue: BudibaseQueue<AuditLogQueueEvent>
 
   // can't use constructor as need to return promise
   static init(fn: AuditLogFn) {
     AuditLogsProcessor.auditLogsEnabled = true
     const writeAuditLogs = fn
-    AuditLogsProcessor.auditLogQueue = createQueue<AuditLogQueueEvent>(
-      JobQueue.AUDIT_LOG
+    AuditLogsProcessor.auditLogQueue = new BudibaseQueue<AuditLogQueueEvent>(
+      JobQueue.AUDIT_LOG,
+      {
+        jobTags: (event: AuditLogQueueEvent) => {
+          return {
+            "event.name": event.event,
+          }
+        },
+      }
     )
     return AuditLogsProcessor.auditLogQueue.process(async job => {
       return doInTenant(job.data.tenantId, async () => {
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 4e1086823b..2d6af9954e 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -2,10 +2,12 @@ import env from "../environment"
 import { getRedisOptions } from "../redis/utils"
 import { JobQueue } from "./constants"
 import InMemoryQueue from "./inMemoryQueue"
-import BullQueue, { QueueOptions, JobOptions } from "bull"
+import BullQueue, { Queue, QueueOptions, JobOptions, Job } from "bull"
 import { addListeners, StalledFn } from "./listeners"
 import { Duration } from "../utils"
 import * as timers from "../timers"
+import tracer from "dd-trace"
+import sizeof from "object-sizeof"
 
 export type { QueueOptions, Queue, JobOptions } from "bull"
 
@@ -15,7 +17,7 @@ const QUEUE_LOCK_MS = Duration.fromMinutes(5).toMs()
 const QUEUE_LOCK_RENEW_INTERNAL_MS = Duration.fromSeconds(30).toMs()
 // cleanup the queue every 60 seconds
 const CLEANUP_PERIOD_MS = Duration.fromSeconds(60).toMs()
-let QUEUES: BullQueue.Queue[] = []
+let QUEUES: Queue[] = []
 let cleanupInterval: NodeJS.Timeout
 
 async function cleanup() {
@@ -25,49 +27,192 @@ async function cleanup() {
   }
 }
 
-export function createQueue<T>(
-  jobQueue: JobQueue,
-  opts: {
-    removeStalledCb?: StalledFn
-    maxStalledCount?: number
-    jobOptions?: JobOptions
-  } = {}
-): BullQueue.Queue<T> {
-  const redisOpts = getRedisOptions()
-  const queueConfig: QueueOptions = {
-    redis: redisOpts,
-    settings: {
-      maxStalledCount: opts.maxStalledCount ? opts.maxStalledCount : 0,
-      lockDuration: QUEUE_LOCK_MS,
-      lockRenewTime: QUEUE_LOCK_RENEW_INTERNAL_MS,
-    },
+async function withMetrics<T>(
+  name: string,
+  cb: () => Promise<T>,
+  tags?: Record<string, string | number>
+): Promise<T> {
+  const start = performance.now()
+  try {
+    const result = await cb()
+    tracer.dogstatsd.increment(`${name}.success`, 1, tags)
+    return result
+  } catch (err) {
+    tracer.dogstatsd.increment(`${name}.error`, 1, tags)
+    throw err
+  } finally {
+    const durationMs = performance.now() - start
+    tracer.dogstatsd.distribution(`${name}.duration.ms`, durationMs, tags)
+    tracer.dogstatsd.increment(name, 1, tags)
   }
-  if (opts.jobOptions) {
-    queueConfig.defaultJobOptions = opts.jobOptions
+}
+
+function jobOptsTags(opts: JobOptions) {
+  return {
+    "job.opts.attempts": opts.attempts,
+    "job.opts.backoff": opts.backoff,
+    "job.opts.delay": opts.delay,
+    "job.opts.jobId": opts.jobId,
+    "job.opts.lifo": opts.lifo,
+    "job.opts.preventParsingData": opts.preventParsingData,
+    "job.opts.priority": opts.priority,
+    "job.opts.removeOnComplete": opts.removeOnComplete,
+    "job.opts.removeOnFail": opts.removeOnFail,
+    "job.opts.repeat": opts.repeat,
+    "job.opts.stackTraceLimit": opts.stackTraceLimit,
+    "job.opts.timeout": opts.timeout,
   }
-  let queue: BullQueue.Queue<T>
-  if (!env.isTest()) {
-    queue = new BullQueue(jobQueue, queueConfig)
-  } else if (
-    process.env.BULL_TEST_REDIS_PORT &&
-    !isNaN(+process.env.BULL_TEST_REDIS_PORT)
-  ) {
-    queue = new BullQueue(jobQueue, {
-      redis: { host: "localhost", port: +process.env.BULL_TEST_REDIS_PORT },
-    })
-  } else {
-    queue = new InMemoryQueue(jobQueue, queueConfig) as any
+}
+
+function jobTags(job: Job) {
+  return {
+    "job.id": job.id,
+    "job.attemptsMade": job.attemptsMade,
+    "job.timestamp": job.timestamp,
+    "job.sizeBytes": sizeof(job),
+    "job.data.sizeBytes": sizeof(job.data),
+    ...jobOptsTags(job.opts),
   }
-  addListeners(queue, jobQueue, opts?.removeStalledCb)
-  QUEUES.push(queue)
-  if (!cleanupInterval && !env.isTest()) {
-    cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS)
-    // fire off an initial cleanup
-    cleanup().catch(err => {
-      console.error(`Unable to cleanup ${jobQueue} initially - ${err}`)
+}
+
+export interface BudibaseQueueOpts<T> {
+  removeStalledCb?: StalledFn
+  maxStalledCount?: number
+  jobOptions?: JobOptions
+  jobTags?: (job: T) => Record<string, any>
+}
+
+export class BudibaseQueue<T> {
+  private queue: Queue<T>
+  private opts: BudibaseQueueOpts<T>
+  private jobQueue: JobQueue
+
+  constructor(jobQueue: JobQueue, opts: BudibaseQueueOpts<T> = {}) {
+    this.opts = opts
+    this.jobQueue = jobQueue
+    this.queue = this.initQueue()
+  }
+
+  private initQueue() {
+    const redisOpts = getRedisOptions()
+    const queueConfig: QueueOptions = {
+      redis: redisOpts,
+      settings: {
+        maxStalledCount: this.opts.maxStalledCount
+          ? this.opts.maxStalledCount
+          : 0,
+        lockDuration: QUEUE_LOCK_MS,
+        lockRenewTime: QUEUE_LOCK_RENEW_INTERNAL_MS,
+      },
+    }
+    if (this.opts.jobOptions) {
+      queueConfig.defaultJobOptions = this.opts.jobOptions
+    }
+    let queue: Queue<T>
+    if (!env.isTest()) {
+      queue = new BullQueue(this.jobQueue, queueConfig)
+    } else if (
+      process.env.BULL_TEST_REDIS_PORT &&
+      !isNaN(+process.env.BULL_TEST_REDIS_PORT)
+    ) {
+      queue = new BullQueue(this.jobQueue, {
+        redis: { host: "localhost", port: +process.env.BULL_TEST_REDIS_PORT },
+      })
+    } else {
+      queue = new InMemoryQueue(this.jobQueue, queueConfig) as any
+    }
+
+    addListeners(queue, this.jobQueue, this.opts.removeStalledCb)
+    QUEUES.push(queue)
+    if (!cleanupInterval && !env.isTest()) {
+      cleanupInterval = timers.set(cleanup, CLEANUP_PERIOD_MS)
+      // fire off an initial cleanup
+      cleanup().catch(err => {
+        console.error(`Unable to cleanup ${this.jobQueue} initially - ${err}`)
+      })
+    }
+    return queue
+  }
+
+  getBullQueue() {
+    return this.queue
+  }
+
+  process(
+    concurrency: number,
+    cb: (job: Job<T>) => Promise<void>
+  ): Promise<void>
+  process(cb: (job: Job<T>) => Promise<void>): Promise<void>
+  process(...args: any[]) {
+    let concurrency: number | undefined = undefined
+    let cb: (job: Job<T>) => Promise<void>
+    if (args.length === 2) {
+      concurrency = args[0]
+      cb = args[1]
+    } else {
+      cb = args[0]
+    }
+
+    const wrappedCb = async (job: Job<T>) => {
+      await tracer.trace("queue.process", async span => {
+        // @ts-expect-error monkey patching the parent span id
+        if (job.data._parentSpanContext) {
+          // @ts-expect-error monkey patching the parent span id
+          const parentContext = job.data._parentSpanContext
+          const parent = {
+            traceId: parentContext.traceId,
+            spanId: parentContext.spanId,
+            toTraceId: () => parentContext.traceId,
+            toSpanId: () => parentContext.spanId,
+            toTraceparent: () => "",
+          }
+          span.addLink(parent)
+        }
+        span.addTags({ "queue.name": this.jobQueue, ...jobTags(job) })
+        if (this.opts.jobTags) {
+          span.addTags(this.opts.jobTags(job.data))
+        }
+
+        await this.withMetrics("queue.process", () => cb(job))
+      })
+    }
+
+    if (concurrency) {
+      return this.queue.process(concurrency, wrappedCb)
+    } else {
+      return this.queue.process(wrappedCb)
+    }
+  }
+
+  async add(data: T, opts?: JobOptions): Promise<Job<T>> {
+    return await tracer.trace("queue.add", async span => {
+      span.addTags({ "queue.name": this.jobQueue, ...jobOptsTags(opts || {}) })
+      if (this.opts.jobTags) {
+        span.addTags(this.opts.jobTags(data))
+      }
+      // @ts-expect-error monkey patching the parent span id
+      data._parentSpanContext = {
+        traceId: span.context().toTraceId(),
+        spanId: span.context().toSpanId(),
+      }
+
+      return await this.withMetrics("queue.add", () =>
+        this.queue.add(data, opts)
+      )
     })
   }
-  return queue
+
+  private withMetrics<T>(name: string, cb: () => Promise<T>) {
+    return withMetrics(name, cb, this.metricTags())
+  }
+
+  private metricTags() {
+    return { queueName: this.jobQueue }
+  }
+
+  close() {
+    return this.queue.close()
+  }
 }
 
 export async function shutdown() {
diff --git a/packages/pro b/packages/pro
index d9d2766261..023975dded 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit d9d2766261e02b11318ae76ad0d79698e14f89a9
+Subproject commit 023975dded68f7637048fbc513ddbdb6b44d71c3
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index 230e5079b4..53be2b30a9 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -16,7 +16,7 @@ export const router: Router = new Router()
 
 router.get("/health", async ctx => {
   if (automationsEnabled()) {
-    if (!(await automationQueue.isReady())) {
+    if (!(await automationQueue.getBullQueue().isReady())) {
       ctx.status = 503
       return
     }
diff --git a/packages/server/src/appMigrations/queue.ts b/packages/server/src/appMigrations/queue.ts
index d06d039fd0..94be32d45d 100644
--- a/packages/server/src/appMigrations/queue.ts
+++ b/packages/server/src/appMigrations/queue.ts
@@ -13,7 +13,7 @@ export type AppMigrationJob = {
 
 // always create app migration queue - so that events can be pushed and read from it
 // across the different api and automation services
-const appMigrationQueue = queue.createQueue<AppMigrationJob>(
+const appMigrationQueue = new queue.BudibaseQueue<AppMigrationJob>(
   queue.JobQueue.APP_MIGRATION,
   {
     jobOptions: {
diff --git a/packages/server/src/automations/bullboard.ts b/packages/server/src/automations/bullboard.ts
index 349282e863..cf89eb5a74 100644
--- a/packages/server/src/automations/bullboard.ts
+++ b/packages/server/src/automations/bullboard.ts
@@ -7,25 +7,36 @@ import { getAppMigrationQueue } from "../appMigrations/queue"
 import { createBullBoard } from "@bull-board/api"
 import { AutomationData } from "@budibase/types"
 
-export const automationQueue = queue.createQueue<AutomationData>(
+export const automationQueue = new queue.BudibaseQueue<AutomationData>(
   queue.JobQueue.AUTOMATION,
-  { removeStalledCb: automation.removeStalled }
+  {
+    removeStalledCb: automation.removeStalled,
+    jobTags: (job: AutomationData) => {
+      return {
+        "automation.id": job.automation._id,
+        "automation.name": job.automation.name,
+        "automation.appId": job.automation.appId,
+        "automation.createdAt": job.automation.createdAt,
+        "automation.trigger": job.automation.definition.trigger.stepId,
+      }
+    },
+  }
 )
 
 const PATH_PREFIX = "/bulladmin"
 
 export async function init() {
   // Set up queues for bull board admin
-  const queues = [new BullAdapter(automationQueue)]
+  const queues = [new BullAdapter(automationQueue.getBullQueue())]
 
   const backupQueue = backups.getBackupQueue()
   if (backupQueue) {
-    queues.push(new BullAdapter(backupQueue))
+    queues.push(new BullAdapter(backupQueue.getBullQueue()))
   }
 
   const appMigrationQueue = getAppMigrationQueue()
   if (appMigrationQueue) {
-    queues.push(new BullAdapter(appMigrationQueue))
+    queues.push(new BullAdapter(appMigrationQueue.getBullQueue()))
   }
 
   const serverAdapter = new KoaAdapter()
diff --git a/packages/server/src/automations/tests/utilities/index.ts b/packages/server/src/automations/tests/utilities/index.ts
index 4b41f1d977..250a83e888 100644
--- a/packages/server/src/automations/tests/utilities/index.ts
+++ b/packages/server/src/automations/tests/utilities/index.ts
@@ -48,7 +48,7 @@ export async function runInProd(fn: any) {
 
 export async function captureAllAutomationRemovals(f: () => Promise<unknown>) {
   const messages: Job<AutomationData>[] = []
-  const queue = getQueue()
+  const queue = getQueue().getBullQueue()
 
   const messageListener = async (message: Job<AutomationData>) => {
     messages.push(message)
@@ -82,7 +82,7 @@ export async function captureAutomationRemovals(
 
 export async function captureAllAutomationMessages(f: () => Promise<unknown>) {
   const messages: Job<AutomationData>[] = []
-  const queue = getQueue()
+  const queue = getQueue().getBullQueue()
 
   const messageListener = async (message: Job<AutomationData>) => {
     messages.push(message)
@@ -122,7 +122,7 @@ export async function captureAllAutomationResults(
   f: () => Promise<unknown>
 ): Promise<queue.TestQueueMessage<AutomationData>[]> {
   const runs: queue.TestQueueMessage<AutomationData>[] = []
-  const queue = getQueue()
+  const queue = getQueue().getBullQueue()
   let messagesOutstanding = 0
 
   const completedListener = async (
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index bd8270bfdc..f44cc30147 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -107,12 +107,14 @@ export async function updateTestHistory(
 // end the repetition and the job itself
 export async function disableAllCrons(appId: any) {
   const promises = []
-  const jobs = await automationQueue.getRepeatableJobs()
+  const jobs = await automationQueue.getBullQueue().getRepeatableJobs()
   for (let job of jobs) {
     if (job.key.includes(`${appId}_cron`)) {
-      promises.push(automationQueue.removeRepeatableByKey(job.key))
+      promises.push(
+        automationQueue.getBullQueue().removeRepeatableByKey(job.key)
+      )
       if (job.id) {
-        promises.push(automationQueue.removeJobs(job.id))
+        promises.push(automationQueue.getBullQueue().removeJobs(job.id))
       }
     }
   }
@@ -121,10 +123,10 @@ export async function disableAllCrons(appId: any) {
 }
 
 export async function disableCronById(jobId: JobId) {
-  const jobs = await automationQueue.getRepeatableJobs()
+  const jobs = await automationQueue.getBullQueue().getRepeatableJobs()
   for (const job of jobs) {
     if (job.id === jobId) {
-      await automationQueue.removeRepeatableByKey(job.key)
+      await automationQueue.getBullQueue().removeRepeatableByKey(job.key)
     }
   }
   console.log(`jobId=${jobId} disabled`)
diff --git a/packages/server/src/sdk/app/oauth2/tests/utils.spec.ts b/packages/server/src/sdk/app/oauth2/tests/utils.spec.ts
index 5739f1a794..e03abf1f5a 100644
--- a/packages/server/src/sdk/app/oauth2/tests/utils.spec.ts
+++ b/packages/server/src/sdk/app/oauth2/tests/utils.spec.ts
@@ -190,7 +190,7 @@ describe("oauth2 utils", () => {
 
         await config.doInContext(config.appId, () => getToken(oauthConfig._id))
         await testUtils.queue.processMessages(
-          cache.docWritethrough.DocWritethroughProcessor.queue
+          cache.docWritethrough.DocWritethroughProcessor.queue.getBullQueue()
         )
 
         const usageLog = await config.doInContext(config.appId, () =>
@@ -216,7 +216,7 @@ describe("oauth2 utils", () => {
           config.doInContext(config.appId, () => getToken(oauthConfig._id))
         ).rejects.toThrow()
         await testUtils.queue.processMessages(
-          cache.docWritethrough.DocWritethroughProcessor.queue
+          cache.docWritethrough.DocWritethroughProcessor.queue.getBullQueue()
         )
 
         const usageLog = await config.doInContext(config.appId, () =>
@@ -247,7 +247,7 @@ describe("oauth2 utils", () => {
           getToken(oauthConfig._id)
         )
         await testUtils.queue.processMessages(
-          cache.docWritethrough.DocWritethroughProcessor.queue
+          cache.docWritethrough.DocWritethroughProcessor.queue.getBullQueue()
         )
 
         for (const appId of [config.appId, config.prodAppId]) {

From 2f2424d8f58757df2076582ea1427aefe9aad5d2 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 11:53:50 +0000
Subject: [PATCH 10/31] More stats.

---
 packages/backend-core/src/queue/queue.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 2d6af9954e..9a612f3004 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -173,6 +173,11 @@ export class BudibaseQueue<T> {
           span.addTags(this.opts.jobTags(job.data))
         }
 
+        tracer.dogstatsd.distribution(
+          "queue.process.sizeBytes",
+          sizeof(job.data),
+          this.metricTags()
+        )
         await this.withMetrics("queue.process", () => cb(job))
       })
     }
@@ -186,7 +191,11 @@ export class BudibaseQueue<T> {
 
   async add(data: T, opts?: JobOptions): Promise<Job<T>> {
     return await tracer.trace("queue.add", async span => {
-      span.addTags({ "queue.name": this.jobQueue, ...jobOptsTags(opts || {}) })
+      span.addTags({
+        "queue.name": this.jobQueue,
+        "job.data.sizeBytes": sizeof(data),
+        ...jobOptsTags(opts || {}),
+      })
       if (this.opts.jobTags) {
         span.addTags(this.opts.jobTags(data))
       }
@@ -196,6 +205,11 @@ export class BudibaseQueue<T> {
         spanId: span.context().toSpanId(),
       }
 
+      tracer.dogstatsd.distribution(
+        "queue.add.sizeBytes",
+        sizeof(data),
+        this.metricTags()
+      )
       return await this.withMetrics("queue.add", () =>
         this.queue.add(data, opts)
       )

From 49969705460fd55035120e276fd09df6a6cce147 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 12:01:04 +0000
Subject: [PATCH 11/31] Update pro reference.

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

diff --git a/packages/pro b/packages/pro
index 023975dded..32e9cfb01c 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 023975dded68f7637048fbc513ddbdb6b44d71c3
+Subproject commit 32e9cfb01c2c038b3bdca2b81275894d1bbeb144

From 489628cafd3a139e1e6cdc7417ddfc2b450b067c Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 14:38:33 +0000
Subject: [PATCH 12/31] Update date validation to make ISO timestamp
 milliseconds optional

---
 packages/backend-core/src/sql/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-core/src/sql/utils.ts b/packages/backend-core/src/sql/utils.ts
index 746a949ef3..e1982c2d5c 100644
--- a/packages/backend-core/src/sql/utils.ts
+++ b/packages/backend-core/src/sql/utils.ts
@@ -14,7 +14,7 @@ import environment from "../environment"
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`
 const ROW_ID_REGEX = /^\[.*]$/g
 const ENCODED_SPACE = encodeURIComponent(" ")
-const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}.\d{3}Z)?$/
+const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:.\d{3})?Z)?$/
 const TIME_REGEX = /^(?:\d{2}:)?(?:\d{2}:)(?:\d{2})$/
 
 export function isExternalTableID(tableId: string) {

From 2bdc244edf64461d192a46adf3454336414a7147 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 14:39:30 +0000
Subject: [PATCH 13/31] Fix bug preventing importing data into multi-select
 columns

---
 .../backend/TableNavigator/ExistingTableDataImport.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
index beddf447df..39f4238e3a 100644
--- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
@@ -45,7 +45,7 @@
     },
     {
       label: "Multi-select",
-      value: FieldType.ARRAY.type,
+      value: FieldType.ARRAY,
     },
     {
       label: "Barcode/QR",

From 3870e0f01fac19f188efebd9d19a5fd7f0d50e6b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 14:48:44 +0000
Subject: [PATCH 14/31] Properly validate dates on import and fix logic bug
 incorrectly saying invalid dates are valid

---
 packages/backend-core/src/sql/utils.ts  | 2 +-
 packages/server/src/utilities/schema.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/sql/utils.ts b/packages/backend-core/src/sql/utils.ts
index e1982c2d5c..6296fcee80 100644
--- a/packages/backend-core/src/sql/utils.ts
+++ b/packages/backend-core/src/sql/utils.ts
@@ -142,7 +142,7 @@ export function breakRowIdField(_id: string | { _id: string }): any[] {
 export function isInvalidISODateString(str: string) {
   const trimmedValue = str.trim()
   if (!ISO_DATE_REGEX.test(trimmedValue)) {
-    return false
+    return true
   }
   let d = new Date(trimmedValue)
   return isNaN(d.getTime())
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index 8309014a61..c6bbb6db60 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -8,6 +8,7 @@ import {
 } from "@budibase/types"
 import { ValidColumnNameRegex, helpers, utils } from "@budibase/shared-core"
 import { db, HTTPError, sql } from "@budibase/backend-core"
+import { isInvalidISODateString } from "@budibase/backend-core/src/sql/utils"
 
 type Rows = Array<Row>
 
@@ -106,7 +107,7 @@ export function validate(
       } else if (
         // If provided must be a valid date
         columnType === FieldType.DATETIME &&
-        isNaN(new Date(columnData).getTime())
+        isInvalidISODateString(columnData)
       ) {
         results.schemaValidation[columnName] = false
       } else if (

From e0511f8b07b7cf235cdc7a3aa81febcd046bfe5b Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 14:55:05 +0000
Subject: [PATCH 15/31] Fix import of string values into array fields

---
 packages/server/src/api/controllers/table/utils.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index d6b29dc12c..e18cdf56a7 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -155,13 +155,19 @@ export async function importToRows(
           schema.type === FieldType.ARRAY) &&
         row[fieldName]
       ) {
-        const rowVal = Array.isArray(row[fieldName])
-          ? row[fieldName]
-          : [row[fieldName]]
+        const isArray = Array.isArray(row[fieldName])
+
+        // Add option to inclusion constraints
+        const rowVal = isArray ? row[fieldName] : [row[fieldName]]
         let merged = [...schema.constraints!.inclusion!, ...rowVal]
         let superSet = new Set(merged)
         schema.constraints!.inclusion = Array.from(superSet)
         schema.constraints!.inclusion.sort()
+
+        // If array type, ensure we import the value as an array
+        if (!isArray && schema.type === FieldType.ARRAY) {
+          row[fieldName] = rowVal
+        }
       }
     }
 

From a4caad86d1dcc8f3358b321f97c1cb06dbbd4702 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 14:59:36 +0000
Subject: [PATCH 16/31] Add test for string imports into array fields

---
 .../api/controllers/table/tests/utils.spec.ts | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/table/tests/utils.spec.ts b/packages/server/src/api/controllers/table/tests/utils.spec.ts
index f9d6d707e2..1fe459828c 100644
--- a/packages/server/src/api/controllers/table/tests/utils.spec.ts
+++ b/packages/server/src/api/controllers/table/tests/utils.spec.ts
@@ -1,4 +1,9 @@
-import { AIOperationEnum, AutoFieldSubType, FieldType } from "@budibase/types"
+import {
+  AIOperationEnum,
+  AutoFieldSubType,
+  FieldType,
+  JsonFieldSubType,
+} from "@budibase/types"
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
 import { importToRows } from "../utils"
 
@@ -152,5 +157,33 @@ describe("utils", () => {
         ])
       })
     })
+
+    it("coerces strings into arrays for array fields", async () => {
+      await config.doInContext(config.appId, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          schema: {
+            colours: {
+              name: "colours",
+              type: FieldType.ARRAY,
+              constraints: {
+                type: JsonFieldSubType.ARRAY,
+                inclusion: ["red"],
+              },
+            },
+          },
+        })
+
+        const data = [{ colours: "red" }]
+
+        const result = await importToRows(data, table, config.user?._id)
+        expect(result).toEqual([
+          expect.objectContaining({
+            colours: ["red"],
+          }),
+        ])
+      })
+    })
   })
 })

From 7901e241b42dea8a7d4b54a7c673b5ee30fcc918 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 15:04:37 +0000
Subject: [PATCH 17/31] Add tests for ISO date validity checking

---
 .../backend-core/src/sql/tests/utils.spec.ts  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 packages/backend-core/src/sql/tests/utils.spec.ts

diff --git a/packages/backend-core/src/sql/tests/utils.spec.ts b/packages/backend-core/src/sql/tests/utils.spec.ts
new file mode 100644
index 0000000000..847e9c674c
--- /dev/null
+++ b/packages/backend-core/src/sql/tests/utils.spec.ts
@@ -0,0 +1,23 @@
+import { isInvalidISODateString } from "../utils"
+
+describe("isInvalidISODateString", () => {
+  it("accepts a valid ISO date without a time", () => {
+    const invalid = isInvalidISODateString("2013-02-01")
+    expect(invalid).toEqual(false)
+  })
+
+  it("accepts a valid ISO date with a time", () => {
+    const invalid = isInvalidISODateString("2013-02-01T01:23:45Z")
+    expect(invalid).toEqual(false)
+  })
+
+  it("accepts a valid ISO date with a time and millis", () => {
+    const invalid = isInvalidISODateString("2013-02-01T01:23:45.678Z")
+    expect(invalid).toEqual(false)
+  })
+
+  it("rejects an invalid ISO date", () => {
+    const invalid = isInvalidISODateString("2013-523-814T444:22:11Z")
+    expect(invalid).toEqual(true)
+  })
+})

From 4e739d2cc94e10ae3d85ec773f3515bdfcfdca4d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 15:17:27 +0000
Subject: [PATCH 18/31] Lint

---
 packages/server/src/utilities/schema.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index c6bbb6db60..8982743106 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -8,7 +8,6 @@ import {
 } from "@budibase/types"
 import { ValidColumnNameRegex, helpers, utils } from "@budibase/shared-core"
 import { db, HTTPError, sql } from "@budibase/backend-core"
-import { isInvalidISODateString } from "@budibase/backend-core/src/sql/utils"
 
 type Rows = Array<Row>
 
@@ -107,7 +106,7 @@ export function validate(
       } else if (
         // If provided must be a valid date
         columnType === FieldType.DATETIME &&
-        isInvalidISODateString(columnData)
+        sql.utils.isInvalidISODateString(columnData)
       ) {
         results.schemaValidation[columnName] = false
       } else if (

From 25c94b932f029db7630733a1004b74b20ce81e66 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Thu, 27 Mar 2025 15:57:00 +0000
Subject: [PATCH 19/31] Fix for signatures, they were not considered JSON
 fields which meant that SQL server was denying updates to them (as with the
 attachment fields).

---
 .../server/src/api/routes/tests/row.spec.ts   | 19 +++++++++++++++++++
 .../src/integrations/microsoftSqlServer.ts    |  3 +--
 packages/shared-core/src/constants/fields.ts  |  8 ++++++++
 packages/types/src/documents/app/row.ts       |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index cf24430f82..c55db8640c 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -2276,6 +2276,25 @@ if (descriptions.length) {
           expect(updated.attachment.key).toBe(newAttachment.key)
         })
 
+        it("should allow updating signature row", async () => {
+          const { table, row } = await coreAttachmentEnrichment(
+            {
+              signature: {
+                type: FieldType.SIGNATURE_SINGLE,
+                name: "signature",
+                constraints: { presence: false },
+              },
+            },
+            "signature",
+            `${uuid.v4()}.png`
+          )
+
+          const newSignature = generateAttachment(`${uuid.v4()}.png`)
+          row["signature"] = newSignature
+          const updated = await config.api.row.save(table._id!, row)
+          expect(updated.signature.key).toBe(newSignature.key)
+        })
+
         it("should allow enriching attachment list rows", async () => {
           await coreAttachmentEnrichment(
             {
diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index 8548d57f15..9bc0eb3855 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -371,8 +371,7 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
           ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
           : query.sql
       this.log(sql, query.bindings)
-      const resp = await request.query(sql)
-      return resp
+      return await request.query(sql)
     } catch (err: any) {
       let readableMessage = getReadableErrorMessage(
         SourceName.SQL_SERVER,
diff --git a/packages/shared-core/src/constants/fields.ts b/packages/shared-core/src/constants/fields.ts
index 5acf07d863..e169877eb8 100644
--- a/packages/shared-core/src/constants/fields.ts
+++ b/packages/shared-core/src/constants/fields.ts
@@ -30,4 +30,12 @@ export const SWITCHABLE_TYPES: SwitchableTypes = {
     FieldType.LONGFORM,
   ],
   [FieldType.NUMBER]: [FieldType.NUMBER, FieldType.BOOLEAN],
+  [FieldType.JSON]: [
+    FieldType.JSON,
+    FieldType.ARRAY,
+    FieldType.ATTACHMENTS,
+    FieldType.ATTACHMENT_SINGLE,
+    FieldType.BB_REFERENCE,
+    FieldType.SIGNATURE_SINGLE,
+  ],
 }
diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts
index bb58933b65..4c32e45a8c 100644
--- a/packages/types/src/documents/app/row.ts
+++ b/packages/types/src/documents/app/row.ts
@@ -128,6 +128,7 @@ export enum FieldType {
 export const JsonTypes = [
   FieldType.ATTACHMENT_SINGLE,
   FieldType.ATTACHMENTS,
+  FieldType.SIGNATURE_SINGLE,
   // only BB_REFERENCE is JSON, it's an array, BB_REFERENCE_SINGLE is a string type
   FieldType.BB_REFERENCE,
   FieldType.JSON,

From 3ea8aaacb27a4648f50e8f90a031d8f9c994b625 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 15:58:59 +0000
Subject: [PATCH 20/31] Update pro reference

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

diff --git a/packages/pro b/packages/pro
index 32e9cfb01c..538deccd00 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 32e9cfb01c2c038b3bdca2b81275894d1bbeb144
+Subproject commit 538deccd0000090447d6cfe7f9716b16fdfefcc2

From 48c20a8d5ae6c44eb88b88671b88ef8f918ed1bd Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 16:04:04 +0000
Subject: [PATCH 21/31] Attempt to fix test.

---
 packages/backend-core/src/queue/queue.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 9a612f3004..3bbd71567f 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -69,7 +69,6 @@ function jobTags(job: Job) {
     "job.id": job.id,
     "job.attemptsMade": job.attemptsMade,
     "job.timestamp": job.timestamp,
-    "job.sizeBytes": sizeof(job),
     "job.data.sizeBytes": sizeof(job.data),
     ...jobOptsTags(job.opts),
   }

From 82c064785078ef7ae2ca78d52ef88db03da55664 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 16:08:34 +0000
Subject: [PATCH 22/31] Validate time-only dates as time-only, rather than full
 ISO strings

---
 packages/backend-core/src/sql/sql.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index 937f88c846..fa4742f23f 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -6,6 +6,7 @@ import {
   isInvalidISODateString,
   isValidFilter,
   isValidISODateString,
+  isValidTime,
   sqlLog,
   validateManyToMany,
 } from "./utils"
@@ -417,11 +418,17 @@ class InternalBuilder {
     }
 
     if (typeof input === "string" && schema.type === FieldType.DATETIME) {
-      if (isInvalidISODateString(input)) {
-        return null
-      }
-      if (isValidISODateString(input)) {
-        return new Date(input.trim())
+      if (schema.timeOnly) {
+        if (!isValidTime(input)) {
+          return null
+        }
+      } else {
+        if (isInvalidISODateString(input)) {
+          return null
+        }
+        if (isValidISODateString(input)) {
+          return new Date(input.trim())
+        }
       }
     }
     return input

From b0849ea1d6c28015cea5e86a785a956b3baa28c7 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 27 Mar 2025 16:15:12 +0000
Subject: [PATCH 23/31] Refactor ISO date string validity checks

---
 .../backend-core/src/sql/tests/utils.spec.ts  | 32 +++++++++++++------
 packages/backend-core/src/sql/utils.ts        | 12 +++----
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/backend-core/src/sql/tests/utils.spec.ts b/packages/backend-core/src/sql/tests/utils.spec.ts
index 847e9c674c..819a0aa581 100644
--- a/packages/backend-core/src/sql/tests/utils.spec.ts
+++ b/packages/backend-core/src/sql/tests/utils.spec.ts
@@ -1,23 +1,35 @@
-import { isInvalidISODateString } from "../utils"
+import { isValidISODateString, isInvalidISODateString } from "../utils"
 
-describe("isInvalidISODateString", () => {
-  it("accepts a valid ISO date without a time", () => {
-    const invalid = isInvalidISODateString("2013-02-01")
+describe("ISO date string validity checks", () => {
+  it("accepts a valid ISO date string without a time", () => {
+    const str = "2013-02-01"
+    const valid = isValidISODateString(str)
+    const invalid = isInvalidISODateString(str)
+    expect(valid).toEqual(true)
     expect(invalid).toEqual(false)
   })
 
-  it("accepts a valid ISO date with a time", () => {
-    const invalid = isInvalidISODateString("2013-02-01T01:23:45Z")
+  it("accepts a valid ISO date string with a time", () => {
+    const str = "2013-02-01T01:23:45Z"
+    const valid = isValidISODateString(str)
+    const invalid = isInvalidISODateString(str)
+    expect(valid).toEqual(true)
     expect(invalid).toEqual(false)
   })
 
-  it("accepts a valid ISO date with a time and millis", () => {
-    const invalid = isInvalidISODateString("2013-02-01T01:23:45.678Z")
+  it("accepts a valid ISO date string with a time and millis", () => {
+    const str = "2013-02-01T01:23:45.678Z"
+    const valid = isValidISODateString(str)
+    const invalid = isInvalidISODateString(str)
+    expect(valid).toEqual(true)
     expect(invalid).toEqual(false)
   })
 
-  it("rejects an invalid ISO date", () => {
-    const invalid = isInvalidISODateString("2013-523-814T444:22:11Z")
+  it("rejects an invalid ISO date string", () => {
+    const str = "2013-523-814T444:22:11Z"
+    const valid = isValidISODateString(str)
+    const invalid = isInvalidISODateString(str)
+    expect(valid).toEqual(false)
     expect(invalid).toEqual(true)
   })
 })
diff --git a/packages/backend-core/src/sql/utils.ts b/packages/backend-core/src/sql/utils.ts
index 6296fcee80..5bd9e4d12a 100644
--- a/packages/backend-core/src/sql/utils.ts
+++ b/packages/backend-core/src/sql/utils.ts
@@ -139,17 +139,17 @@ export function breakRowIdField(_id: string | { _id: string }): any[] {
   }
 }
 
-export function isInvalidISODateString(str: string) {
+export function isValidISODateString(str: string) {
   const trimmedValue = str.trim()
   if (!ISO_DATE_REGEX.test(trimmedValue)) {
-    return true
+    return false
   }
-  let d = new Date(trimmedValue)
-  return isNaN(d.getTime())
+  const d = new Date(trimmedValue)
+  return !isNaN(d.getTime())
 }
 
-export function isValidISODateString(str: string) {
-  return ISO_DATE_REGEX.test(str.trim())
+export function isInvalidISODateString(str: string) {
+  return !isValidISODateString(str)
 }
 
 export function isValidFilter(value: any) {

From 97cd58550aee226bf27187c234dfc4de417cf059 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 16:31:42 +0000
Subject: [PATCH 24/31] Fix tests for real this time.

---
 .../src/events/processors/AuditLogsProcessor.ts       |  2 +-
 packages/backend-core/src/queue/inMemoryQueue.ts      | 11 ++++++++---
 packages/backend-core/src/queue/queue.ts              |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
index 90d8389856..9a8d7d3cc7 100644
--- a/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
+++ b/packages/backend-core/src/events/processors/AuditLogsProcessor.ts
@@ -31,7 +31,7 @@ export default class AuditLogsProcessor implements EventProcessor {
       }
     )
     return AuditLogsProcessor.auditLogQueue.process(async job => {
-      return doInTenant(job.data.tenantId, async () => {
+      await doInTenant(job.data.tenantId, async () => {
         let properties = job.data.properties
         if (properties.audited) {
           properties = {
diff --git a/packages/backend-core/src/queue/inMemoryQueue.ts b/packages/backend-core/src/queue/inMemoryQueue.ts
index ebab5c7392..6afbf6c4cf 100644
--- a/packages/backend-core/src/queue/inMemoryQueue.ts
+++ b/packages/backend-core/src/queue/inMemoryQueue.ts
@@ -96,12 +96,17 @@ export class InMemoryQueue<T = any> implements Partial<Queue<T>> {
 
       let resp = func(message)
 
-      async function retryFunc(fnc: any) {
+      async function retryFunc(fnc: any, attempt = 0) {
         try {
           await fnc
         } catch (e: any) {
-          await helpers.wait(50)
-          await retryFunc(func(message))
+          attempt++
+          if (attempt < 3) {
+            await helpers.wait(100 * attempt)
+            await retryFunc(func(message), attempt)
+          } else {
+            throw e
+          }
         }
       }
 
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index 3bbd71567f..5365080ed1 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -70,7 +70,7 @@ function jobTags(job: Job) {
     "job.attemptsMade": job.attemptsMade,
     "job.timestamp": job.timestamp,
     "job.data.sizeBytes": sizeof(job.data),
-    ...jobOptsTags(job.opts),
+    ...jobOptsTags(job.opts || {}),
   }
 }
 

From a97ad31772dc8df7f0af91ced1d15d50066fd4f7 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Thu, 27 Mar 2025 16:42:14 +0000
Subject: [PATCH 25/31] Fix tests.

---
 packages/server/src/automations/tests/utilities/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/src/automations/tests/utilities/index.ts b/packages/server/src/automations/tests/utilities/index.ts
index 250a83e888..f97c976aa0 100644
--- a/packages/server/src/automations/tests/utilities/index.ts
+++ b/packages/server/src/automations/tests/utilities/index.ts
@@ -22,7 +22,7 @@ export function afterAll() {
 }
 
 export function getTestQueue(): queue.InMemoryQueue<AutomationData> {
-  return getQueue() as unknown as queue.InMemoryQueue<AutomationData>
+  return getQueue().getBullQueue() as unknown as queue.InMemoryQueue<AutomationData>
 }
 
 export function triggerCron(message: Job<AutomationData>) {

From c3f549666af873d7ea6cc5f306dd6f2c4464e048 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Mar 2025 14:04:41 +0000
Subject: [PATCH 26/31] Small improvement to remove middleware and licensing
 from loading static assets, these are public anyway.

---
 packages/server/src/api/controllers/assets.ts       | 5 +++++
 packages/server/src/api/controllers/static/index.ts | 5 -----
 packages/server/src/api/index.ts                    | 6 ++++++
 packages/server/src/api/routes/static.ts            | 1 -
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 packages/server/src/api/controllers/assets.ts

diff --git a/packages/server/src/api/controllers/assets.ts b/packages/server/src/api/controllers/assets.ts
new file mode 100644
index 0000000000..c1bc455086
--- /dev/null
+++ b/packages/server/src/api/controllers/assets.ts
@@ -0,0 +1,5 @@
+// this is a public endpoint with no middlewares
+export const serveBuilderAssets = async function (ctx: Ctx<void, void>) {
+  const builderPath = join(TOP_LEVEL_PATH, "builder")
+  await send(ctx, ctx.file, { root: builderPath })
+}
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 3d30e601db..aac4ec5d84 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -76,11 +76,6 @@ export const toggleBetaUiFeature = async function (
   }
 }
 
-export const serveBuilder = async function (ctx: Ctx<void, void>) {
-  const builderPath = join(TOP_LEVEL_PATH, "builder")
-  await send(ctx, ctx.file, { root: builderPath })
-}
-
 export const uploadFile = async function (
   ctx: Ctx<void, ProcessAttachmentResponse>
 ) {
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index 53be2b30a9..276bb7e209 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -8,6 +8,7 @@ import { middleware as pro } from "@budibase/pro"
 import { apiEnabled, automationsEnabled } from "../features"
 import migrations from "../middleware/appMigrations"
 import { automationQueue } from "../automations"
+import { serveBuilderAssets } from "./controllers/assets"
 
 export { shutdown } from "./routes/public"
 const compress = require("koa-compress")
@@ -44,6 +45,11 @@ if (apiEnabled()) {
     )
     // re-direct before any middlewares occur
     .redirect("/", "/builder")
+
+  // send assets before middleware
+  router.get("/builder/:file*", serveBuilderAssets)
+
+  router
     .use(
       auth.buildAuthMiddleware([], {
         publicAllowed: true,
diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts
index f331609923..8b921e7ba7 100644
--- a/packages/server/src/api/routes/static.ts
+++ b/packages/server/src/api/routes/static.ts
@@ -29,7 +29,6 @@ router.param("file", async (file: any, ctx: any, next: any) => {
 })
 
 router
-  .get("/builder/:file*", controller.serveBuilder)
   .get("/api/assets/client", controller.serveClientLibrary)
   .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
   .post("/api/beta/:feature", controller.toggleBetaUiFeature)

From e8ae9960b2f4742480f6f3fb17a22d96982e9114 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Mar 2025 14:35:56 +0000
Subject: [PATCH 27/31] Build fix.

---
 packages/server/src/api/controllers/assets.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/server/src/api/controllers/assets.ts b/packages/server/src/api/controllers/assets.ts
index c1bc455086..31e615a074 100644
--- a/packages/server/src/api/controllers/assets.ts
+++ b/packages/server/src/api/controllers/assets.ts
@@ -1,3 +1,8 @@
+import { join } from "../../utilities/centralPath"
+import { TOP_LEVEL_PATH } from "../../utilities/fileSystem"
+import { Ctx } from "@budibase/types"
+import send from "koa-send"
+
 // this is a public endpoint with no middlewares
 export const serveBuilderAssets = async function (ctx: Ctx<void, void>) {
   const builderPath = join(TOP_LEVEL_PATH, "builder")

From d6f55b4bc87f2e1fcff9e7169ac765d576eee166 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Fri, 28 Mar 2025 15:23:58 +0000
Subject: [PATCH 28/31] Bump version to 3.7.3

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

diff --git a/lerna.json b/lerna.json
index 5b551ea7cf..bd8b41fcb3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {

From 5e76c7fe2e5a1e798588538d4988ca4432592e05 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Mar 2025 16:29:57 +0000
Subject: [PATCH 29/31] Fixing an issue with asset retrieval, adding a test
 case to check this as it is not checked through vite.

---
 packages/server/src/api/controllers/assets.ts |  6 ++--
 packages/server/src/api/index.ts              |  5 ++--
 packages/server/src/api/routes/assets.ts      | 11 +++++++
 packages/server/src/api/routes/static.ts      | 21 ++------------
 .../src/api/routes/tests/assets.spec.ts       | 29 +++++++++++++++++++
 packages/server/src/api/utils.ts              | 23 +++++++++++++++
 .../server/src/tests/utilities/api/assets.ts  |  8 +++++
 .../server/src/tests/utilities/api/index.ts   |  3 ++
 .../src/utilities/fileSystem/filesystem.ts    |  1 +
 9 files changed, 84 insertions(+), 23 deletions(-)
 create mode 100644 packages/server/src/api/routes/assets.ts
 create mode 100644 packages/server/src/api/routes/tests/assets.spec.ts
 create mode 100644 packages/server/src/api/utils.ts
 create mode 100644 packages/server/src/tests/utilities/api/assets.ts

diff --git a/packages/server/src/api/controllers/assets.ts b/packages/server/src/api/controllers/assets.ts
index 31e615a074..909c49751f 100644
--- a/packages/server/src/api/controllers/assets.ts
+++ b/packages/server/src/api/controllers/assets.ts
@@ -1,10 +1,12 @@
 import { join } from "../../utilities/centralPath"
-import { TOP_LEVEL_PATH } from "../../utilities/fileSystem"
+import { TOP_LEVEL_PATH, DEV_ASSET_PATH } from "../../utilities/fileSystem"
 import { Ctx } from "@budibase/types"
+import env from "../../environment"
 import send from "koa-send"
 
 // this is a public endpoint with no middlewares
 export const serveBuilderAssets = async function (ctx: Ctx<void, void>) {
-  const builderPath = join(TOP_LEVEL_PATH, "builder")
+  let topLevelPath = env.isDev() ? DEV_ASSET_PATH : TOP_LEVEL_PATH
+  const builderPath = join(topLevelPath, "builder")
   await send(ctx, ctx.file, { root: builderPath })
 }
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index 276bb7e209..9b10d64367 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -8,7 +8,7 @@ import { middleware as pro } from "@budibase/pro"
 import { apiEnabled, automationsEnabled } from "../features"
 import migrations from "../middleware/appMigrations"
 import { automationQueue } from "../automations"
-import { serveBuilderAssets } from "./controllers/assets"
+import assetRouter from "./routes/assets"
 
 export { shutdown } from "./routes/public"
 const compress = require("koa-compress")
@@ -47,7 +47,8 @@ if (apiEnabled()) {
     .redirect("/", "/builder")
 
   // send assets before middleware
-  router.get("/builder/:file*", serveBuilderAssets)
+  router.use(assetRouter.routes())
+  router.use(assetRouter.allowedMethods())
 
   router
     .use(
diff --git a/packages/server/src/api/routes/assets.ts b/packages/server/src/api/routes/assets.ts
new file mode 100644
index 0000000000..c140408f0b
--- /dev/null
+++ b/packages/server/src/api/routes/assets.ts
@@ -0,0 +1,11 @@
+import { addFileManagement } from "../utils"
+import { serveBuilderAssets } from "../controllers/assets"
+import Router from "@koa/router"
+
+const router: Router = new Router()
+
+addFileManagement(router)
+
+router.get("/builder/:file*", serveBuilderAssets)
+
+export default router
diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts
index 8b921e7ba7..2fefba301e 100644
--- a/packages/server/src/api/routes/static.ts
+++ b/packages/server/src/api/routes/static.ts
@@ -1,32 +1,15 @@
 import Router from "@koa/router"
 import * as controller from "../controllers/static"
-import { budibaseTempDir } from "../../utilities/budibaseDir"
 import authorized from "../../middleware/authorized"
 import { permissions } from "@budibase/backend-core"
-import env from "../../environment"
+import { addFileManagement } from "../utils"
 import { paramResource } from "../../middleware/resourceId"
-import { devClientLibPath } from "../../utilities/fileSystem"
 
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
 
-/* istanbul ignore next */
-router.param("file", async (file: any, ctx: any, next: any) => {
-  ctx.file = file && file.includes(".") ? file : "index.html"
-  if (!ctx.file.startsWith("budibase-client")) {
-    return next()
-  }
-  // test serves from require
-  if (env.isTest()) {
-    const path = devClientLibPath()
-    ctx.devPath = path.split(ctx.file)[0]
-  } else if (env.isDev()) {
-    // Serving the client library from your local dir in dev
-    ctx.devPath = budibaseTempDir()
-  }
-  return next()
-})
+addFileManagement(router)
 
 router
   .get("/api/assets/client", controller.serveClientLibrary)
diff --git a/packages/server/src/api/routes/tests/assets.spec.ts b/packages/server/src/api/routes/tests/assets.spec.ts
new file mode 100644
index 0000000000..df5587c7e6
--- /dev/null
+++ b/packages/server/src/api/routes/tests/assets.spec.ts
@@ -0,0 +1,29 @@
+import fs from "fs"
+import { join } from "path"
+import { DEV_ASSET_PATH } from "../../../utilities/fileSystem"
+import * as setup from "./utilities"
+
+const path = join(DEV_ASSET_PATH, "builder", "index.html")
+let addedIndexHtml = false
+const config = setup.getConfig()
+
+beforeAll(async () => {
+  if (!fs.existsSync(path)) {
+    fs.writeFileSync(path, "<html></html>", "utf8")
+    addedIndexHtml = true
+  }
+  await config.init()
+})
+
+afterAll(() => {
+  if (addedIndexHtml) {
+    fs.rmSync(path)
+  }
+})
+
+describe("/builder/:file*", () => {
+  it("should be able to retrieve the builder file", async () => {
+    const res = await config.api.assets.get("index.html")
+    expect(res.text).toContain("<html")
+  })
+})
diff --git a/packages/server/src/api/utils.ts b/packages/server/src/api/utils.ts
new file mode 100644
index 0000000000..67b4a8475a
--- /dev/null
+++ b/packages/server/src/api/utils.ts
@@ -0,0 +1,23 @@
+import env from "../environment"
+import { devClientLibPath } from "../utilities/fileSystem"
+import { budibaseTempDir } from "../utilities/budibaseDir"
+import Router from "@koa/router"
+
+export function addFileManagement(router: Router) {
+  /* istanbul ignore next */
+  router.param("file", async (file: any, ctx: any, next: any) => {
+    ctx.file = file && file.includes(".") ? file : "index.html"
+    if (!ctx.file.startsWith("budibase-client")) {
+      return next()
+    }
+    // test serves from require
+    if (env.isTest()) {
+      const path = devClientLibPath()
+      ctx.devPath = path.split(ctx.file)[0]
+    } else if (env.isDev()) {
+      // Serving the client library from your local dir in dev
+      ctx.devPath = budibaseTempDir()
+    }
+    return next()
+  })
+}
diff --git a/packages/server/src/tests/utilities/api/assets.ts b/packages/server/src/tests/utilities/api/assets.ts
new file mode 100644
index 0000000000..6cb9f5dbe8
--- /dev/null
+++ b/packages/server/src/tests/utilities/api/assets.ts
@@ -0,0 +1,8 @@
+import { TestAPI } from "./base"
+
+export class AssetsAPI extends TestAPI {
+  get = async (path: string) => {
+    // has to be raw, body isn't JSON
+    return await this._requestRaw("get", `/builder/${path}`)
+  }
+}
diff --git a/packages/server/src/tests/utilities/api/index.ts b/packages/server/src/tests/utilities/api/index.ts
index 8ed51cdc3a..ba99c2eca0 100644
--- a/packages/server/src/tests/utilities/api/index.ts
+++ b/packages/server/src/tests/utilities/api/index.ts
@@ -21,6 +21,7 @@ import { EnvironmentAPI } from "./environment"
 import { UserPublicAPI } from "./public/user"
 import { MiscAPI } from "./misc"
 import { OAuth2API } from "./oauth2"
+import { AssetsAPI } from "./assets"
 
 export default class API {
   application: ApplicationAPI
@@ -44,6 +45,7 @@ export default class API {
   user: UserAPI
   viewV2: ViewV2API
   webhook: WebhookAPI
+  assets: AssetsAPI
 
   public: {
     user: UserPublicAPI
@@ -71,6 +73,7 @@ export default class API {
     this.user = new UserAPI(config)
     this.viewV2 = new ViewV2API(config)
     this.webhook = new WebhookAPI(config)
+    this.assets = new AssetsAPI(config)
     this.public = {
       user: new UserPublicAPI(config),
     }
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index b0a67ac94e..10feb3c404 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -8,6 +8,7 @@ import { v4 as uuid } from "uuid"
 
 export const TOP_LEVEL_PATH =
   env.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
+export const DEV_ASSET_PATH = join(TOP_LEVEL_PATH, "packages", "server")
 
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.

From 9555dec52398f7ce3e338eca2f3b670b84733b42 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 28 Mar 2025 16:49:05 +0000
Subject: [PATCH 30/31] Test fix.

---
 .../server/src/api/routes/tests/assets.spec.ts  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/routes/tests/assets.spec.ts b/packages/server/src/api/routes/tests/assets.spec.ts
index df5587c7e6..e74eab4f07 100644
--- a/packages/server/src/api/routes/tests/assets.spec.ts
+++ b/packages/server/src/api/routes/tests/assets.spec.ts
@@ -3,21 +3,26 @@ import { join } from "path"
 import { DEV_ASSET_PATH } from "../../../utilities/fileSystem"
 import * as setup from "./utilities"
 
-const path = join(DEV_ASSET_PATH, "builder", "index.html")
-let addedIndexHtml = false
+const path = join(DEV_ASSET_PATH, "builder")
+let addedPath = false
 const config = setup.getConfig()
 
 beforeAll(async () => {
   if (!fs.existsSync(path)) {
-    fs.writeFileSync(path, "<html></html>", "utf8")
-    addedIndexHtml = true
+    addedPath = true
+    fs.mkdirSync(path)
+  }
+  const indexPath = join(path, "index.html")
+  if (!fs.existsSync(indexPath)) {
+    fs.writeFileSync(indexPath, "<html></html>", "utf8")
+    addedPath = true
   }
   await config.init()
 })
 
 afterAll(() => {
-  if (addedIndexHtml) {
-    fs.rmSync(path)
+  if (addedPath) {
+    fs.rmSync(path, { recursive: true })
   }
 })
 

From 8c2f47291e784a7c281e83e81932f60ada67e9c1 Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Mon, 31 Mar 2025 08:40:33 +0000
Subject: [PATCH 31/31] Bump version to 3.7.4

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

diff --git a/lerna.json b/lerna.json
index bd8b41fcb3..45eead5a5a 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {