diff --git a/lerna.json b/lerna.json index 88a21a349a..ec62402383 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "npmClient": "yarn", "packages": ["packages/*"], "command": { @@ -11,6 +11,9 @@ "# We ignore every JSON file, except for built-in-modules, built-ins and plugins defined in babel-preset-env/data.", "@(!(built-in-modules|built-ins|plugins|package)).json" ] + }, + "run": { + "loadEnvFiles": false } } } diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a81f4772d1..e49cdafe68 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/types": "2.4.44-alpha.11", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 643dc9cbaa..0096c488bd 100644 --- 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": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0faf293b3c..fb9b0b3edd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/client": "2.4.44-alpha.9", - "@budibase/frontend-core": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/client": "2.4.44-alpha.11", + "@budibase/frontend-core": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 894616a22e..1aa8317113 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 786220d31c..9970553ed9 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -785,7 +785,7 @@ "barStyle": "picker", "options": [ { - "label": "Extra amall", + "label": "Extra small", "value": "XS" }, { diff --git a/packages/client/package.json b/packages/client/package.json index 9fcf7b0820..0f3e6d212c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/frontend-core": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/frontend-core": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b512f6a423..06bd691802 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c42a07b72e..a029d825af 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df259e0a1f..e15990c44c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.9", - "@budibase/client": "2.4.44-alpha.9", - "@budibase/pro": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/client": "2.4.44-alpha.11", + "@budibase/pro": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index dbfd5dae0c..d9989e8de1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.9.tgz#ea2f1ec39fe0a97172b00e551f9e3b51f860e53b" - integrity sha512-uuZEqeyXnVwyNDPSwI8gF8zCv26PWvhbLoEYXMQqNl9J9q5g4i/lNacfKs1x9JDPABHE93mtLL5eoTogzrqTIg== +"@budibase/backend-core@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" + integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1430,15 +1430,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.9.tgz#f6a5bcfb607ebb2138762e53a04ad55cf6de6014" - integrity sha512-cPUXlt9XQ0DlwoR47wLiLGEQlib6vKW15cLkh0pkz57vHbr5T22Ix4G7vgKGPVr5kpaJVNVdYLxBZ3qy8hUnJQ== +"@budibase/pro@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" + integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.9" + "@budibase/backend-core" "2.4.44-alpha.10" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1491,10 +1491,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.9.tgz#a64fad8252f196bcb2a5fbd53f89ff5a90745813" - integrity sha512-auXyD1A1MZ42KYMaQpnHBgXbR3O3t6oycYESwhbkIaTHw3f9ir3m8Sus5R1eMI7YqI8nWjB6y9tW6lZoIAd/Pg== +"@budibase/types@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" + integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== dependencies: scim-patch "^0.7.0" diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index a807898cc1..8c1c829035 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.44-alpha.9" + "@budibase/types": "2.4.44-alpha.11" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4f0106563e..9cc24a3edb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f3b32a04b6..da8f6226dd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index d138001e2e..7add48f0ca 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.9", - "@budibase/pro": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/pro": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/packages/worker/src/api/routes/global/tests/scim.spec.ts b/packages/worker/src/api/routes/global/tests/scim.spec.ts index 3dff3fb7a5..6c411a640d 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -399,53 +399,19 @@ describe("scim", () => { }) it.each([false, "false", "False"])( - "can deactive an active user (sending %s)", + "deactivating an active user (sending %s) will delete it", async activeValue => { const body: ScimUpdateRequest = { schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], Operations: [{ op: "Replace", path: "active", value: activeValue }], } - const response = await patchScimUser({ id: user.id, body }) + await patchScimUser( + { id: user.id, body }, + { expect: 204, skipContentTypeCheck: true } + ) - const expectedScimUser: ScimUserResponse = { - ...user, - active: false, - } - expect(response).toEqual(expectedScimUser) - - const persistedUser = await config.api.scimUsersAPI.find(user.id) - expect(persistedUser).toEqual(expectedScimUser) - } - ) - - it.each([true, "true", "True"])( - "can activate an inactive user (sending %s)", - async activeValue => { - // Deactivate user - await patchScimUser({ - id: user.id, - body: { - schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], - Operations: [{ op: "Replace", path: "active", value: true }], - }, - }) - - const body: ScimUpdateRequest = { - schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], - Operations: [{ op: "Replace", path: "active", value: activeValue }], - } - - const response = await patchScimUser({ id: user.id, body }) - - const expectedScimUser: ScimUserResponse = { - ...user, - active: true, - } - expect(response).toEqual(expectedScimUser) - - const persistedUser = await config.api.scimUsersAPI.find(user.id) - expect(persistedUser).toEqual(expectedScimUser) + await config.api.scimUsersAPI.find(user.id, { expect: 404 }) } ) diff --git a/packages/worker/src/tests/api/scim/shared.ts b/packages/worker/src/tests/api/scim/shared.ts index d99f4c20dc..1b064b8f41 100644 --- a/packages/worker/src/tests/api/scim/shared.ts +++ b/packages/worker/src/tests/api/scim/shared.ts @@ -4,6 +4,7 @@ import { TestAPI } from "../base" const defaultConfig = { expect: 200, setHeaders: true, + skipContentTypeCheck: false, } export type RequestSettings = typeof defaultConfig @@ -27,7 +28,7 @@ export abstract class ScimTestAPI extends TestAPI { "application/scim+json; charset=utf-8" ) - if (method !== "delete") { + if (method !== "delete" && !requestSettings?.skipContentTypeCheck) { request = request.expect("Content-Type", /json/) } diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c09dc187d3..605c183a10 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.9.tgz#ea2f1ec39fe0a97172b00e551f9e3b51f860e53b" - integrity sha512-uuZEqeyXnVwyNDPSwI8gF8zCv26PWvhbLoEYXMQqNl9J9q5g4i/lNacfKs1x9JDPABHE93mtLL5eoTogzrqTIg== +"@budibase/backend-core@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" + integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -565,15 +565,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.9.tgz#f6a5bcfb607ebb2138762e53a04ad55cf6de6014" - integrity sha512-cPUXlt9XQ0DlwoR47wLiLGEQlib6vKW15cLkh0pkz57vHbr5T22Ix4G7vgKGPVr5kpaJVNVdYLxBZ3qy8hUnJQ== +"@budibase/pro@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" + integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.9" + "@budibase/backend-core" "2.4.44-alpha.10" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -608,10 +608,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.9.tgz#a64fad8252f196bcb2a5fbd53f89ff5a90745813" - integrity sha512-auXyD1A1MZ42KYMaQpnHBgXbR3O3t6oycYESwhbkIaTHw3f9ir3m8Sus5R1eMI7YqI8nWjB6y9tW6lZoIAd/Pg== +"@budibase/types@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" + integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== dependencies: scim-patch "^0.7.0"