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 develop

This commit is contained in:
Andrew Kingston 2022-08-25 09:36:13 +01:00
parent e1b5a6e7cf 030f032319
commit 32ac50adf0
18 changed files with 107 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/deploy-release.yml vendored
View File

@ -69,15 +69,27 @@ jobs:
env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Set the base64 kubeconfig
run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64
- name: Re roll the services
- name: Re roll app-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }}
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
args: rollout restart deployment app-service -n budibase
- name: Re roll proxy-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment proxy-service -n budibase
- name: Re roll worker-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0

23
.github/workflows/release-develop.yml vendored
View File

@ -121,15 +121,26 @@ jobs:
env:
KUBECONFIG_FILE: '${{ secrets.RELEASE_KUBECONFIG }}'
- name: Set the base64 kubeconfig
run: echo 'RELEASE_KUBECONFIG=${{ secrets.RELEASE_KUBECONFIG }}' | base64
- name: Re roll the services
- name: Re roll app-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ env.RELEASE_KUBECONFIG }}
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment proxy-service -n budibase && kubectl rollout restart deployment app-service -n budibase && kubectl rollout restart deployment worker-service -n budibase
args: rollout restart deployment app-service -n budibase
- name: Re roll proxy-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment proxy-service -n budibase
- name: Re roll worker-service
uses: actions-hub/kubectl@master
env:
KUBE_CONFIG: ${{ secrets.RELEASE_KUBECONFIG_BASE64 }}
with:
args: rollout restart deployment worker-service -n budibase
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v4.0.0

5
hosting/nginx.prod.conf.hbs
View File

