Merge branch 'develop' into cypress-testing

2022-06-21 12:55:45 +01:00 · 2022-06-21 12:55:45 +01:00 · 58aae66a03
parent 43811be6cc a476a28e73
commit 58aae66a03
17 changed files with 65 additions and 41 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/backend-core",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase backend core libraries used in server and worker",
  "main": "dist/src/index.js",
  "types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
    "test:watch": "jest --watchAll"
  },
  "dependencies": {
-    "@budibase/types": "^1.0.207-alpha.4",
+    "@budibase/types": "^1.0.207-alpha.5",
    "@techpass/passport-openidconnect": "0.3.2",
    "aws-sdk": "2.1030.0",
    "bcrypt": "5.0.1",
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
  ],
  "dependencies": {
    "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
    "@spectrum-css/actionbutton": "^1.0.1",
    "@spectrum-css/actiongroup": "^1.0.1",
    "@spectrum-css/avatar": "^3.0.2",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -69,10 +69,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.4",
-    "@budibase/client": "^1.0.207-alpha.4",
-    "@budibase/frontend-core": "^1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@ -54,8 +54,9 @@
  }

  const onFieldChange = (expression, field) => {
-    // Update the field type
+    // Update the field types
    expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
+    expression.externalType = getSchema(expression)?.externalType

    // Ensure a valid operator is set
    const validOperators = LuceneUtils.getValidOperatorsForType(
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.4",
-    "@budibase/frontend-core": "^1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
+    "@budibase/frontend-core": "^1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
    "@spectrum-css/button": "^3.0.3",
    "@spectrum-css/card": "^3.0.3",
    "@spectrum-css/divider": "^1.0.3",
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@ -1,12 +1,12 @@
 {
  "name": "@budibase/frontend-core",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase frontend core libraries used in builder and client",
  "author": "Budibase",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "dependencies": {
-    "@budibase/bbui": "^1.0.207-alpha.4",
+    "@budibase/bbui": "^1.0.207-alpha.5",
    "lodash": "^4.17.21",
    "svelte": "^3.46.2"
  }
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@ -63,3 +63,25 @@ export const TableNames = {
 *   - Coerce types for search endpoint
 */
 export const ApiVersion = "1"
+
+/**
+ * Maximum minimum range for SQL number values
+ */
+export const SqlNumberTypeRangeMap = {
+  integer: {
+    max: 2147483647,
+    min: -2147483648,
+  },
+  int: {
+    max: 2147483647,
+    min: -2147483648,
+  },
+  smallint: {
+    max: 32767,
+    min: -32768,
+  },
+  mediumint: {
+    max: 8388607,
+    min: -8388608,
+  },
+}
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@ -1,5 +1,5 @@
 import { Helpers } from "@budibase/bbui"
-import { OperatorOptions } from "../constants"
+import { OperatorOptions, SqlNumberTypeRangeMap } from "../constants"

 /**
 * Returns the valid operator options for a certain data type
@ -94,7 +94,7 @@ export const buildLuceneQuery = filter => {
  }
  if (Array.isArray(filter)) {
    filter.forEach(expression => {
-      let { operator, field, type, value } = expression
+      let { operator, field, type, value, externalType } = expression
      // Parse all values into correct types
      if (type === "datetime" && value) {
        value = new Date(value).toISOString()
@ -106,16 +106,14 @@ export const buildLuceneQuery = filter => {
        value = `${value}`?.toLowerCase() === "true"
      }
      if (operator.startsWith("range")) {
+        const minint =
+          SqlNumberTypeRangeMap[externalType]?.min || Number.MIN_SAFE_INTEGER
+        const maxint =
+          SqlNumberTypeRangeMap[externalType]?.max || Number.MAX_SAFE_INTEGER
        if (!query.range[field]) {
          query.range[field] = {
-            low:
-              type === "number"
-                ? Number.MIN_SAFE_INTEGER
-                : "0000-00-00T00:00:00.000Z",
-            high:
-              type === "number"
-                ? Number.MAX_SAFE_INTEGER
-                : "9999-00-00T00:00:00.000Z",
+            low: type === "number" ? minint : "0000-00-00T00:00:00.000Z",
+            high: type === "number" ? maxint : "9999-00-00T00:00:00.000Z",
          }
        }
        if (operator === "rangeLow" && value != null && value !== "") {
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase Web Server",
  "main": "src/index.ts",
  "repository": {
@ -77,11 +77,11 @@
  "license": "GPL-3.0",
  "dependencies": {
    "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.207-alpha.4",
-    "@budibase/client": "^1.0.207-alpha.4",
-    "@budibase/pro": "1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
-    "@budibase/types": "^1.0.207-alpha.4",
+    "@budibase/backend-core": "^1.0.207-alpha.5",
+    "@budibase/client": "^1.0.207-alpha.5",
+    "@budibase/pro": "1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.5",
    "@bull-board/api": "3.7.0",
    "@bull-board/koa": "3.9.4",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@ -246,6 +246,7 @@ module MSSQLModule {
            autocolumn: !!autoColumns.find((col: string) => col === name),
            name: name,
            ...convertSqlType(def.DATA_TYPE),
+            externalType: def.DATA_TYPE,
          }
        }
        tables[tableName] = {
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@ -232,6 +232,7 @@ module MySQLModule {
              autocolumn: isAuto,
              constraints,
              ...convertSqlType(column.Type),
+              externalType: column.Type,
            }
          }
          if (!tables[tableName]) {
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@ -271,6 +271,7 @@ module PostgresModule {
            autocolumn: isAuto,
            name: columnName,
            ...convertSqlType(column.data_type),
+            externalType: column.data_type,
          }
        }

--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/types/package.json
+++ b/packages/types/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/types",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase types",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "1.0.207-alpha.4",
+  "version": "1.0.207-alpha.5",
  "description": "Budibase background service",
  "main": "src/index.ts",
  "repository": {
@ -34,10 +34,10 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/backend-core": "^1.0.207-alpha.4",
-    "@budibase/pro": "1.0.207-alpha.4",
-    "@budibase/string-templates": "^1.0.207-alpha.4",
-    "@budibase/types": "^1.0.207-alpha.4",
+    "@budibase/backend-core": "^1.0.207-alpha.5",
+    "@budibase/pro": "1.0.207-alpha.5",
+    "@budibase/string-templates": "^1.0.207-alpha.5",
+    "@budibase/types": "^1.0.207-alpha.5",
    "@koa/router": "8.0.8",
    "@sentry/node": "6.17.7",
    "@techpass/passport-openidconnect": "0.3.2",