CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-11 09:15:48 +12:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
mike12345567 2023-02-07 09:54:39 +00:00
parent bad0cf5d55 6aca32591e
commit fb8a5c7878
19 changed files with 78 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -23,7 +23,7 @@
},
"dependencies": {
"@budibase/nano": "10.1.1",
"@budibase/types": "2.2.27-alpha.1",
"@budibase/types": "^2.3.1",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0",

4
packages/bbui/package.json
View file

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

2
packages/bbui/src/Form/Core/EnvDropdown.svelte
View file

@ -25,7 +25,7 @@
let open = false
//eslint-disable-next-line
const STRIP_NAME_REGEX = /(?<=\.)(.*?)(?=\ })/g
const STRIP_NAME_REGEX = /(\w+?)(?=\ })/g
// Strips the name out of the value which is {{ env.Variable }} resulting in an array like ["Variable"]
$: hbsValue = String(value)?.match(STRIP_NAME_REGEX) || []

10
packages/builder/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -58,10 +58,10 @@
}
},
"dependencies": {
"@budibase/bbui": "2.2.27-alpha.1",
"@budibase/client": "2.2.27-alpha.1",
"@budibase/frontend-core": "2.2.27-alpha.1",
"@budibase/string-templates": "2.2.27-alpha.1",
"@budibase/bbui": "^2.3.1",
"@budibase/client": "^2.3.1",
"@budibase/frontend-core": "^2.3.1",
"@budibase/string-templates": "^2.3.1",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",

2
packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
View file

@ -70,7 +70,7 @@
return Number(value)
}
if (type === "options") {
return [value]
return value
}
if (type === "array") {
if (Array.isArray(value)) {

2
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View file

@ -169,7 +169,7 @@
if (saveColumn.type === AUTO_TYPE) {
saveColumn = buildAutoColumn(
$tables.draft.name,
$tables.selected.name,
saveColumn.name,
saveColumn.subtype
)

17
packages/builder/src/stores/portal/environment.js
View file

@ -1,6 +1,7 @@
import { writable } from "svelte/store"
import { writable, get } from "svelte/store"
import { API } from "api"
import { Constants } from "@budibase/frontend-core"
import { licensing } from "stores/portal"
export function createEnvironmentStore() {
const { subscribe, update } = writable({
@ -17,12 +18,14 @@ export function createEnvironmentStore() {
}
async function loadVariables() {
const envVars = await API.fetchEnvironmentVariables()
const mappedVars = envVars.variables.map(name => ({ name }))
update(store => {
store.variables = mappedVars
return store
})
if (get(licensing).environmentVariablesEnabled) {
const envVars = await API.fetchEnvironmentVariables()
const mappedVars = envVars.variables.map(name => ({ name }))
update(store => {
store.variables = mappedVars
return store
})
}
}
async function createVariable(data) {

8
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "2.2.27-alpha.1",
"@budibase/string-templates": "2.2.27-alpha.1",
"@budibase/types": "2.2.27-alpha.1",
"@budibase/backend-core": "^2.3.1",
"@budibase/string-templates": "^2.3.1",
"@budibase/types": "^2.3.1",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View file

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

4
packages/frontend-core/package.json
View file

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "2.2.27-alpha.1",
"@budibase/bbui": "^2.3.1",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

2
packages/sdk/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

12
packages/server/package.json
View file

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

30
packages/server/yarn.lock
View file

@ -1278,13 +1278,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.27-alpha.1.tgz#aa6bc24e4fbf3afa59fd09cbf6184e465a864cef"
integrity sha512-FDoK5L9FS5Ee7fhE8EcuSPYztuo0jydvvmLqbq9ExI4yIzgALsa395X5sxD+Z+4mVNZ6iQMArE14+1rdM8MGUQ==
"@budibase/backend-core@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.1.tgz#9dc2effb3d62c4a2de5934a5ac712be1b402266a"
integrity sha512-IXwSPJ/6yTCJAocpgw2aZznb7T3YeYspL3DfriwCL67tHZRq3zkq/uYYCAs9uYQObBr7OMKPJPTFOuh2MJk12w==
dependencies:
"@budibase/nano" "10.1.1"
"@budibase/types" "2.2.27-alpha.1"
"@budibase/types" "^2.3.1"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -1379,13 +1379,13 @@
qs "^6.11.0"
tough-cookie "^4.1.2"
"@budibase/pro@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.27-alpha.1.tgz#7f1cffbc432790028f69229e2e1bf76006e787a7"
integrity sha512-D92oOM/L3H6QnqA5hi/KT+Pbm4tDrlbUe42WYZ0Dc602Ai2qSCn1vtOkBHjMKTtJh9yGkYp0qQuskEm1hnMO8g==
"@budibase/pro@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.1.tgz#24d0bac89aee0270d92bab7bb7e2c987914ef902"
integrity sha512-vdpMAZbowrUEmdCxEvc7If0REK/9Q6KHPLJ6K99SYtS6STprYaAcO4Sa5GmmluHxuFnQjpYxF4R0CNS8C+C6xA==
dependencies:
"@budibase/backend-core" "2.2.27-alpha.1"
"@budibase/types" "2.2.27-alpha.1"
"@budibase/backend-core" "2.3.1"
"@budibase/types" "2.3.1"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1411,10 +1411,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.27-alpha.1.tgz#7b859f2b5bdf3d48a72c37b7e3d2d4a162ceaee6"
integrity sha512-XRx826XIOSwxnfIkJnzpe6BXkpJukUwF/ZZKOos7lTi6I9K/NUKgLQ/i7iqXdmz2NZ05pWOgSb+0mtBdBNXrYg==
"@budibase/types@2.3.1", "@budibase/types@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.1.tgz#5f8fb84f4273b920619a6308e956ca176ead4304"
integrity sha512-8+Qo7JPGnPv9FWx3AdOScWSElBsYcC7zZFFLeoqBy6y8a4UjtEEDIUZHpRf5gpcSUXuqbzAPbC+CpYJ6NVEvPw==
"@bull-board/api@3.7.0":
version "3.7.0"

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

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

2
packages/types/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "2.2.27-alpha.1",
"version": "2.3.1",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "2.2.27-alpha.1",
"@budibase/pro": "2.2.27-alpha.1",
"@budibase/string-templates": "2.2.27-alpha.1",
"@budibase/types": "2.2.27-alpha.1",
"@budibase/backend-core": "^2.3.1",
"@budibase/pro": "2.3.1",
"@budibase/string-templates": "^2.3.1",
"@budibase/types": "^2.3.1",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View file

@ -475,13 +475,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.27-alpha.1.tgz#aa6bc24e4fbf3afa59fd09cbf6184e465a864cef"
integrity sha512-FDoK5L9FS5Ee7fhE8EcuSPYztuo0jydvvmLqbq9ExI4yIzgALsa395X5sxD+Z+4mVNZ6iQMArE14+1rdM8MGUQ==
"@budibase/backend-core@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.3.1.tgz#9dc2effb3d62c4a2de5934a5ac712be1b402266a"
integrity sha512-IXwSPJ/6yTCJAocpgw2aZznb7T3YeYspL3DfriwCL67tHZRq3zkq/uYYCAs9uYQObBr7OMKPJPTFOuh2MJk12w==
dependencies:
"@budibase/nano" "10.1.1"
"@budibase/types" "2.2.27-alpha.1"
"@budibase/types" "^2.3.1"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -526,13 +526,13 @@
qs "^6.11.0"
tough-cookie "^4.1.2"
"@budibase/pro@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.27-alpha.1.tgz#7f1cffbc432790028f69229e2e1bf76006e787a7"
integrity sha512-D92oOM/L3H6QnqA5hi/KT+Pbm4tDrlbUe42WYZ0Dc602Ai2qSCn1vtOkBHjMKTtJh9yGkYp0qQuskEm1hnMO8g==
"@budibase/pro@2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.3.1.tgz#24d0bac89aee0270d92bab7bb7e2c987914ef902"
integrity sha512-vdpMAZbowrUEmdCxEvc7If0REK/9Q6KHPLJ6K99SYtS6STprYaAcO4Sa5GmmluHxuFnQjpYxF4R0CNS8C+C6xA==
dependencies:
"@budibase/backend-core" "2.2.27-alpha.1"
"@budibase/types" "2.2.27-alpha.1"
"@budibase/backend-core" "2.3.1"
"@budibase/types" "2.3.1"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -540,10 +540,10 @@
lru-cache "^7.14.1"
node-fetch "^2.6.1"
"@budibase/types@2.2.27-alpha.1":
version "2.2.27-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.27-alpha.1.tgz#7b859f2b5bdf3d48a72c37b7e3d2d4a162ceaee6"
integrity sha512-XRx826XIOSwxnfIkJnzpe6BXkpJukUwF/ZZKOos7lTi6I9K/NUKgLQ/i7iqXdmz2NZ05pWOgSb+0mtBdBNXrYg==
"@budibase/types@2.3.1", "@budibase/types@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.3.1.tgz#5f8fb84f4273b920619a6308e956ca176ead4304"
integrity sha512-8+Qo7JPGnPv9FWx3AdOScWSElBsYcC7zZFFLeoqBy6y8a4UjtEEDIUZHpRf5gpcSUXuqbzAPbC+CpYJ6NVEvPw==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"

2
qa-core/src/config/internal-api/TestConfiguration/applications.ts
View file

@ -112,7 +112,7 @@ export default class AppApi {
async delete(appId: string): Promise<Response> {
const response = await this.api.del(`/applications/${appId}`)
expect(response).toHaveStatusCode(204)
expect(response).toHaveStatusCode(200)
return response
}