Merge branch 'develop' into pro-build-fix

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "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.105-alpha.24",
+    "@budibase/string-templates": "^1.0.105-alpha.25",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.105-alpha.24",
-    "@budibase/client": "^1.0.105-alpha.24",
-    "@budibase/frontend-core": "^1.0.105-alpha.24",
-    "@budibase/string-templates": "^1.0.105-alpha.24",
+    "@budibase/bbui": "^1.0.105-alpha.25",
+    "@budibase/client": "^1.0.105-alpha.25",
+    "@budibase/frontend-core": "^1.0.105-alpha.25",
+    "@budibase/string-templates": "^1.0.105-alpha.25",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/components/backend/DataTable/RowFieldControl.svelte

@@ -34,10 +34,10 @@
   $: label = meta.name ? capitalise(meta.name) : ""
 
   const timeStamp = resolveTimeStamp(value)
-  const isTimeStamp = timeStamp ? true : false
+  const isTimeStamp = !!timeStamp
 </script>
 
-{#if type === "options"}
+{#if type === "options" && meta.constraints.inclusion.length !== 0}
   <Select
     {label}
     data-cy="{meta.name}-select"
@@ -51,7 +51,7 @@
   <Dropzone {label} bind:value />
 {:else if type === "boolean"}
   <Toggle text={label} bind:value data-cy="{meta.name}-input" />
-{:else if type === "array"}
+{:else if type === "array" && meta.constraints.inclusion.length !== 0}
   <Multiselect bind:value {label} options={meta.constraints.inclusion} />
 {:else if type === "link"}
   <LinkedRowSelector bind:linkedRows={value} schema={meta} />

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "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.105-alpha.24",
-    "@budibase/frontend-core": "^1.0.105-alpha.24",
-    "@budibase/string-templates": "^1.0.105-alpha.24",
+    "@budibase/bbui": "^1.0.105-alpha.25",
+    "@budibase/frontend-core": "^1.0.105-alpha.25",
+    "@budibase/string-templates": "^1.0.105-alpha.25",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "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.105-alpha.24",
+    "@budibase/bbui": "^1.0.105-alpha.25",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.105-alpha.24",
-    "@budibase/client": "^1.0.105-alpha.24",
+    "@budibase/backend-core": "^1.0.105-alpha.25",
+    "@budibase/client": "^1.0.105-alpha.25",
+    "@budibase/string-templates": "^1.0.105-alpha.25",
     "@budibase/pro": "^1.0.0",
-    "@budibase/string-templates": "^1.0.105-alpha.24",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/src/api/controllers/row/utils.js

@@ -65,7 +65,10 @@ exports.validate = async ({ tableId, row, table }) => {
     if (type === FieldTypes.ARRAY && row[fieldName]) {
       if (row[fieldName].length) {
         row[fieldName].map(val => {
-          if (!constraints.inclusion.includes(val)) {
+          if (
+            !constraints.inclusion.includes(val) &&
+            constraints.inclusion.length !== 0
+          ) {
             errors[fieldName] = "Field not in list"
           }
         })

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.105-alpha.24",
+  "version": "1.0.105-alpha.25",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,8 +31,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.105-alpha.24",
-    "@budibase/string-templates": "^1.0.105-alpha.24",
+    "@budibase/backend-core": "^1.0.105-alpha.25",
+    "@budibase/string-templates": "^1.0.105-alpha.25",
     "@budibase/pro": "^1.0.0",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",