From 6826f4874328e5f7c9a018e8d6608f518b4c14a0 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonnymccullagh@users.noreply.github.com>
Date: Thu, 24 Aug 2023 15:51:46 +0100
Subject: [PATCH 1/2] merge master changes into develop (#11590)

* Return the actual objects (#11570)

* Bump version to 2.9.30

* trigger a feature branch on pull request (#11584)

trigger a feature branch on pull request

* Bump version to 2.9.31

* Bump version to 2.9.32

---------

Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Budibase Staging Release Bot <>
---
 .github/workflows/deploy-featurebranch.yml | 19 +++++++++++++++++++
 lerna.json                                 |  2 +-
 packages/bbui/src/Table/Table.svelte       |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/deploy-featurebranch.yml

diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
new file mode 100644
index 0000000000..9057d32c4c
--- /dev/null
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -0,0 +1,19 @@
+name: deploy-featurebranch
+
+on:
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: passeidireto/trigger-external-workflow-action@main
+        env:
+            BRANCH: ${{ github.head_ref }}
+        with:
+          repository: budibase/budibase-deploys
+          event: featurebranch-qa-deploy
+          github_pat: ${{ secrets.GH_ACCESS_TOKEN }}
diff --git a/lerna.json b/lerna.json
index 05fea191af..3d6bf559b8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.30-alpha.13",
+  "version": "2.9.32",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 3a86295178..529d1144ee 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -215,7 +215,7 @@
         const nameA = getDisplayName(a)
         const nameB = getDisplayName(b)
         if (orderA !== orderB) {
-          return orderA < orderB ? orderA : orderB
+          return orderA < orderB ? a : b
         }
         return nameA < nameB ? a : b
       })

From 915832ab91a214d898af7d5b79245b6ceb93820b Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Thu, 24 Aug 2023 14:52:09 +0000
Subject: [PATCH 2/2] Bump version to 2.9.33-alpha.0

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

diff --git a/lerna.json b/lerna.json
index 3d6bf559b8..c379dfe567 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.9.32",
+  "version": "2.9.33-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"