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

Fixing display of user role in apps in the user management page.

This commit is contained in:
mike12345567 2022-09-23 17:02:32 +01:00
parent 587117064c
commit 41b8a6d55a
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
View File

@ -68,11 +68,13 @@
}) })
} }
return availableApps.map(app => { return availableApps.map(app => {
const prodAppId = apps.getProdAppID(app.appId)
console.log(prodAppId)
return { return {
name: app.name, name: app.name,
devId: app.devId, devId: app.devId,
icon: app.icon, icon: app.icon,
role: privileged ? Constants.Roles.ADMIN : roles[app.appId], role: privileged ? Constants.Roles.ADMIN : roles[prodAppId],
} }
}) })
} }

19
packages/builder/src/stores/portal/apps.js
View File

@ -8,14 +8,21 @@ const extractAppId = id => {
} }
const getProdAppID = appId => { const getProdAppID = appId => {
if (!appId || !appId.startsWith("app_dev")) { if (!appId) {
return appId return appId
} }
// split to take off the app_dev element, then join it together incase any other app_ exist let rest,
const split = appId.split("app_dev") separator = ""
split.shift() if (appId.startsWith("app_dev")) {
const rest = split.join("app_dev") // split to take off the app_dev element, then join it together incase any other app_ exist
return `${"app"}${rest}` const split = appId.split("app_dev")
split.shift()
rest = split.join("app_dev")
} else if (!appId.startsWith("app")) {
rest = appId
separator = "_"
}
return `app${separator}${rest}`
} }
export function createAppStore() { export function createAppStore() {