From 2cac5c9e8c2abf9a9dd62ad8415e17c3e494c31f Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 23 Nov 2023 14:31:27 +0000
Subject: [PATCH] Remove duplicated constants and add creator option to user
 import modal

---
 .../users/users/_components/ImportUsersModal.svelte | 13 +++++++------
 packages/frontend-core/src/constants.js             | 13 -------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
index 338cc1e7c1..24f0222d14 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
@@ -11,6 +11,7 @@
   import { emailValidator } from "helpers/validation"
   import { Constants } from "@budibase/frontend-core"
   import { capitalise } from "helpers"
+  import { BudibaseRoleOptions } from "@budibase/frontend-core/src/constants"
 
   const BYTES_IN_MB = 1000000
   const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
@@ -22,13 +23,16 @@
   let userEmails = []
   let userGroups = []
   let usersRole = null
-  $: invalidEmails = []
 
+  $: invalidEmails = []
   $: userCount = $licensing.userCount + userEmails.length
   $: exceed = licensing.usersLimitExceeded(userCount)
-
   $: importDisabled =
     !userEmails.length || !validEmails(userEmails) || !usersRole || exceed
+  $: roleOptions = Constants.BudibaseRoleOptions.map(option => ({
+    ...option,
+    label: `${option.label} - ${option.subtitle}`,
+  }))
 
   const validEmails = userEmails => {
     if ($admin.cloud && userEmails.length > MAX_USERS_UPLOAD_LIMIT) {
@@ -100,10 +104,7 @@
       users. Upgrade your plan to add more users
     </div>
   {/if}
-  <RadioGroup
-    bind:value={usersRole}
-    options={Constants.BuilderRoleDescriptions}
-  />
+  <RadioGroup bind:value={usersRole} options={roleOptions} />
 
   {#if $licensing.groupsEnabled}
     <Multiselect
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index b8e047910b..44199ae891 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -48,19 +48,6 @@ export const BudibaseRoleOptions = [
   },
 ]
 
-export const BuilderRoleDescriptions = [
-  {
-    value: BudibaseRoles.AppUser,
-    icon: "User",
-    label: "App user - Only has access to published apps",
-  },
-  {
-    value: BudibaseRoles.Admin,
-    icon: "Draw",
-    label: "Admin - Full access",
-  },
-]
-
 export const PlanType = {
   FREE: "free",
   TEAM: "team",