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

@@ -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 }}

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.9.30-alpha.13",
+  "version": "2.9.32",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

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
       })