@budibase/frontend-core 2.13.15 → 2.13.17

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.13.15",
+  "version": "2.13.17",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.13.15",
-    "@budibase/shared-core": "2.13.15",
+    "@budibase/bbui": "2.13.17",
+    "@budibase/shared-core": "2.13.17",
     "dayjs": "^1.10.8",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
     "svelte": "^3.46.2"
   },
-  "gitHead": "8ada75c2f51c6ddff52676944b0d6e9395ea1c0b"
+  "gitHead": "d700bb57d466691e2f0b4f8c6c1664a3c76efa81"
 }

package/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,
+          },
+        }
+      }),
     })
   },
 

package/src/components/grid/stores/datasource.js

@@ -55,11 +55,20 @@ export const deriveStores = context => {
 
       // Apply whitelist if specified
       if ($columnWhitelist?.length) {
-        Object.keys(enrichedSchema).forEach(key => {
-          if (!$columnWhitelist.includes(key)) {
-            delete enrichedSchema[key]
+        const sortedColumns = {}
+
+        $columnWhitelist.forEach((columnKey, idx) => {
+          const enrichedColumn = enrichedSchema[columnKey]
+          if (enrichedColumn) {
+            sortedColumns[columnKey] = {
+              ...enrichedColumn,
+              order: idx,
+              visible: true,
+            }
           }
         })
+
+        return sortedColumns
       }
 
       return enrichedSchema

package/src/constants.js

@@ -20,42 +20,31 @@ export const TableNames = {
 export const BudibaseRoles = {
   AppUser: "appUser",
   Developer: "developer",
+  Creator: "creator",
   Admin: "admin",
 }
 
 export const BudibaseRoleOptionsOld = [
-  { label: "Developer", value: BudibaseRoles.Developer },
-  { label: "Member", value: BudibaseRoles.AppUser },
-  { label: "Admin", value: BudibaseRoles.Admin },
+  {
+    label: "Developer",
+    value: BudibaseRoles.Developer,
+  },
 ]
 export const BudibaseRoleOptions = [
-  { label: "Member", value: BudibaseRoles.AppUser },
-  { label: "Admin", value: BudibaseRoles.Admin },
-]
-
-export const BudibaseRoleOptionsNew = [
   {
-    label: "Admin",
-    value: "admin",
+    label: "Account admin",
+    value: BudibaseRoles.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",
+    label: "Creator",
+    value: BudibaseRoles.Creator,
+    subtitle: "Can create and edit apps they have access to",
   },
-]
-
-export const BuilderRoleDescriptions = [
   {
+    label: "App user",
     value: BudibaseRoles.AppUser,
-    icon: "User",
-    label: "App user - Only has access to published apps",
-  },
-  {
-    value: BudibaseRoles.Admin,
-    icon: "Draw",
-    label: "Admin - Full access",
+    subtitle: "Can only use published apps they have access to",
   },
 ]