Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.8.29-alpha.17",
+  "version": "2.8.29-alpha.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -108,7 +108,13 @@
   /****************************************************/
 
   const getInputData = (testData, blockInputs) => {
-    let newInputData = cloneDeep(testData || blockInputs)
+    // Test data is not cloned for reactivity
+    let newInputData = testData || cloneDeep(blockInputs)
+
+    // Ensures the app action fields are populated
+    if (block.event === "app:trigger" && !newInputData?.fields) {
+      newInputData = cloneDeep(blockInputs)
+    }
 
     /**
      * TODO - Remove after November 2023

packages/frontend-core/src/components/grid/cells/HeaderCell.svelte

@@ -27,7 +27,6 @@
     "array",
     "attachment",
     "boolean",
-    "formula",
     "json",
   ]
 

packages/server/src/integrations/base/sql.ts

@@ -315,7 +315,7 @@ class InternalBuilder {
   addSorting(query: KnexQuery, json: QueryJson): KnexQuery {
     let { sort, paginate } = json
     const table = json.meta?.table
-    if (sort) {
+    if (sort && Object.keys(sort || {}).length > 0) {
       for (let [key, value] of Object.entries(sort)) {
         const direction =
           value.direction === SortDirection.ASCENDING ? "asc" : "desc"

packages/server/src/integrations/tests/sql.spec.ts

@@ -26,6 +26,12 @@ function generateReadJson({
     filters: filters || {},
     sort: sort || {},
     paginate: paginate || {},
+    meta: {
+      table: {
+        name: table || TABLE_NAME,
+        primary: ["id"],
+      },
+    },
   }
 }
 
@@ -636,4 +642,19 @@ describe("SQL query builder", () => {
       sql: `select * from (select * from (select * from \"test\" where LOWER(\"test\".\"name\") LIKE :1) where rownum <= :2) \"test\"`,
     })
   })
+
+  it("should sort SQL Server tables by the primary key if no sort data is provided", () => {
+    let query = new Sql(SqlClient.MS_SQL, limit)._query(
+      generateReadJson({
+        sort: {},
+        paginate: {
+          limit: 10,
+        },
+      })
+    )
+    expect(query).toEqual({
+      bindings: [10],
+      sql: `select * from (select top (@p0) * from [test] order by [test].[id] asc) as [test]`,
+    })
+  })
 })