MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Budibase/budibase into fix/prevent-sso-redirect

This commit is contained in:
Martin McKeaveney 2021-09-29 10:33:30 +01:00
parent 4fa6540fc1 e0b5a7ab4a
commit 1ba39362a4
13 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosting/kubernetes/budibase/Chart.yaml
View File

@ -37,5 +37,5 @@ dependencies:
condition: services.couchdb.enabled
- name: ingress-nginx
version: 3.35.0
repository: https://github.com/kubernetes/ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx
condition: services.ingress.nginx

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "0.9.143-alpha.6",
"version": "0.9.143-alpha.9",
"npmClient": "yarn",
"packages": [
"packages/*"

2
packages/auth/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/auth",
"version": "0.9.143-alpha.6",
"version": "0.9.143-alpha.9",
"description": "Authentication middlewares for budibase builder and apps",
"main": "src/index.js",
"author": "Budibase",

5
packages/auth/src/tenancy/context.js
View File

@ -53,6 +53,11 @@ exports.setTenantId = (
// processed later in the chain
tenantId = user.tenantId || header || tenantId
// Set the tenantId from the subdomain
if (!tenantId) {
tenantId = ctx.subdomains && ctx.subdomains[0]
}
if (!tenantId && !allowNoTenant) {
ctx.throw(403, "Tenant id not set")
}

2
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "0.9.143-alpha.6",
"version": "0.9.143-alpha.9",
"license": "AGPL-3.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",

8
packages/builder/package.json
View File

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

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
View File

@ -133,7 +133,7 @@
/>
{:else if ["string", "longform", "number"].includes(filter.type)}
<Input disabled={filter.noValue} bind:value={filter.value} />
{:else if filter.type === "options" || "array"}
{:else if ["options", "array"].includes(filter.type)}
<Combobox
disabled={filter.noValue}
options={getFieldOptions(filter.field)}

2
packages/cli/package.json
View File

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

6
packages/client/package.json
View File

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

8
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "0.9.143-alpha.6",
"version": "0.9.143-alpha.9",
"description": "Budibase Web Server",
"main": "src/index.js",
"repository": {
@ -64,9 +64,9 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/auth": "^0.9.143-alpha.6",
"@budibase/client": "^0.9.143-alpha.6",
"@budibase/string-templates": "^0.9.143-alpha.6",
"@budibase/auth": "^0.9.143-alpha.9",
"@budibase/client": "^0.9.143-alpha.9",
"@budibase/string-templates": "^0.9.143-alpha.9",
"@elastic/elasticsearch": "7.10.0",
"@koa/router": "8.0.0",
"@sendgrid/mail": "7.1.1",

2
packages/server/src/integrations/postgres.ts
View File

@ -126,7 +126,7 @@ module PostgresModule {
private readonly config: PostgresConfig
COLUMNS_SQL =
"select * from information_schema.columns where table_schema = 'public'"
"select * from information_schema.columns where not table_schema = 'information_schema' and not table_schema = 'pg_catalog'"
PRIMARY_KEYS_SQL = `
select tc.table_schema, tc.table_name, kc.column_name as primary_key

2
packages/string-templates/package.json
View File

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

6
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "0.9.143-alpha.6",
"version": "0.9.143-alpha.9",
"description": "Budibase background service",
"main": "src/index.js",
"repository": {
@ -25,8 +25,8 @@
"author": "Budibase",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@budibase/auth": "^0.9.143-alpha.6",
"@budibase/string-templates": "^0.9.143-alpha.6",
"@budibase/auth": "^0.9.143-alpha.9",
"@budibase/string-templates": "^0.9.143-alpha.9",
"@koa/router": "^8.0.0",
"@techpass/passport-openidconnect": "^0.3.0",
"aws-sdk": "^2.811.0",