@budibase/server 2.4.12-alpha.0 → 2.4.12

package/jest.config.ts

@@ -14,7 +14,6 @@ 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.12-alpha.0",
+  "version": "2.4.12",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,12 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.12-alpha.0",
-    "@budibase/client": "2.4.12-alpha.0",
+    "@budibase/backend-core": "^2.4.12",
+    "@budibase/client": "^2.4.12",
     "@budibase/pro": "2.4.11",
-    "@budibase/shared-core": "2.4.12-alpha.0",
-    "@budibase/string-templates": "2.4.12-alpha.0",
-    "@budibase/types": "2.4.12-alpha.0",
+    "@budibase/string-templates": "^2.4.12",
+    "@budibase/types": "^2.4.12",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -175,5 +174,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "b5b20e239ee8e5d1172dca2a16538587a58a91e4"
+  "gitHead": "ac4c0b3dd60c901691c7644c2f9aa6a5458b03f4"
 }

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

@@ -11,8 +11,6 @@ import {
   Row,
   Table,
   RelationshipTypes,
-  FieldType,
-  SortType,
 } from "@budibase/types"
 import {
   breakRowIdField,
@@ -751,16 +749,8 @@ export class ExternalRequest {
     )
     //if the sort column is a formula, remove it
     for (let sortColumn of Object.keys(sort || {})) {
-      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
+      if (table.schema[sortColumn]?.type === "formula") {
+        delete sort?.[sortColumn]
       }
     }
     filters = buildFilters(id, filters || {}, table)

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

@@ -8,6 +8,7 @@ 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 {
@@ -18,7 +19,6 @@ 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: SortJson | undefined
+  let sort
   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,8 +317,7 @@ class InternalBuilder {
     const table = json.meta?.table
     if (sort) {
       for (let [key, value] of Object.entries(sort)) {
-        const direction =
-          value.direction === SortDirection.ASCENDING ? "asc" : "desc"
+        const direction = value === 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,11 +2,8 @@ import {
   DatasourceFieldType,
   DatasourcePlus,
   Integration,
-  PaginationJson,
   QueryJson,
   QueryType,
-  SearchFilters,
-  SortJson,
   Table,
   TableSchema,
 } from "@budibase/types"
@@ -16,7 +13,6 @@ 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
@@ -241,7 +237,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
     const handlers = {
       [DataSourceOperation.CREATE]: () =>
         this.create({ sheet, row: json.body }),
-      [DataSourceOperation.READ]: () => this.read({ ...json, sheet }),
+      [DataSourceOperation.READ]: () => this.read({ sheet }),
       [DataSourceOperation.UPDATE]: () =>
         this.update({
           // exclude the header row and zero index
@@ -349,40 +345,18 @@ class GoogleSheetsIntegration implements DatasourcePlus {
     }
   }
 
-  async read(query: {
-    sheet: string
-    filters?: SearchFilters
-    sort?: SortJson
-    paginate?: PaginationJson
-  }) {
+  async read(query: { sheet: string }) {
     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
-      let response = []
-      for (let row of filtered) {
+      const response = []
+      for (let row of rows) {
         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,7 +9,6 @@
       "@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"]
     }
   },
@@ -20,9 +19,15 @@
   "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"
+  ]
+}