@budibase/server 2.4.17 → 2.4.18

package/jest.config.ts

@@ -14,6 +14,7 @@ const baseConfig: Config.InitialProjectOptions = {
   moduleNameMapper: {
     "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
     "@budibase/backend-core": "<rootDir>/../backend-core/src",
+    "@budibase/shared-core": "<rootDir>/../shared-core/src",
     "@budibase/types": "<rootDir>/../types/src",
   },
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.17",
+  "version": "2.4.18",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.4.17",
-    "@budibase/client": "^2.4.17",
-    "@budibase/pro": "2.4.16",
-    "@budibase/string-templates": "^2.4.17",
-    "@budibase/types": "^2.4.17",
+    "@budibase/backend-core": "^2.4.18",
+    "@budibase/client": "^2.4.18",
+    "@budibase/pro": "2.4.17",
+    "@budibase/shared-core": "^2.4.18",
+    "@budibase/string-templates": "^2.4.18",
+    "@budibase/types": "^2.4.18",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -174,5 +175,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "f60a43236d9e0543b45744abfd285db7b9c883ef"
+  "gitHead": "e73b6d3cded7b7ec40fb31e0665c4e1a43423202"
 }

package/src/api/controllers/row/ExternalRequest.ts

@@ -11,6 +11,8 @@ import {
   Row,
   Table,
   RelationshipTypes,
+  FieldType,
+  SortType,
 } from "@budibase/types"
 import {
   breakRowIdField,
@@ -749,8 +751,16 @@ export class ExternalRequest {
     )
     //if the sort column is a formula, remove it
     for (let sortColumn of Object.keys(sort || {})) {
-      if (table.schema[sortColumn]?.type === "formula") {
-        delete sort?.[sortColumn]
+      if (!sort?.[sortColumn]) {
+        continue
+      }
+      switch (table.schema[sortColumn]?.type) {
+        case FieldType.FORMULA:
+          delete sort?.[sortColumn]
+          break
+        case FieldType.NUMBER:
+          sort[sortColumn].type = SortType.number
+          break
       }
     }
     filters = buildFilters(id, filters || {}, table)

package/src/api/controllers/row/external.ts

@@ -8,7 +8,6 @@ import {
   breakRowIdField,
 } from "../../../integrations/utils"
 import { ExternalRequest, RunConfig } from "./ExternalRequest"
-import { context } from "@budibase/backend-core"
 import * as exporters from "../view/exporters"
 import { apiFileReturn } from "../../../utilities/fileSystem"
 import {
@@ -19,6 +18,7 @@ import {
   Table,
   Datasource,
   IncludeRelationship,
+  SortJson,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 
@@ -142,14 +142,14 @@ export async function search(ctx: BBContext) {
       limit: limit,
     }
   }
-  let sort
+  let sort: SortJson | undefined
   if (params.sort) {
     const direction =
       params.sortOrder === "descending"
         ? SortDirection.DESCENDING
         : SortDirection.ASCENDING
     sort = {
-      [params.sort]: direction,
+      [params.sort]: { direction },
     }
   }
   try {

package/src/integrations/base/sql.ts

@@ -317,7 +317,8 @@ class InternalBuilder {
     const table = json.meta?.table
     if (sort) {
       for (let [key, value] of Object.entries(sort)) {
-        const direction = value === SortDirection.ASCENDING ? "asc" : "desc"
+        const direction =
+          value.direction === SortDirection.ASCENDING ? "asc" : "desc"
         query = query.orderBy(`${table?.name}.${key}`, direction)
       }
     } else if (this.client === SqlClient.MS_SQL && paginate?.limit) {

package/src/integrations/googlesheets.ts

@@ -2,8 +2,11 @@ import {
   DatasourceFieldType,
   DatasourcePlus,
   Integration,
+  PaginationJson,
   QueryJson,
   QueryType,
+  SearchFilters,
+  SortJson,
   Table,
   TableSchema,
 } from "@budibase/types"
@@ -13,6 +16,7 @@ import { DataSourceOperation, FieldTypes } from "../constants"
 import { GoogleSpreadsheet } from "google-spreadsheet"
 import fetch from "node-fetch"
 import { configs, HTTPError } from "@budibase/backend-core"
+import { dataFilters } from "@budibase/shared-core"
 
 interface GoogleSheetsConfig {
   spreadsheetId: string
@@ -237,7 +241,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
     const handlers = {
       [DataSourceOperation.CREATE]: () =>
         this.create({ sheet, row: json.body }),
-      [DataSourceOperation.READ]: () => this.read({ sheet }),
+      [DataSourceOperation.READ]: () => this.read({ ...json, sheet }),
       [DataSourceOperation.UPDATE]: () =>
         this.update({
           // exclude the header row and zero index
@@ -345,18 +349,40 @@ class GoogleSheetsIntegration implements DatasourcePlus {
     }
   }
 
-  async read(query: { sheet: string }) {
+  async read(query: {
+    sheet: string
+    filters?: SearchFilters
+    sort?: SortJson
+    paginate?: PaginationJson
+  }) {
     try {
       await this.connect()
       const sheet = this.client.sheetsByTitle[query.sheet]
       const rows = await sheet.getRows()
+      const filtered = dataFilters.runLuceneQuery(rows, query.filters)
       const headerValues = sheet.headerValues
-      const response = []
-      for (let row of rows) {
+      let response = []
+      for (let row of filtered) {
         response.push(
           this.buildRowObject(headerValues, row._rawData, row._rowNumber)
         )
       }
+
+      if (query.sort) {
+        if (Object.keys(query.sort).length !== 1) {
+          console.warn("Googlesheets does not support multiple sorting", {
+            sortInfo: query.sort,
+          })
+        }
+        const [sortField, sortInfo] = Object.entries(query.sort)[0]
+        response = dataFilters.luceneSort(
+          response,
+          sortField,
+          sortInfo.direction,
+          sortInfo.type
+        )
+      }
+
       return response
     } catch (err) {
       console.error("Error reading from google sheets", err)

package/tsconfig.json

@@ -9,6 +9,7 @@
       "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
+      "@budibase/shared-core": ["../shared-core/src"],
       "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
@@ -19,15 +20,9 @@
   "references": [
     { "path": "../types" },
     { "path": "../backend-core" },
+    { "path": "../shared-core" },
     { "path": "../../../budibase-pro/packages/pro" }
   ],
-  "include": [
-    "src/**/*",
-    "specs",
-    "package.json"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
-}
+  "include": ["src/**/*", "specs", "package.json"],
+  "exclude": ["node_modules", "dist"]
+}