Merge branch 'develop' into match-lowercase-emails

2021-10-26 14:56:22 +01:00 · 2021-10-26 14:56:22 +01:00 · 61bb04af7e
parent 2011e579a1 62b7787097
commit 61bb04af7e
18 changed files with 68 additions and 39 deletions
--- a/docs/budibase-0.2.2.tgz
+++ b/docs/budibase-0.2.2.tgz
--- a/docs/index.yaml
+++ b/docs/index.yaml
@ -2,8 +2,8 @@ apiVersion: v1
 entries:
  budibase:
  - apiVersion: v2
-    appVersion: 0.9.163
-    created: "2021-10-18T16:25:04.374924613+01:00"
+    appVersion: 0.9.169
+    created: "2021-10-20T14:27:23.521358+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -13,8 +13,33 @@ entries:
      name: ingress-nginx
      repository: https://github.com/kubernetes/ingress-nginx
      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of
-      teams build apps for their workplace in minutes.
+    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
+    digest: 57f365d799fcaace4658883cb8ec961a7905383a68acf065af4f6e57f9878ff8
+    keywords:
+    - low-code
+    - database
+    - cluster
+    name: budibase
+    sources:
+    - https://github.com/Budibase/budibase
+    - https://budibase.com
+    type: application
+    urls:
+    - https://budibase.github.io/budibase/budibase-0.2.2.tgz
+    version: 0.2.2
+  - apiVersion: v2
+    appVersion: 0.9.163
+    created: "2021-10-20T14:27:23.5153+01:00"
+    dependencies:
+    - condition: services.couchdb.enabled
+      name: couchdb
+      repository: https://apache.github.io/couchdb-helm
+      version: 3.3.4
+    - condition: ingress.nginx
+      name: ingress-nginx
+      repository: https://github.com/kubernetes/ingress-nginx
+      version: 3.35.0
+    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
    digest: ebac6d8631cc38b266c3689508b5123f5afc395f23bdb02738be26c7cae0b0b5
    keywords:
    - low-code
@ -30,7 +55,7 @@ entries:
    version: 0.2.1
  - apiVersion: v2
    appVersion: 0.9.163
-    created: "2021-10-18T16:25:04.36936805+01:00"
+    created: "2021-10-20T14:27:23.510041+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -40,8 +65,7 @@ entries:
      name: ingress-nginx
      repository: https://github.com/kubernetes/ingress-nginx
      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of
-      teams build apps for their workplace in minutes.
+    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
    digest: f369536c0eac1f6959d51e8ce6d74a87a7a9df29ae84fb9cbed0a273ab77429b
    keywords:
    - low-code
@ -57,7 +81,7 @@ entries:
    version: 0.2.0
  - apiVersion: v2
    appVersion: 0.9.56
-    created: "2021-10-18T16:25:04.36360616+01:00"
+    created: "2021-10-20T14:27:23.504543+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -66,8 +90,7 @@ entries:
    - name: ingress-nginx
      repository: https://github.com/kubernetes/ingress-nginx
      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of
-      teams build apps for their workplace in minutes.
+    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
    digest: 8dc4f2ed4d98cad5adf25936aefea680042d3e4e17832f846b961fd8708ad192
    keywords:
    - low-code
@ -83,7 +106,7 @@ entries:
    version: 0.1.1
  - apiVersion: v2
    appVersion: 0.9.56
-    created: "2021-10-18T16:25:04.354504201+01:00"
+    created: "2021-10-20T14:27:23.496847+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -92,8 +115,7 @@ entries:
    - name: ingress-nginx
      repository: https://github.com/kubernetes/ingress-nginx
      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of
-      teams build apps for their workplace in minutes.
+    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
    digest: 08031b0803cce0eff64472e569d454d9176119c8207aa9873a9c95ee66cc7d3f
    keywords:
    - low-code
@ -107,4 +129,4 @@ entries:
    urls:
    - https://budibase.github.io/budibase/budibase-0.1.0.tgz
    version: 0.1.0
