Merge branch 'master' of github.com:Budibase/budibase into develop

lerna.json

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

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.27-alpha.24",
+  "version": "1.0.43",
   "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.27-alpha.24",
+  "version": "1.0.43",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

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

packages/builder/src/builderStore/api.js

@@ -13,6 +13,9 @@ const apiCall =
       headers,
     })
     if (resp.status === 403) {
+      if (url.includes("/api/templates")) {
+        return { json: () => [] }
+      }
       removeCookie(Cookies.Auth)
       // reload after removing cookie, go to login
       if (!url.includes("self") && !url.includes("login")) {

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -274,6 +274,9 @@
   onMount(async () => {
     await apps.load()
     await templates.load()
+    if ($templates?.length === 0) {
+      notifications.error("There was a problem loading quick start templates.")
+    }
     // if the portal is loaded from an external URL with a template param
     const initInfo = await auth.getInitInfo()
     if (initInfo?.init_template) {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.27-alpha.24",
+  "version": "1.0.43",
   "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.27-alpha.24",
+  "version": "1.0.43",
   "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.27-alpha.24",
+    "@budibase/bbui": "^1.0.43",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.27-alpha.24",
+    "@budibase/string-templates": "^1.0.43",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

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

packages/server/src/api/controllers/query/index.js

@@ -9,8 +9,11 @@ const { Thread, ThreadType } = require("../../../threads")
 const { save: saveDatasource } = require("../datasource")
 const { RestImporter } = require("./import")
 const { invalidateDynamicVariables } = require("../../../threads/utils")
+const environment = require("../../../environment")
 
-const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 })
+const Runner = new Thread(ThreadType.QUERY, {
+  timeoutMs: environment.QUERY_THREAD_TIMEOUT || 10000,
+})
 
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.27-alpha.24",
+  "version": "1.0.43",
   "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.27-alpha.24",
+  "version": "1.0.43",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -29,8 +29,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.27-alpha.24",
+    "@budibase/backend-core": "^1.0.43",
-    "@budibase/string-templates": "^1.0.27-alpha.24",
+    "@budibase/string-templates": "^1.0.43",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",