@ -85,6 +85,10 @@ http {
proxy_pass http://$apps:4002;
}
location /preview {
proxy_pass http://$apps:4002;
}
location = / {
proxy_pass http://$apps:4002;
}
@ -94,6 +98,7 @@ http {
proxy_pass http://$watchtower:8080;
}
{{/if}}
location ~ ^/(builder|app_) {
proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade;

2
lerna.json
View File

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

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.2.44-alpha.2",
"@budibase/types": "1.2.44-alpha.6",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

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": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"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.2.44-alpha.2",
"@budibase/string-templates": "1.2.44-alpha.6",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

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

2
packages/cli/package.json
View File

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

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"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.2.44-alpha.2",
"@budibase/frontend-core": "1.2.44-alpha.2",
"@budibase/string-templates": "1.2.44-alpha.2",
"@budibase/bbui": "1.2.44-alpha.6",
"@budibase/frontend-core": "1.2.44-alpha.6",
"@budibase/string-templates": "1.2.44-alpha.6",
"@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": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "1.2.44-alpha.2",
"@budibase/bbui": "1.2.44-alpha.6",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

12
packages/server/package.json
View File

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

4
packages/server/src/integrations/mongodb.ts
View File

@ -93,8 +93,8 @@ module MongoDBModule {
json[field] = self.createObjectIds(json[field])
}
if (
(field === "_id" || field?.startsWith("$")) &&
typeof json[field] === "string"
typeof json[field] === "string" &&
json[field].toLowerCase().startsWith("objectid")
) {
const id = json[field].match(
/(?<=objectid\(['"]).*(?=['"]\))/gi

10
packages/server/src/integrations/tests/mongo.spec.js
View File

@ -103,16 +103,16 @@ describe("MongoDB Integration", () => {
restore()
})
it("creates ObjectIds if the _id fields contains a match on ObjectId", async () => {
it("creates ObjectIds if the field contains a match on ObjectId", async () => {
const query = {
json: {
filter: {
_id: "ObjectId('ACBD12345678ABCD12345678')",
name: "ObjectId('name')"
name: "ObjectId('BBBB12345678ABCD12345678')"
},
update: {
_id: "ObjectId('FFFF12345678ABCD12345678')",
name: "ObjectId('updatedName')",
name: "ObjectId('CCCC12345678ABCD12345678')",
},
options: {
upsert: false,
@ -126,11 +126,11 @@ describe("MongoDB Integration", () => {
const args = config.integration.client.updateOne.mock.calls[0]
expect(args[0]).toEqual({
_id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
name: "ObjectId('name')",
name: mongo.ObjectID.createFromHexString("BBBB12345678ABCD12345678"),
})
expect(args[1]).toEqual({
_id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
name: "ObjectId('updatedName')",
name: mongo.ObjectID.createFromHexString("CCCC12345678ABCD12345678"),
})
expect(args[2]).toEqual({
upsert: false

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.2.tgz#89de0626821308629628d703bc1ee98bc5ae1e8a"
integrity sha512-ZV5ZuuPccPN21Z99XjNvNFVPTRuZC061NOuxAXaX4LIE+o5cwRKStU7mVMVEnj+UPrwAQDYEjON2vTQ5CZd1/w==
"@budibase/backend-core@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.6.tgz#902a8a0857be675f1a8aaa10538794038b168cd0"
integrity sha512-vZ34uO/IoIbx+dgHTT9TVoVhGjldVyJyUl8RxlfLiDee5fzpghVuotlSu6FpeOkW5ZpPOpENRriN0fvwxUkI7g==
dependencies:
"@budibase/types" "1.2.44-alpha.2"
"@budibase/types" "1.2.44-alpha.6"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1178,13 +1178,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.2.tgz#0f6b3bdd0226f0b077f886ac7cb75cd9207e6909"
integrity sha512-OVNJWFL82z08O3rpE7sTnYa/nrslNMblLgd+M5mo155Q+Lk6tmXFxg49Azoo51AB/S4VLruebt5fVVMGTdQngA==
"@budibase/pro@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.6.tgz#40e4f61ed3510f883c8acc8681b8df8da8d20e0f"
integrity sha512-VatMDBQ41nnd30knd3D+4sUHQaZAEcvljPp8SWD6JV5IRrKbcSevIrmulsyq7guuy0IWgSBJbjQf2mKksnvAMw==
dependencies:
"@budibase/backend-core" "1.2.44-alpha.2"
"@budibase/types" "1.2.44-alpha.2"
"@budibase/backend-core" "1.2.44-alpha.6"
"@budibase/types" "1.2.44-alpha.6"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1207,10 +1207,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.2.tgz#9f266436715806bf42a2ab9c21b0af089ce443f3"
integrity sha512-TXZwDsHs6RLA8aIM3MC+MKwpSHZG7hZ9DigKgzpD9UugTPChq+GT+zadKPBe5/bbLuhrhAORqnPea3JLm8P7XQ==
"@budibase/types@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.6.tgz#c595b7c3416d8f81d0052f8c5137346375148132"
integrity sha512-lMDfimVOmRnDhJzExrqCEFnGpri1kmriKrw86ijI+1zIPrO4un3kAfCZBBJ0BeH12jCsi8ySJErQ1alshe92kg==
"@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": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"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": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"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": "1.2.44-alpha.2",
"version": "1.2.44-alpha.6",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.2.44-alpha.2",
"@budibase/pro": "1.2.44-alpha.2",
"@budibase/string-templates": "1.2.44-alpha.2",
"@budibase/types": "1.2.44-alpha.2",
"@budibase/backend-core": "1.2.44-alpha.6",
"@budibase/pro": "1.2.44-alpha.6",
"@budibase/string-templates": "1.2.44-alpha.6",
"@budibase/types": "1.2.44-alpha.6",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.2.tgz#89de0626821308629628d703bc1ee98bc5ae1e8a"
integrity sha512-ZV5ZuuPccPN21Z99XjNvNFVPTRuZC061NOuxAXaX4LIE+o5cwRKStU7mVMVEnj+UPrwAQDYEjON2vTQ5CZd1/w==
"@budibase/backend-core@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.44-alpha.6.tgz#902a8a0857be675f1a8aaa10538794038b168cd0"
integrity sha512-vZ34uO/IoIbx+dgHTT9TVoVhGjldVyJyUl8RxlfLiDee5fzpghVuotlSu6FpeOkW5ZpPOpENRriN0fvwxUkI7g==
dependencies:
"@budibase/types" "1.2.44-alpha.2"
"@budibase/types" "1.2.44-alpha.6"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -325,21 +325,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.2.tgz#0f6b3bdd0226f0b077f886ac7cb75cd9207e6909"
integrity sha512-OVNJWFL82z08O3rpE7sTnYa/nrslNMblLgd+M5mo155Q+Lk6tmXFxg49Azoo51AB/S4VLruebt5fVVMGTdQngA==
"@budibase/pro@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.44-alpha.6.tgz#40e4f61ed3510f883c8acc8681b8df8da8d20e0f"
integrity sha512-VatMDBQ41nnd30knd3D+4sUHQaZAEcvljPp8SWD6JV5IRrKbcSevIrmulsyq7guuy0IWgSBJbjQf2mKksnvAMw==
dependencies:
"@budibase/backend-core" "1.2.44-alpha.2"
"@budibase/types" "1.2.44-alpha.2"
"@budibase/backend-core" "1.2.44-alpha.6"
"@budibase/types" "1.2.44-alpha.6"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.2.44-alpha.2":
version "1.2.44-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.2.tgz#9f266436715806bf42a2ab9c21b0af089ce443f3"
integrity sha512-TXZwDsHs6RLA8aIM3MC+MKwpSHZG7hZ9DigKgzpD9UugTPChq+GT+zadKPBe5/bbLuhrhAORqnPea3JLm8P7XQ==
"@budibase/types@1.2.44-alpha.6":
version "1.2.44-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.44-alpha.6.tgz#c595b7c3416d8f81d0052f8c5137346375148132"
integrity sha512-lMDfimVOmRnDhJzExrqCEFnGpri1kmriKrw86ijI+1zIPrO4un3kAfCZBBJ0BeH12jCsi8ySJErQ1alshe92kg==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"