diff --git a/lerna.json b/lerna.json index 694a22ccc9..b1292cd20a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.33-alpha.6", + "version": "2.9.33-alpha.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/bbui/src/FancyForm/FancySelect.svelte b/packages/bbui/src/FancyForm/FancySelect.svelte index ee43ecc3ca..e015f51570 100644 --- a/packages/bbui/src/FancyForm/FancySelect.svelte +++ b/packages/bbui/src/FancyForm/FancySelect.svelte @@ -2,8 +2,9 @@ import { createEventDispatcher } from "svelte" import FancyField from "./FancyField.svelte" import Icon from "../Icon/Icon.svelte" - import Popover from "../Popover/Popover.svelte" import FancyFieldLabel from "./FancyFieldLabel.svelte" + import StatusLight from "../StatusLight/StatusLight.svelte" + import Picker from "../Form/Core/Picker.svelte" export let label export let value @@ -11,18 +12,30 @@ export let error = null export let validate = null export let options = [] + export let isOptionEnabled = () => true export let getOptionLabel = option => extractProperty(option, "label") export let getOptionValue = option => extractProperty(option, "value") - + export let getOptionSubtitle = option => extractProperty(option, "subtitle") + export let getOptionColour = () => null const dispatch = createEventDispatcher() let open = false - let popover let wrapper $: placeholder = !value $: selectedLabel = getSelectedLabel(value) + $: fieldColour = getFieldAttribute(getOptionColour, value, options) + const getFieldAttribute = (getAttribute, value, options) => { + // Wait for options to load if there is a value but no options + if (!options?.length) { + return "" + } + const index = options.findIndex( + (option, idx) => getOptionValue(option, idx) === value + ) + return index !== -1 ? getAttribute(options[index], index) : null + } const extractProperty = (value, property) => { if (value && typeof value === "object") { return value[property] @@ -64,46 +77,45 @@ {label} {/if} + {#if fieldColour} + + + + {/if} +
{selectedLabel || ""}
-
+
- (open = false)} - useAnchorWidth={true} - maxWidth={null} -> -
- {#if options.length} - {#each options as option, idx} -
onChange(getOptionValue(option, idx))} - > - - {getOptionLabel(option, idx)} - - {#if value === getOptionValue(option, idx)} - - {/if} -
- {/each} - {/if} -
- +
+ option === value} + /> +
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index aada17b318..f736f523ad 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -8,6 +8,8 @@ import Icon from "../../Icon/Icon.svelte" import StatusLight from "../../StatusLight/StatusLight.svelte" import Popover from "../../Popover/Popover.svelte" + import Tags from "../../Tags/Tags.svelte" + import Tag from "../../Tags/Tag.svelte" export let id = null export let disabled = false @@ -26,6 +28,7 @@ export let getOptionIcon = () => null export let useOptionIconImage = false export let getOptionColour = () => null + export let getOptionSubtitle = () => null export let open = false export let readonly = false export let quiet = false @@ -37,7 +40,7 @@ export let customPopoverHeight export let align = "left" export let footer = null - + export let customAnchor = null const dispatch = createEventDispatcher() let searchTerm = null @@ -99,7 +102,7 @@ bind:this={button} > {#if fieldIcon} - {#if !useOptionIconImage} + {#if !useOptionIconImage}x @@ -139,9 +142,8 @@ - {/if} + {#if getOptionSubtitle(option, idx)} + {getOptionSubtitle(option, idx)} + {/if} + {getOptionLabel(option, idx)} + {#if option.tag} + + + {option.tag} + + + {/if} .spectrum-Icon) { + margin-top: 2px; + } diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index 2fad886910..e79ead7e8c 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -21,7 +21,7 @@ export let sort = false export let align export let footer = null - + export let tag = null const dispatch = createEventDispatcher() let open = false @@ -83,6 +83,7 @@ {isOptionEnabled} {autocomplete} {sort} + {tag} isPlaceholder={value == null || value === ""} placeholderOption={placeholder === false ? null : placeholder} isOptionSelected={option => option === value} diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte index e87496652d..a9214320f9 100644 --- a/packages/bbui/src/Form/Select.svelte +++ b/packages/bbui/src/Form/Select.svelte @@ -25,7 +25,7 @@ export let customPopoverHeight export let align export let footer = null - + export let tag = null const dispatch = createEventDispatcher() const onChange = e => { value = e.detail @@ -61,6 +61,7 @@ {isOptionEnabled} {autocomplete} {customPopoverHeight} + {tag} on:change={onChange} on:click /> diff --git a/packages/bbui/src/Tooltip/TempTooltip.svelte b/packages/bbui/src/Tooltip/TempTooltip.svelte index 0d590b1ec6..6da01a2bfc 100644 --- a/packages/bbui/src/Tooltip/TempTooltip.svelte +++ b/packages/bbui/src/Tooltip/TempTooltip.svelte @@ -4,7 +4,7 @@ export let text = null export let condition = true - export let duration = 3000 + export let duration = 5000 export let position export let type diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js index 968d6deb4a..54dd38ac63 100644 --- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js +++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js @@ -3,6 +3,9 @@ import { Screen } from "./utils/Screen" import { Component } from "./utils/Component" export default function (datasources) { + if (!Array.isArray(datasources)) { + return [] + } return datasources.map(datasource => { return { name: `${datasource.name} - List`, diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridCreateViewButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridCreateViewButton.svelte index 3244ce3277..3441d8de17 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridCreateViewButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridCreateViewButton.svelte @@ -1,18 +1,30 @@ - - Add view - + + + Create view + + diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte index f698a8cb97..2f96a3d82a 100644 --- a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte @@ -46,13 +46,13 @@
- Users - { - store.update(state => { - state.builderSidePanel = false - return state - }) - }} - /> -
-
- - { - query = e.target.value.trim() - }} - on:focus={() => (searchFocus = true)} - on:blur={() => (searchFocus = false)} - /> - - - { - if (!filterByAppAccess) { - filterByAppAccess = true - } - if (!query) { - return - } - query = null - userOnboardResponse = null - filterByAppAccess = true + invitingFlow = false }} + class="header" > - - + {#if invitingFlow} + + {/if} + {invitingFlow ? "Invite new user" : "Users"} +
+
+ + { + store.update(state => { + state.builderSidePanel = false + return state + }) + }} + /> +
+ {#if !invitingFlow} +
+ + { + query = e.target.value.trim() + }} + on:focus={() => (searchFocus = true)} + on:blur={() => (searchFocus = false)} + /> + -
- {#if promptInvite && !userOnboardResponse} - -
- No user found -
- Add a valid email to invite a new user -
-
-
- {query || ""} - - Add user - -
- - {/if} + { + if (!query) { + return + } + query = null + userOnboardResponse = null + }} + > + + +
- {#if !promptInvite} - - {#if filteredInvites?.length} - -
-
Pending invites
-
Access
-
- {#each filteredInvites as invite} -
-
-
- {invite.email} -
-
-
- { - onUpdateUserInvite(invite, e.detail) - }} - on:remove={() => { - onUninviteAppUser(invite) - }} - autoWidth - align="right" - /> -
-
- {/each} - - {/if} - - {#if $licensing.groupsEnabled && filteredGroups?.length} - -
-
Groups
-
Access
-
- {#each filteredGroups as group} -
{ - if (selectedGroup != group._id) { - selectedGroup = group._id - } else { - selectedGroup = null - } - }} - on:keydown={() => {}} +
+ {#if promptInvite && !userOnboardResponse} + +
+ No user found +
+ Try searching a different email or invite a new user -
- -
- {group.name} -
-
- {`${group.users?.length} user${ - group.users?.length != 1 ? "s" : "" - }`} -
-
-
- { - onUpdateGroup(group, e.detail) - }} - on:remove={() => { - onUpdateGroup(group) - }} - autoWidth - align="right" - /> -
-
- {/each} - - {/if} - - {#if filteredUsers?.length} -
-
-
Users
-
Access
- {#each allUsers as user} -
-
-
- {user.email} -
-
- {userTitle(user)} -
-
-
- { - onUpdateUser(user, e.detail) - }} - on:remove={() => { - onUpdateUser(user) - }} - autoWidth - align="right" - allowedRoles={user.isAdminOrBuilder - ? [Constants.Roles.ADMIN] - : null} - /> -
-
- {/each}
- {/if} - - {/if} + + {/if} - {#if userOnboardResponse?.created} - -
- User added! -
- Email invites are not available without SMTP configuration. Here is - the password that has been generated for this user. + {#if !promptInvite} + + {#if filteredInvites?.length} + +
+
Pending invites
+
Access
+
+ {#each filteredInvites as invite} +
+
+
+ {invite.email} +
+
+
+ { + onUpdateUserInvite(invite, e.detail) + }} + on:remove={() => { + onUninviteAppUser(invite) + }} + autoWidth + align="right" + /> +
+
+ {/each} + + {/if} + + {#if $licensing.groupsEnabled && filteredGroups?.length} + +
+
Groups
+
Access
+
+ {#each filteredGroups as group} +
{ + if (selectedGroup != group._id) { + selectedGroup = group._id + } else { + selectedGroup = null + } + }} + on:keydown={() => {}} + > +
+ +
+ {group.name} +
+
+ {`${group.users?.length} user${ + group.users?.length != 1 ? "s" : "" + }`} +
+
+
+ { + if (e.detail === Constants.Roles.CREATOR) { + addGroupAppBuilder(group._id) + } else { + onUpdateGroup(group, e.detail) + } + }} + on:remove={() => { + onUpdateGroup(group) + }} + autoWidth + align="right" + /> +
+
+ {/each} + + {/if} + + {#if filteredUsers?.length} +
+
+
Users
+
Access
+
+ {#each allUsers as user} +
+
+
+ {user.email} +
+
+
+ {}} + on:change={e => { + if (e.detail === Constants.Roles.CREATOR) { + addAppBuilder(user._id) + } else { + onUpdateUser(user, e.detail) + } + }} + on:remove={() => { + onUpdateUser(user) + }} + autoWidth + align="right" + allowedRoles={user.isAdminOrGlobalBuilder + ? [Constants.Roles.ADMIN] + : null} + /> +
+
+ {/each} +
+ {/if} + + {/if} + + {#if userOnboardResponse?.created} + +
+ User added! +
+ Email invites are not available without SMTP configuration. Here + is the password that has been generated for this user. +
-
-
- +
+ +
+ + {/if} +
+ {:else} + +
+ +
+ + { + email = e.detail + }} + validate={() => { + if (!email) { + return "Please enter an email" + } + return null + }} + {error} + /> + option.value !== Constants.BudibaseRoles.Admin + )} + label="Role" + /> + {#if creationRoleType !== Constants.BudibaseRoles.Admin} + + {/if} + + {#if creationRoleType === Constants.BudibaseRoles.Admin} +
+ + Admins will get full access to all apps and settings +
+ {/if} + + +
- {/if} -
+
+ {/if} @@ -659,6 +828,27 @@ align-items: center; } + .add-user { + padding-top: var(--spacing-xl); + width: 100%; + display: grid; + } + + .admin-info { + margin-top: var(--spacing-xl); + padding: var(--spacing-l) var(--spacing-l) var(--spacing-l) var(--spacing-l); + display: flex; + align-items: center; + gap: var(--spacing-xl); + height: 30px; + background-color: var(--background-alt); + } + + .underlined { + text-decoration: underline; + cursor: pointer; + } + .search-input { flex: 1; } @@ -746,12 +936,6 @@ box-sizing: border-box; } - .invite-form { - display: flex; - align-items: center; - justify-content: space-between; - } - #builder-side-panel-container .search { padding-top: var(--spacing-m); padding-bottom: var(--spacing-m); @@ -798,6 +982,16 @@ flex-direction: column; } + .header { + display: flex; + align-items: center; + gap: var(--spacing-l); + } + + .user-invite-form { + padding: 0 var(--spacing-xl) var(--spacing-xl) var(--spacing-xl); + } + .body { display: flex; flex-direction: column; diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte index dd611041ed..9a96242b30 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte @@ -110,7 +110,7 @@ if (mode === "table") { datasourceModal.show() } else if (mode === "blank") { - let templates = getTemplates($store, $tables.list) + let templates = getTemplates($tables.list) const blankScreenTemplate = templates.find( t => t.id === "createFromScratch" ) diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index ca3617b589..7ccc98d78a 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -39,7 +39,7 @@ return publishedApps } return publishedApps.filter(app => { - if (sdk.users.isBuilder(user, app.appId)) { + if (sdk.users.isBuilder(user, app.prodId)) { return true } if (!Object.keys(user?.roles).length && user?.userGroups) { @@ -142,7 +142,12 @@
{#each userApps as app (app.appId)} - +
{app.name} diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 6a4364c414..793ba5c09f 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -21,6 +21,7 @@ import GroupIcon from "./_components/GroupIcon.svelte" import GroupUsers from "./_components/GroupUsers.svelte" import { sdk } from "@budibase/shared-core" + import { Constants } from "@budibase/frontend-core" export let groupId @@ -45,7 +46,7 @@ let loaded = false let editModal, deleteModal - + $: console.log(group) $: scimEnabled = $features.isScimEnabled $: readonly = !sdk.users.isAdmin($auth.user) || scimEnabled $: group = $groups.find(x => x._id === groupId) @@ -57,8 +58,11 @@ ) .map(app => ({ ...app, - role: group?.roles?.[apps.getProdAppID(app.devId)], + role: group?.builder?.apps.includes(apps.getProdAppID(app.devId)) + ? Constants.Roles.CREATOR + : group?.roles?.[apps.getProdAppID(app.devId)], })) + $: console.log(groupApps) $: { if (loaded && !group?._id) { $goto("./") diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupAppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupAppsTableRenderer.svelte index 51f4d7f77c..48b1bfbce6 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupAppsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupAppsTableRenderer.svelte @@ -1,9 +1,19 @@
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 904dd7d430..2a74cd9de5 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -89,7 +89,7 @@ $: scimEnabled = $features.isScimEnabled $: isSSO = !!user?.provider $: readonly = !sdk.users.isAdmin($auth.user) || scimEnabled - $: privileged = sdk.users.isAdminOrBuilder(user) + $: privileged = sdk.users.isAdminOrGlobalBuilder(user) $: nameLabel = getNameLabel(user) $: filteredGroups = getFilteredGroups($groups, searchTerm) $: availableApps = getAvailableApps($apps, privileged, user?.roles) @@ -98,17 +98,14 @@ return y._id === userId }) }) - $: globalRole = sdk.users.isAdmin(user) - ? "admin" - : sdk.users.isBuilder(user) - ? "developer" - : "appUser" + $: globalRole = sdk.users.isAdmin(user) ? "admin" : "appUser" const getAvailableApps = (appList, privileged, roles) => { let availableApps = appList.slice() if (!privileged) { availableApps = availableApps.filter(x => { - return Object.keys(roles || {}).find(y => { + let roleKeys = Object.keys(roles || {}) + return roleKeys.concat(user?.builder?.apps).find(y => { return x.appId === apps.extractAppId(y) }) }) @@ -119,7 +116,7 @@ name: app.name, devId: app.devId, icon: app.icon, - role: privileged ? Constants.Roles.ADMIN : roles[prodAppId], + role: getRole(prodAppId, roles), } }) } @@ -132,6 +129,18 @@ return groups.filter(group => group.name?.toLowerCase().includes(search)) } + const getRole = (prodAppId, roles) => { + if (privileged) { + return Constants.Roles.ADMIN + } + + if (user?.builder?.apps?.includes(prodAppId)) { + return Constants.Roles.CREATOR + } + + return roles[prodAppId] + } + const getNameLabel = user => { const { firstName, lastName, email } = user || {} if (!firstName && !lastName) { diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte index 5664a95045..e6821cba37 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte @@ -2,12 +2,16 @@ import { StatusLight } from "@budibase/bbui" import { RoleUtils } from "@budibase/frontend-core" import { roles } from "stores/backend" + import { Constants } from "@budibase/frontend-core" + import { capitalise } from "helpers" export let value const getRoleLabel = roleId => { const role = $roles.find(x => x._id === roleId) - return role?.name || "Custom role" + return roleId === Constants.Roles.CREATOR + ? capitalise(Constants.Roles.CREATOR.toLowerCase()) + : role?.name || "Custom role" } diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte index 55cad9b93b..b7bb810aba 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte @@ -5,9 +5,22 @@ export let value export let row - + $: console.log(row) $: priviliged = sdk.users.isAdminOrBuilder(row) - $: count = priviliged ? $apps.length : value?.length || 0 + $: count = getCount(row) + + const getCount = () => { + if (priviliged) { + return $apps.length + } else { + return sdk.users.hasAppBuilderPermissions(row) + ? row.builder.apps.length + + Object.keys(row.roles || {}).filter(appId => + row.builder.apps.includes(appId) + ).length + : value?.length || 0 + } + }
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte index fe7acee6c4..8217c85c5e 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte @@ -5,7 +5,7 @@ export let row const TooltipMap = { - appUser: "Only has access to published apps", + appUser: "Only has access to assigned apps", developer: "Access to the app builder", admin: "Full access", } diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js index c7a54c7e6d..a505029627 100644 --- a/packages/builder/src/stores/portal/groups.js +++ b/packages/builder/src/stores/portal/groups.js @@ -78,7 +78,19 @@ export function createGroupsStore() { }, getGroupAppIds: group => { - return Object.keys(group?.roles || {}) + let groupAppIds = Object.keys(group?.roles || {}) + if (group?.builder?.apps) { + groupAppIds = groupAppIds.concat(group.builder.apps) + } + return groupAppIds + }, + + addGroupAppBuilder: async (groupId, appId) => { + return await API.addGroupAppBuilder({ groupId, appId }) + }, + + removeGroupAppBuilder: async (groupId, appId) => { + return await API.removeGroupAppBuilder({ groupId, appId }) }, } diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index eb9c9abe93..795616add1 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -125,6 +125,10 @@ export const createLicensingStore = () => { const syncAutomationsEnabled = license.features.includes( Constants.Features.SYNC_AUTOMATIONS ) + const perAppBuildersEnabled = license.features.includes( + Constants.Features.APP_BUILDERS + ) + const isViewPermissionsEnabled = license.features.includes( Constants.Features.VIEW_PERMISSIONS ) @@ -144,6 +148,7 @@ export const createLicensingStore = () => { enforceableSSO, syncAutomationsEnabled, isViewPermissionsEnabled, + perAppBuildersEnabled, } }) }, diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index 992f6a5418..996a94013b 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -112,12 +112,16 @@ export function createUsersStore() { return await API.saveUser(user) } + async function addAppBuilder(userId, appId) { + return await API.addAppBuilder({ userId, appId }) + } + + async function removeAppBuilder(userId, appId) { + return await API.removeAppBuilder({ userId, appId }) + } + const getUserRole = user => - sdk.users.isAdmin(user) - ? "admin" - : sdk.users.isBuilder(user) - ? "developer" - : "appUser" + sdk.users.isAdminOrGlobalBuilder(user) ? "admin" : "appUser" const refreshUsage = fn => @@ -139,6 +143,8 @@ export function createUsersStore() { getInvites, updateInvite, getUserCountByApp, + addAppBuilder, + removeAppBuilder, // any operation that adds or deletes users acceptInvite, create: refreshUsage(create), diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.js index 72cbe30718..b1be230ac6 100644 --- a/packages/frontend-core/src/api/groups.js +++ b/packages/frontend-core/src/api/groups.js @@ -104,5 +104,27 @@ export const buildGroupsEndpoints = API => { removeAppsFromGroup: async (groupId, appArray) => { return updateGroupResource(groupId, "apps", "remove", appArray) }, + + /** + * Add app builder to group + * @param groupId The group to update + * @param appId The app id where the builder will be added + */ + addGroupAppBuilder: async ({ groupId, appId }) => { + return await API.post({ + url: `/api/global/groups/${groupId}/app/${appId}/builder`, + }) + }, + + /** + * Remove app builder from group + * @param groupId The group to update + * @param appId The app id where the builder will be removed + */ + removeGroupAppBuilder: async ({ groupId, appId }) => { + return await API.delete({ + url: `/api/global/groups/${groupId}/app/${appId}/builder`, + }) + }, } } diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js index d8723a649c..329e9cc499 100644 --- a/packages/frontend-core/src/api/user.js +++ b/packages/frontend-core/src/api/user.js @@ -156,13 +156,14 @@ export const buildUserEndpoints = API => ({ return await API.post({ url: "/api/global/users/onboard", body: payload.map(invite => { - const { email, admin, builder, apps } = invite + const { email, admin, builder, apps, appBuilders } = invite return { email, userInfo: { admin: admin ? { global: true } : undefined, builder: builder ? { global: true } : undefined, apps: apps ? apps : undefined, + appBuilders, }, } }), @@ -175,10 +176,12 @@ export const buildUserEndpoints = API => ({ * @param invite the invite code sent in the email */ updateUserInvite: async invite => { + console.log(invite) await API.post({ url: `/api/global/users/invite/update/${invite.code}`, body: { apps: invite.apps, + appBuilders: invite.appBuilders, }, }) }, @@ -250,4 +253,26 @@ export const buildUserEndpoints = API => ({ url: `/api/global/users/count/${appId}`, }) }, + + /** + * Adds a per app builder to the selected app + * @param appId the applications id + * @param userId The id of the user to add as a builder + */ + addAppBuilder: async ({ userId, appId }) => { + return await API.post({ + url: `/api/global/users/${userId}/app/${appId}/builder`, + }) + }, + + /** + * Removes a per app builder to the selected app + * @param appId the applications id + * @param userId The id of the user to remove as a builder + */ + removeAppBuilder: async ({ userId, appId }) => { + return await API.delete({ + url: `/api/global/users/${userId}/app/${appId}/builder`, + }) + }, }) diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 93a857ef9d..198d88196b 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -24,11 +24,23 @@ export const BudibaseRoles = { } export const BudibaseRoleOptions = [ - { label: "App User", value: BudibaseRoles.AppUser }, - { label: "Developer", value: BudibaseRoles.Developer }, + { label: "Member", value: BudibaseRoles.AppUser }, { label: "Admin", value: BudibaseRoles.Admin }, ] +export const BudibaseRoleOptionsNew = [ + { + label: "Admin", + value: "admin", + subtitle: "Has full access to all apps and settings in your account", + }, + { + label: "Member", + value: "appUser", + subtitle: "Can only view apps they have access to", + }, +] + export const BuilderRoleDescriptions = [ { value: BudibaseRoles.AppUser, @@ -70,6 +82,7 @@ export const Roles = { BASIC: "BASIC", PUBLIC: "PUBLIC", BUILDER: "BUILDER", + CREATOR: "CREATOR", } export const Themes = [ diff --git a/packages/frontend-core/src/utils/roles.js b/packages/frontend-core/src/utils/roles.js index dc9138455d..1ae9d3ac14 100644 --- a/packages/frontend-core/src/utils/roles.js +++ b/packages/frontend-core/src/utils/roles.js @@ -1,20 +1,22 @@ import { Roles } from "../constants" const RolePriorities = { - [Roles.ADMIN]: 4, + [Roles.ADMIN]: 5, + [Roles.CREATOR]: 4, [Roles.POWER]: 3, [Roles.BASIC]: 2, [Roles.PUBLIC]: 1, } const RoleColours = { [Roles.ADMIN]: "var(--spectrum-global-color-static-red-400)", + [Roles.CREATOR]: "var(--spectrum-global-color-static-magenta-600)", [Roles.POWER]: "var(--spectrum-global-color-static-orange-400)", [Roles.BASIC]: "var(--spectrum-global-color-static-green-400)", [Roles.PUBLIC]: "var(--spectrum-global-color-static-blue-400)", } -export const getRolePriority = roleId => { - return RolePriorities[roleId] ?? 0 +export const getRolePriority = role => { + return RolePriorities[role] ?? 0 } export const getRoleColour = roleId => { diff --git a/packages/shared-core/src/sdk/documents/users.ts b/packages/shared-core/src/sdk/documents/users.ts index 0f0983c6f7..1be8845656 100644 --- a/packages/shared-core/src/sdk/documents/users.ts +++ b/packages/shared-core/src/sdk/documents/users.ts @@ -35,6 +35,13 @@ export function isAdminOrBuilder( return isBuilder(user, appId) || isAdmin(user) } +export function isAdminOrGlobalBuilder( + user: User | ContextUser, + appId?: string +): boolean { + return isGlobalBuilder(user) || isAdmin(user) +} + // check if they are a builder within an app (not necessarily a global builder) export function hasAppBuilderPermissions(user?: User | ContextUser): boolean { if (!user) { diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index ad906c8688..0ccf9a356f 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -266,14 +266,17 @@ export const onboardUsers = async (ctx: Ctx) => { // Temp password to be passed to the user. createdPasswords[invite.email] = password - + let builder: { global: boolean; apps?: string[] } = { global: false } + if (invite.userInfo.appBuilders) { + builder.apps = invite.userInfo.appBuilders + } return { email: invite.email, password, forceResetPassword: true, roles: invite.userInfo.apps, admin: { global: false }, - builder: { global: false }, + builder, tenantId: tenancy.getTenantId(), } }) @@ -368,6 +371,15 @@ export const updateInvite = async (ctx: any) => { ...invite, } + if (!updateBody?.appBuilders || !updateBody.appBuilders?.length) { + updated.info.appBuilders = [] + } else { + updated.info.appBuilders = [ + ...(invite.info.appBuilders ?? []), + ...updateBody.appBuilders, + ] + } + if (!updateBody?.apps || !Object.keys(updateBody?.apps).length) { updated.info.apps = [] } else { @@ -392,7 +404,7 @@ export const inviteAccept = async ( // info is an extension of the user object that was stored by global const { email, info }: any = await checkInviteCode(inviteCode) const user = await tenancy.doInTenant(info.tenantId, async () => { - let request = { + let request: any = { firstName, lastName, password, @@ -400,9 +412,14 @@ export const inviteAccept = async ( roles: info.apps, tenantId: info.tenantId, } + let builder: { global: boolean; apps?: string[] } = { global: false } + if (info.appBuilders) { + builder.apps = info.appBuilders + request.builder = builder + delete info.appBuilders + } delete info.apps - request = { ...request, ...info,