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:
Martin McKeaveney 2022-08-01 17:56:20 +01:00
parent 11579597dd 21b48b1f75
commit 29697d52e9
18 changed files with 92 additions and 87 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": "1.1.32",
"version": "1.1.33-alpha.0",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"@budibase/types": "1.1.33-alpha.0",
"@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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"@budibase/string-templates": "1.1.33-alpha.0",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

2
packages/builder/cypress/integration/autoScreensUI.spec.js
View File

@ -10,10 +10,8 @@ filterTests(['smoke', 'all'], () => {
it("should disable the autogenerated screen options if no sources are available", () => {
cy.createApp("First Test App", false)
cy.closeModal();
cy.contains("Design").click()
cy.navigateToAutogeneratedModal()
cy.get(interact.CONFIRM_WRAP_SPE_BUTTON).should('be.disabled')

2
packages/builder/cypress/integration/datasources/mySql.spec.js
View File

@ -179,7 +179,7 @@ filterTests(["all"], () => {
cy.get(".nav-item").should("contain", queryName)
})
xit("should duplicate a query", () => {
it("should duplicate a query", () => {
/// Get query nav item - QueryName
cy.get(".nav-item")
.contains(queryName)

2
packages/builder/cypress/integration/datasources/postgreSql.spec.js
View File

@ -204,7 +204,7 @@ filterTests(["all"], () => {
cy.get(".spectrum-Table").eq(1).should("contain", queryName)
})
xit("should duplicate a query", () => {
it("should duplicate a query", () => {
// Locate previously created query
cy.get(".nav-item")
.contains(queryName)

2
packages/builder/cypress/integration/queryLevelTransformers.spec.js
View File

@ -2,7 +2,7 @@ import filterTests from "../support/filterTests"
const interact = require('../support/interact')
filterTests(["smoke", "all"], () => {
xcontext("Query Level Transformers", () => {
context("Query Level Transformers", () => {
before(() => {
cy.login()
cy.createTestApp()

29
packages/builder/cypress/support/commands.js
View File

@ -543,15 +543,22 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => {
// DESIGN SECTION
Cypress.Commands.add("searchAndAddComponent", component => {
// Open component menu
cy.get(".spectrum-Button").contains("Component").click({ force: true })
cy.get(".icon-side-nav").within(() => {
cy.get(".icon-side-nav-item").eq(1).click()
})
cy.get(".add-component > .spectrum-Button")
.contains("Add component")
.click({ force: true })
cy.get(".container", { timeout: 1000 }).within(() => {
cy.get(".title").should("contain", "Add component")
// Search and add component
cy.wait(500)
cy.get(".spectrum-Textfield-input").clear().type(component)
cy.get(".body").within(() => {
cy.get(".component")
.contains(new RegExp("^" + component + "$"), { timeout: 3000 })
.click({ force: true })
// Search and add component
cy.get(".spectrum-Textfield-input").clear().type(component)
cy.get(".body").within(() => {
cy.get(".component")
.contains(new RegExp("^" + component + "$"), { timeout: 3000 })
.click({ force: true })
})
})
cy.wait(1000)
cy.location().then(loc => {
@ -597,7 +604,7 @@ Cypress.Commands.add("getComponent", componentId => {
Cypress.Commands.add("createScreen", (route, accessLevelLabel) => {
// Blank Screen
cy.contains("Design").click()
cy.get(".header > .add-button").click()
cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
cy.get(".spectrum-Modal").within(() => {
cy.get("[data-cy='blank-screen']").click()
cy.get(".spectrum-Button").contains("Continue").click({ force: true })
@ -622,7 +629,7 @@ Cypress.Commands.add(
"createDatasourceScreen",
(datasourceNames, accessLevelLabel) => {
cy.contains("Design").click()
cy.get(".header > .add-button").click()
cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
cy.get(".spectrum-Modal").within(() => {
cy.get(".item").contains("Autogenerated screens").click()
cy.get(".spectrum-Button").contains("Continue").click({ force: true })
@ -742,7 +749,7 @@ Cypress.Commands.add("navigateToDataSection", () => {
Cypress.Commands.add("navigateToAutogeneratedModal", () => {
// Screen name must already exist within data source
cy.contains("Design").click()
cy.get(".header > .add-button").click()
cy.get(".spectrum-Button").contains("Add screen").click({ force: true })
cy.get(".spectrum-Modal").within(() => {
cy.get(".item", { timeout: 2000 })
.contains("Autogenerated screens")

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.1.32",
"version": "1.1.33-alpha.0",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.1.32",
"@budibase/client": "^1.1.32",
"@budibase/frontend-core": "^1.1.32",
"@budibase/string-templates": "^1.1.32",
"@budibase/bbui": "1.1.33-alpha.0",
"@budibase/client": "1.1.33-alpha.0",
"@budibase/frontend-core": "1.1.33-alpha.0",
"@budibase/string-templates": "1.1.33-alpha.0",
"@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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"@budibase/frontend-core": "^1.1.32",
"@budibase/string-templates": "^1.1.32",
"@budibase/bbui": "1.1.33-alpha.0",
"@budibase/frontend-core": "1.1.33-alpha.0",
"@budibase/string-templates": "1.1.33-alpha.0",
"@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.1.32",
"version": "1.1.33-alpha.0",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.1.32",
"@budibase/bbui": "1.1.33-alpha.0",
"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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"@budibase/client": "^1.1.32",
"@budibase/pro": "1.1.32",
"@budibase/string-templates": "^1.1.32",
"@budibase/types": "^1.1.32",
"@budibase/backend-core": "1.1.33-alpha.0",
"@budibase/client": "1.1.33-alpha.0",
"@budibase/pro": "1.1.33-alpha.0",
"@budibase/string-templates": "1.1.33-alpha.0",
"@budibase/types": "1.1.33-alpha.0",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

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.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.32-alpha.6.tgz#e9dc1a1989a2a6952f5ce002fcdfef66625f3de8"
integrity sha512-8oT6veeSmymuJfnu1jAkDAWD4fLj5W0KxNq6GlC+eMWWDZloDF4fMWDpuYTFBeinq1z1GeSFXc9Ak6u+1Z7LtQ==
"@budibase/backend-core@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.33-alpha.0.tgz#8a502a038c3a86fa061bc53c9538deed0598b96c"
integrity sha512-QSUX8sOHMip2XYbjAehhcFHpHucCOAQOR8sW20WDjofR/+DEHRuvkHXetgJvcl0CMPey8dmh98H+yeQio1kYcQ==
dependencies:
"@budibase/types" "1.1.32-alpha.6"
"@budibase/types" "1.1.33-alpha.0"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -1177,13 +1177,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.32-alpha.6.tgz#43e233d6de9a1f6f7784674396840c651e4a5b68"
integrity sha512-NgUBD2nQTiHuzJlCmpf9Qy6QowZ58Om9fh1nj9ll8S+c8Xrwe/tNhYx64h6Ulc/ssuywEE7jcPFdYw0LHC7qtw==
"@budibase/pro@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.33-alpha.0.tgz#0ad6ab84a6e056bafa0ccd5a76310661ae8af216"
integrity sha512-8FQOewCDHpe7AL2psQ/VMy4YkwacQYg1dMnK9GMDFL6MGkgV2bPxOMDyOYgAUaDpwhXh7P9KIszysRinW/T5Dg==
dependencies:
"@budibase/backend-core" "1.1.32-alpha.6"
"@budibase/types" "1.1.32-alpha.6"
"@budibase/backend-core" "1.1.33-alpha.0"
"@budibase/types" "1.1.33-alpha.0"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1206,10 +1206,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.32-alpha.6.tgz#95d8d73c7ed6ebc22ff26a44365127a478e19409"
integrity sha512-AKKxrzVqGtcSzZZ2fP6i2Vgv6ICN9NEEE1dmzRk9AImZS+XKQ9VgVpdE+4gHgFK7L0gBYAsiaoEpCbbrI/+NoQ==
"@budibase/types@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.33-alpha.0.tgz#78f59d004bb3b201e04d9ad84583e64a98db40b9"
integrity sha512-ZEjdylzTfsxeOhZtVNxm+4cViq8SlpN6Dg8b3HoFQntXaIdGuD9M1GKVMd+juYBbcbNdx0GDu+UsVgVZLrosxQ==
"@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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"version": "1.1.33-alpha.0",
"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.1.32",
"version": "1.1.33-alpha.0",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.1.32",
"@budibase/pro": "1.1.32",
"@budibase/string-templates": "^1.1.32",
"@budibase/types": "^1.1.32",
"@budibase/backend-core": "1.1.33-alpha.0",
"@budibase/pro": "1.1.33-alpha.0",
"@budibase/string-templates": "1.1.33-alpha.0",
"@budibase/types": "1.1.33-alpha.0",
"@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.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.32-alpha.6.tgz#e9dc1a1989a2a6952f5ce002fcdfef66625f3de8"
integrity sha512-8oT6veeSmymuJfnu1jAkDAWD4fLj5W0KxNq6GlC+eMWWDZloDF4fMWDpuYTFBeinq1z1GeSFXc9Ak6u+1Z7LtQ==
"@budibase/backend-core@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.33-alpha.0.tgz#8a502a038c3a86fa061bc53c9538deed0598b96c"
integrity sha512-QSUX8sOHMip2XYbjAehhcFHpHucCOAQOR8sW20WDjofR/+DEHRuvkHXetgJvcl0CMPey8dmh98H+yeQio1kYcQ==
dependencies:
"@budibase/types" "1.1.32-alpha.6"
"@budibase/types" "1.1.33-alpha.0"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
@ -324,21 +324,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.32-alpha.6.tgz#43e233d6de9a1f6f7784674396840c651e4a5b68"
integrity sha512-NgUBD2nQTiHuzJlCmpf9Qy6QowZ58Om9fh1nj9ll8S+c8Xrwe/tNhYx64h6Ulc/ssuywEE7jcPFdYw0LHC7qtw==
"@budibase/pro@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.33-alpha.0.tgz#0ad6ab84a6e056bafa0ccd5a76310661ae8af216"
integrity sha512-8FQOewCDHpe7AL2psQ/VMy4YkwacQYg1dMnK9GMDFL6MGkgV2bPxOMDyOYgAUaDpwhXh7P9KIszysRinW/T5Dg==
dependencies:
"@budibase/backend-core" "1.1.32-alpha.6"
"@budibase/types" "1.1.32-alpha.6"
"@budibase/backend-core" "1.1.33-alpha.0"
"@budibase/types" "1.1.33-alpha.0"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.1.32-alpha.6":
version "1.1.32-alpha.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.32-alpha.6.tgz#95d8d73c7ed6ebc22ff26a44365127a478e19409"
integrity sha512-AKKxrzVqGtcSzZZ2fP6i2Vgv6ICN9NEEE1dmzRk9AImZS+XKQ9VgVpdE+4gHgFK7L0gBYAsiaoEpCbbrI/+NoQ==
"@budibase/types@1.1.33-alpha.0":
version "1.1.33-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.33-alpha.0.tgz#78f59d004bb3b201e04d9ad84583e64a98db40b9"
integrity sha512-ZEjdylzTfsxeOhZtVNxm+4cViq8SlpN6Dg8b3HoFQntXaIdGuD9M1GKVMd+juYBbcbNdx0GDu+UsVgVZLrosxQ==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"