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

merge with master

This commit is contained in:
Martin McKeaveney 2023-09-11 11:57:18 +01:00
parent b4e8228969 d1d3dd3c37
commit 722c4e6d48
4 changed files with 4 additions and 3 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.9.40-alpha.9", "version": "2.10.2",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

1
packages/backend-core/scripts/build.js
View File

@ -1,4 +1,5 @@
#!/usr/bin/node #!/usr/bin/node
const coreBuild = require("../../../scripts/build") const coreBuild = require("../../../scripts/build")
coreBuild("./src/plugin/index.ts", "./dist/plugins.js")
coreBuild("./src/index.ts", "./dist/index.js") coreBuild("./src/index.ts", "./dist/index.js")

2
packages/builder/src/stores/portal/licensing.js
View File

@ -107,7 +107,7 @@ export const createLicensingStore = () => {
Constants.Features.USER_GROUPS Constants.Features.USER_GROUPS
) )
const backupsEnabled = license.features.includes( const backupsEnabled = license.features.includes(
Constants.Features.BACKUPS Constants.Features.APP_BACKUPS
) )
const scimEnabled = license.features.includes(Constants.Features.SCIM) const scimEnabled = license.features.includes(Constants.Features.SCIM)
const environmentVariablesEnabled = license.features.includes( const environmentVariablesEnabled = license.features.includes(

2
packages/server/src/sdk/app/permissions/index.ts
View File

@ -92,7 +92,7 @@ export async function getResourcePerms(
// update the various roleIds in the resource permissions // update the various roleIds in the resource permissions
for (let role of rolesList) { for (let role of rolesList) {
const rolePerms = allowsExplicitPerm const rolePerms = allowsExplicitPerm
? roles.checkForRoleResourceArray(role.permissions, resourceId) ? roles.checkForRoleResourceArray(role.permissions || {}, resourceId)
: {} : {}
if (rolePerms[resourceId]?.indexOf(level) > -1) { if (rolePerms[resourceId]?.indexOf(level) > -1) {
permissions[level] = { permissions[level] = {