From 35a35f92e61d6293a4f9648803e020a163065322 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 23 Nov 2023 14:02:29 +0000 Subject: [PATCH] Update constants and user invitation API to account for new creator flag --- packages/frontend-core/src/api/user.js | 26 ++++++++++++++++--------- packages/frontend-core/src/constants.js | 6 ++++-- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js index 95c2167721..3a815b768e 100644 --- a/packages/frontend-core/src/api/user.js +++ b/packages/frontend-core/src/api/user.js @@ -214,15 +214,23 @@ export const buildUserEndpoints = API => ({ inviteUsers: async users => { return await API.post({ url: "/api/global/users/multi/invite", - body: users.map(user => ({ - email: user.email, - userInfo: { - admin: user.admin ? { global: true } : undefined, - builder: user.admin || user.builder ? { global: true } : undefined, - userGroups: user.groups, - roles: user.apps ? user.apps : undefined, - }, - })), + body: users.map(user => { + let builder = undefined + if (user.admin || user.builder) { + builder = { global: true } + } else if (user.creator) { + builder = { creator: true } + } + return { + email: user.email, + userInfo: { + admin: user.admin ? { global: true } : undefined, + builder, + userGroups: user.groups, + roles: user.apps ? user.apps : undefined, + }, + } + }), }) }, diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 344326065a..d8982276f2 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -20,6 +20,7 @@ export const TableNames = { export const BudibaseRoles = { AppUser: "appUser", Developer: "developer", + Creator: "creator", Admin: "admin", } @@ -29,8 +30,9 @@ export const BudibaseRoleOptionsOld = [ { label: "Admin", value: BudibaseRoles.Admin }, ] export const BudibaseRoleOptions = [ - { label: "Member", value: BudibaseRoles.AppUser }, - { label: "Admin", value: BudibaseRoles.Admin }, + { label: "App user", value: BudibaseRoles.AppUser }, + { label: "Creator", value: BudibaseRoles.Creator }, + { label: "Account admin", value: BudibaseRoles.Admin }, ] export const BudibaseRoleOptionsNew = [