@budibase/frontend-core 3.4.24 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "3.4.24",
+  "version": "3.5.1",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
@@ -17,8 +17,5 @@
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
   },
-  "devDependencies": {
-    "svelte-check": "^4.1.0"
-  },
-  "gitHead": "91298a9929a20e89b0672d861cc9deafff68a3e8"
+  "gitHead": "e64de415ddc908b22282579f37fcead199ab1b78"
 }

package/src/components/ConditionField.svelte

@@ -10,6 +10,7 @@
   export let drawerTitle
   export let toReadable
   export let toRuntime
+  export let evaluationContext = {}
 
   const dispatch = createEventDispatcher()
 
@@ -66,7 +67,6 @@
     >
       Confirm
     </Button>
-
     <svelte:component
       this={panel}
       slot="body"
@@ -76,6 +76,7 @@
       allowHBS
       on:change={drawerOnChange}
       {bindings}
+      context={evaluationContext}
     />
   </Drawer>
 

package/src/components/CoreFilterBuilder.svelte

@@ -42,6 +42,7 @@
   export let panel
   export let toReadable
   export let toRuntime
+  export let evaluationContext = {}
 
   $: editableFilters = migrateFilters(filters)
   $: {
@@ -385,6 +386,7 @@
                         {panel}
                         {toReadable}
                         {toRuntime}
+                        {evaluationContext}
                         on:change={e => {
                           const updated = {
                             ...filter,
@@ -423,6 +425,7 @@
                       {panel}
                       {toReadable}
                       {toRuntime}
+                      {evaluationContext}
                       on:change={e => {
                         onFilterFieldUpdate(
                           { ...filter, ...e.detail },

package/src/components/FilterField.svelte

@@ -24,6 +24,7 @@
   export let drawerTitle
   export let toReadable
   export let toRuntime
+  export let evaluationContext = {}
 
   const dispatch = createEventDispatcher()
   const { OperatorOptions, FilterValueType } = Constants
@@ -156,6 +157,7 @@
       allowHBS
       on:change={drawerOnChange}
       {bindings}
+      context={evaluationContext}
     />
   </Drawer>
 

package/src/fetch/DataFetch.ts

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

package/src/fetch/TableFetch.ts

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

package/src/index.ts

@@ -1,6 +1,6 @@
 export { createAPIClient } from "./api"
 export type { APIClient } from "./api"
-export { fetchData, DataFetchMap } from "./fetch"
+export { fetchData, DataFetchMap, type DataFetchType } from "./fetch"
 export * as Constants from "./constants"
 export * from "./stores"
 export * from "./utils"

package/svelte.config.mjs

@@ -0,0 +1,7 @@
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+export default config