-generated: "2021-10-18T16:25:04.346266269+01:00"
+generated: "2021-10-20T14:27:23.491132+01:00"
--- a/hosting/kubernetes/budibase/Chart.yaml
+++ b/hosting/kubernetes/budibase/Chart.yaml
@ -22,13 +22,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2

 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.9.163"
+appVersion: "0.9.169"

 dependencies:
  - name: couchdb
--- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
@ -82,6 +82,8 @@ spec:
          value: {{ .Values.services.apps.port | quote }}
        - name: MULTI_TENANCY
          value: {{ .Values.globals.multiTenancy | quote }}
+        - name: LOG_LEVEL
+          value: {{ .Values.services.apps.logLevel | quote }}
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password }}
        - name: REDIS_URL
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
@ -79,6 +79,8 @@ spec:
          value: {{ .Values.services.worker.port | quote }}
        - name: MULTI_TENANCY
          value: {{ .Values.globals.multiTenancy | quote }}
+        - name: LOG_LEVEL
+          value: {{ .Values.services.worker.logLevel | quote }}
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password | quote }}
        - name: REDIS_URL
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- 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": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,11 +65,11 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.169-alpha.18",
-    "@budibase/client": "^0.9.169-alpha.18",
+    "@budibase/bbui": "^0.9.172",
+    "@budibase/client": "^0.9.172",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.169-alpha.18",
-    "@sentry/browser": "6.0.0",
+    "@budibase/string-templates": "^0.9.172",
+    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
    "codemirror": "^5.59.0",
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@ -60,6 +60,8 @@ export function createAuthStore() {
          name: user.name,
          user_id: user._id,
          tenant: user.tenantId,
+          "Company size": user.size,
+          "Job role": user.profession,
        })
      })
    }
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "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": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "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": "^0.9.169-alpha.18",
+    "@budibase/bbui": "^0.9.172",
    "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.169-alpha.18",
+    "@budibase/string-templates": "^0.9.172",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "description": "Budibase Web Server",
  "main": "src/index.js",
  "repository": {
@ -68,9 +68,9 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.169-alpha.18",
-    "@budibase/client": "^0.9.169-alpha.18",
-    "@budibase/string-templates": "^0.9.169-alpha.18",
+    "@budibase/auth": "^0.9.172",
+    "@budibase/client": "^0.9.172",
+    "@budibase/string-templates": "^0.9.172",
    "@elastic/elasticsearch": "7.10.0",
    "@koa/router": "8.0.0",
    "@sendgrid/mail": "7.1.1",
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "0.9.169-alpha.18",
+  "version": "0.9.172",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -29,8 +29,8 @@
  "author": "Budibase",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
-    "@budibase/auth": "^0.9.169-alpha.18",
-    "@budibase/string-templates": "^0.9.169-alpha.18",
+    "@budibase/auth": "^0.9.172",
+    "@budibase/string-templates": "^0.9.172",
    "@koa/router": "^8.0.0",
    "@sentry/node": "^6.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
--- a/packages/worker/src/api/routes/tests/realEmail.spec.js
+++ b/packages/worker/src/api/routes/tests/realEmail.spec.js
@ -3,9 +3,6 @@ const { EmailTemplatePurpose } = require("../../../constants")
 const nodemailer = require("nodemailer")
 const fetch = require("node-fetch")

-// need a longer timeout for getting these
-jest.setTimeout(30000)
-
 describe("/api/global/email", () => {
  let request = setup.getRequest()
  let config = setup.getConfig()
--- a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js
+++ b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js
@ -234,6 +234,7 @@ class TestConfiguration {
            user: "don.bahringer@ethereal.email",
            pass: "yCKSH8rWyUPbnhGYk9",
          },
+          connectionTimeout: 1000, // must be less than the jest default of 5000
        },
      },
      null,
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@ -35,6 +35,9 @@ function createSMTPTransport(config) {
    options.tls = {
      rejectUnauthorized: false,
    }
+    if (config.connectionTimeout) {
+      options.connectionTimeout = config.connectionTimeout
+    }
  } else {
    options = {
      port: 587,