@budibase/frontend-core 3.5.2 → 3.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -17,5 +17,5 @@
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
   },
-  "gitHead": "2d3a130fceeb689d3013606dde57bab8db41c586"
+  "gitHead": "0f586f33c25c04b35a7dc72b7217fdbaa3e843c0"
 }

package/src/api/ai.ts

@@ -1,7 +1,9 @@
+import { GenerateJsRequest, GenerateJsResponse } from "@budibase/types"
 import { BaseAPIClient } from "./types"
 
 export interface AIEndpoints {
   generateCronExpression: (prompt: string) => Promise<{ message: string }>
+  generateJs: (req: GenerateJsRequest) => Promise<GenerateJsResponse>
 }
 
 export const buildAIEndpoints = (API: BaseAPIClient): AIEndpoints => ({
@@ -14,4 +16,11 @@ export const buildAIEndpoints = (API: BaseAPIClient): AIEndpoints => ({
       body: { prompt },
     })
   },
+
+  generateJs: async req => {
+    return await API.post({
+      url: "/api/ai/js",
+      body: req,
+    })
+  },
 })

package/src/fetch/DataFetch.ts

@@ -8,6 +8,7 @@ import {
   Row,
   SearchFilters,
   SortOrder,
+  SortType,
   TableSchema,
 } from "@budibase/types"
 import { APIClient } from "../api/types"
@@ -71,6 +72,8 @@ export default abstract class BaseDataFetch<
   options: DataFetchOptions<TQuery> & {
     datasource: TDatasource
 
+    sortType: SortType | null
+
     // Client side feature customisation
     clientSideSearching: boolean
     clientSideSorting: boolean
@@ -103,6 +106,7 @@ export default abstract class BaseDataFetch<
       // Sorting config
       sortColumn: null,
       sortOrder: SortOrder.ASCENDING,
+      sortType: null,
 
       // Pagination config
       paginate: true,
@@ -223,12 +227,31 @@ export default abstract class BaseDataFetch<
       this.options.sortColumn = this.getDefaultSortColumn(definition, schema)
     }
 
-    // If no sort order, default to ascending
-    if (!this.options.sortOrder) {
+    // If we don't have a sort column specified then just ensure we don't set
+    // any sorting params
+    if (!this.options.sortColumn) {
       this.options.sortOrder = SortOrder.ASCENDING
+      this.options.sortType = null
     } else {
-      // Ensure sortOrder matches the enum
-      this.options.sortOrder = this.options.sortOrder.toLowerCase() as SortOrder
+      // Otherwise determine what sort type to use base on sort column
+      this.options.sortType = SortType.STRING
+      const fieldSchema = schema?.[this.options.sortColumn]
+      if (
+        fieldSchema?.type === FieldType.NUMBER ||
+        fieldSchema?.type === FieldType.BIGINT ||
+        ("calculationType" in fieldSchema && fieldSchema?.calculationType)
+      ) {
+        this.options.sortType = SortType.NUMBER
+      }
+
+      // If no sort order, default to ascending
+      if (!this.options.sortOrder) {
+        this.options.sortOrder = SortOrder.ASCENDING
+      } else {
+        // Ensure sortOrder matches the enum
+        this.options.sortOrder =
+          this.options.sortOrder.toLowerCase() as SortOrder
+      }
     }
 
     // Build the query
@@ -271,6 +294,7 @@ export default abstract class BaseDataFetch<
     const {
       sortColumn,
       sortOrder,
+      sortType,
       limit,
       clientSideSearching,
       clientSideSorting,
@@ -287,8 +311,8 @@ export default abstract class BaseDataFetch<
     }
 
     // If we don't support sorting, do a client-side sort
-    if (!this.features.supportsSort && clientSideSorting && sortColumn) {
-      rows = sort(rows, sortColumn, sortOrder)
+    if (!this.features.supportsSort && clientSideSorting && sortType) {
+      rows = sort(rows, sortColumn as any, sortOrder, sortType)
     }
 
     // If we don't support pagination, do a client-side limit

package/src/fetch/TableFetch.ts

@@ -29,7 +29,8 @@ export default class TableFetch extends BaseDataFetch<TableDatasource, Table> {
   }
 
   async getData() {
-    const { datasource, limit, sortColumn, sortOrder, paginate } = this.options
+    const { datasource, limit, sortColumn, sortOrder, sortType, paginate } =
+      this.options
     const { tableId } = datasource
     const { cursor, query } = get(this.store)
 
@@ -40,6 +41,7 @@ export default class TableFetch extends BaseDataFetch<TableDatasource, Table> {
         limit,
         sort: sortColumn,
         sortOrder: sortOrder ?? SortOrder.ASCENDING,
+        sortType,
         paginate,
         bookmark: cursor,
       })

package/src/fetch/ViewV2Fetch.ts

@@ -1,5 +1,4 @@
 import {
-  SearchViewRowRequest,
   SortOrder,
   ViewDatasource,
   ViewV2Enriched,
@@ -41,7 +40,8 @@ export default class ViewV2Fetch extends BaseDataFetch<
   }
 
   async getData() {
-    const { datasource, limit, sortColumn, sortOrder, paginate } = this.options
+    const { datasource, limit, sortColumn, sortOrder, sortType, paginate } =
+      this.options
     const { cursor, query, definition } = get(this.store)
 
     // If this is a calculation view and we have no calculations, return nothing
@@ -68,13 +68,14 @@ export default class ViewV2Fetch extends BaseDataFetch<
     }
 
     try {
-      const request: SearchViewRowRequest = {
+      const request = {
         query,
         paginate,
         limit,
         bookmark: cursor,
         sort: sortColumn,
         sortOrder: sortOrder,
+        sortType,
       }
       if (paginate) {
         const res = await this.API.viewV2.fetch(datasource.id, {