Merge branch 'master' of github.com:Budibase/budibase into fix/relationship-picker-filtering

hosting/couchdb/Dockerfile

@@ -29,7 +29,6 @@ WORKDIR /opt/couchdb
 ADD couch/vm.args couch/local.ini ./etc/
 
 WORKDIR /
-ADD build-target-paths.sh .
 ADD runner.sh ./bbcouch-runner.sh
-RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau ./build-target-paths.sh
+RUN chmod +x ./bbcouch-runner.sh /opt/clouseau/bin/clouseau
 CMD ["./bbcouch-runner.sh"]

hosting/couchdb/build-target-paths.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo ${TARGETBUILD} > /buildtarget.txt
-if [[ "${TARGETBUILD}" = "aas" ]]; then
-    # Azure AppService uses /home for persistent data & SSH on port 2222
-    DATA_DIR="${DATA_DIR:-/home}"
-    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
-    mkdir -p $DATA_DIR/{search,minio,couch}
-    mkdir -p $DATA_DIR/couch/{dbs,views}
-    chown -R couchdb:couchdb $DATA_DIR/couch/
-    apt update
-    apt-get install -y openssh-server
-    echo "root:Docker!" | chpasswd
-    mkdir -p /tmp
-    chmod +x /tmp/ssh_setup.sh \
-        && (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
-    cp /etc/sshd_config /etc/ssh/sshd_config
-    /etc/init.d/ssh restart
-    sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
-else
-    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
-fi

hosting/couchdb/runner.sh

@@ -1,14 +1,52 @@
 #!/bin/bash
 
 DATA_DIR=${DATA_DIR:-/data}
+
 mkdir -p ${DATA_DIR}
 mkdir -p ${DATA_DIR}/couch/{dbs,views}
 mkdir -p ${DATA_DIR}/search
 chown -R couchdb:couchdb ${DATA_DIR}/couch
-/build-target-paths.sh
+
+echo ${TARGETBUILD} > /buildtarget.txt
+if [[ "${TARGETBUILD}" = "aas" ]]; then
+    # Azure AppService uses /home for persistent data & SSH on port 2222
+    DATA_DIR="${DATA_DIR:-/home}"
+    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
+    mkdir -p $DATA_DIR/{search,minio,couch}
+    mkdir -p $DATA_DIR/couch/{dbs,views}
+    chown -R couchdb:couchdb $DATA_DIR/couch/
+    apt update
+    apt-get install -y openssh-server
+    echo "root:Docker!" | chpasswd
+    mkdir -p /tmp
+    chmod +x /tmp/ssh_setup.sh \
+        && (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
+    cp /etc/sshd_config /etc/ssh/sshd_config
+    /etc/init.d/ssh restart
+    sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
+elif [[ "${TARGETBUILD}" = "single" ]]; then
+    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
+elif [[ -n $KUBERNETES_SERVICE_HOST ]]; then
+    # In Kubernetes the directory /opt/couchdb/data has a persistent volume
+    # mount for storing database data.
+    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/opt/couchdb/data#g" /opt/couchdb/etc/local.ini
+    sed -i "s/^-name .*$//g" /opt/couchdb/etc/vm.args
+else
+    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
+    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
+fi
+
 /opt/clouseau/bin/clouseau > /dev/stdout 2>&1 &
 /docker-entrypoint.sh /opt/couchdb/bin/couchdb &
-sleep 10
+
+while [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; do
+    echo 'Waiting for CouchDB to start...';
+    sleep 5;
+done
+
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_users
 curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@localhost:5984/_replicator
 sleep infinity

hosting/docker-compose.build.yaml

@@ -6,7 +6,7 @@ services:
   app-service:
     build:
       context: ..
-      dockerfile: packages/server/Dockerfile.v2
+      dockerfile: packages/server/Dockerfile
       args:
         - BUDIBASE_VERSION=0.0.0+dev-docker
     container_name: build-bbapps
@@ -36,7 +36,7 @@ services:
   worker-service:
     build:
       context: ..
-      dockerfile: packages/worker/Dockerfile.v2
+      dockerfile: packages/worker/Dockerfile
       args:
         - BUDIBASE_VERSION=0.0.0+dev-docker
     container_name: build-bbworker

hosting/single/Dockerfile

@@ -1,44 +1,59 @@
 FROM node:18-slim as build
 
 # install node-gyp dependencies
-RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends apt-utils cron g++ make python3
+RUN apt-get update && apt-get install -y --no-install-recommends g++ make python3 jq
 
-# add pin script
-WORKDIR /
-ADD scripts/cleanup.sh ./
-RUN chmod +x /cleanup.sh
 
-# build server
+# copy and install dependencies
 WORKDIR /app
-ADD packages/server .
+COPY package.json .
 COPY yarn.lock .
-RUN yarn install --production=true --network-timeout 1000000
+COPY lerna.json .
-RUN /cleanup.sh
+COPY .yarnrc .
 
-# build worker
+COPY packages/server/package.json packages/server/package.json
-WORKDIR /worker
+COPY packages/worker/package.json packages/worker/package.json
-ADD packages/worker .
+# string-templates does not get bundled during the esbuild process, so we want to use the local version
-COPY yarn.lock .
+COPY packages/string-templates/package.json packages/string-templates/package.json
-RUN yarn install --production=true --network-timeout 1000000
-RUN /cleanup.sh
 
-FROM budibase/couchdb
+
+COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
+RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
+RUN ./scripts/removeWorkspaceDependencies.sh packages/server/package.json
+RUN ./scripts/removeWorkspaceDependencies.sh packages/worker/package.json
+
+
+# We will never want to sync pro, but the script is still required
+RUN echo '' > scripts/syncProPackage.js
+RUN jq 'del(.scripts.postinstall)' package.json > temp.json && mv temp.json package.json
+RUN ./scripts/removeWorkspaceDependencies.sh package.json
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production
+
+# copy the actual code
+COPY packages/server/dist packages/server/dist
+COPY packages/server/pm2.config.js packages/server/pm2.config.js
+COPY packages/server/client packages/server/client
+COPY packages/server/builder packages/server/builder
+COPY packages/worker/dist packages/worker/dist
+COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
+COPY packages/string-templates packages/string-templates
+
+
+FROM budibase/couchdb as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
+ENV NODE_MAJOR 18
 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)
 # e.g. docker build --build-arg TARGETBUILD=aas ....
 ARG TARGETBUILD=single
 ENV TARGETBUILD $TARGETBUILD
 
-COPY --from=build /app /app
-COPY --from=build /worker /worker
-
 # install base dependencies
 RUN apt-get update && \
-  apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server
+  apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server libaio1
 
 # Install postgres client for pg_dump utils
-RUN apt install software-properties-common apt-transport-https gpg -y \
+RUN apt install -y software-properties-common apt-transport-https ca-certificates gnupg \
     && curl -fsSl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null \
     && echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
     && apt update -y \
@@ -47,14 +62,12 @@ RUN apt install software-properties-common apt-transport-https gpg -y \
 
 # install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx
 WORKDIR /nodejs
-RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh && \
+COPY scripts/install-node.sh ./install.sh
-  bash /tmp/nodesource_setup.sh && \
+RUN chmod +x install.sh && ./install.sh
-  apt-get install -y --no-install-recommends libaio1 nodejs && \
-  npm install --global yarn pm2
 
 # setup nginx
-ADD hosting/single/nginx/nginx.conf /etc/nginx
+COPY hosting/single/nginx/nginx.conf /etc/nginx
-ADD hosting/single/nginx/nginx-default-site.conf /etc/nginx/sites-enabled/default
+COPY hosting/single/nginx/nginx-default-site.conf /etc/nginx/sites-enabled/default
 RUN mkdir -p /var/log/nginx && \
   touch /var/log/nginx/error.log && \
   touch /var/run/nginx.pid && \
@@ -62,29 +75,39 @@ RUN mkdir -p /var/log/nginx && \
 
 WORKDIR /
 RUN mkdir -p scripts/integrations/oracle
-ADD packages/server/scripts/integrations/oracle scripts/integrations/oracle
+COPY packages/server/scripts/integrations/oracle scripts/integrations/oracle
 RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/install.sh
 
 # setup minio
 WORKDIR /minio
-ADD scripts/install-minio.sh ./install.sh
+COPY scripts/install-minio.sh ./install.sh
 RUN chmod +x install.sh && ./install.sh
 
 # setup runner file
 WORKDIR /
-ADD hosting/single/runner.sh .
+COPY hosting/single/runner.sh .
 RUN chmod +x ./runner.sh
-ADD hosting/single/healthcheck.sh .
+COPY hosting/single/healthcheck.sh .
 RUN chmod +x ./healthcheck.sh
 
 # Script below sets the path for storing data based on $DATA_DIR
 # For Azure App Service install SSH & point data locations to /home
-ADD hosting/single/ssh/sshd_config /etc/
+COPY hosting/single/ssh/sshd_config /etc/
-ADD hosting/single/ssh/ssh_setup.sh /tmp
+COPY hosting/single/ssh/ssh_setup.sh /tmp
-RUN /build-target-paths.sh
+
+#  setup letsencrypt certificate
+RUN apt-get install -y certbot python3-certbot-nginx
+COPY hosting/letsencrypt /app/letsencrypt
+RUN chmod +x /app/letsencrypt/certificate-request.sh /app/letsencrypt/certificate-renew.sh
+
+COPY --from=build /app/node_modules /node_modules
+COPY --from=build /app/package.json /package.json
+COPY --from=build /app/packages/server /app
+COPY --from=build /app/packages/worker /worker
+COPY --from=build /app/packages/string-templates /string-templates
+
+RUN cd /string-templates && yarn link && cd ../app && yarn link @budibase/string-templates && cd ../worker && yarn link @budibase/string-templates
 
-# cleanup cache
-RUN yarn cache clean -f
 
 EXPOSE 80
 EXPOSE 443
@@ -92,20 +115,10 @@ EXPOSE 443
 EXPOSE 2222
 VOLUME /data
 
-#  setup letsencrypt certificate
+ARG BUDIBASE_VERSION
-RUN apt-get install -y certbot python3-certbot-nginx
+# Ensuring the version argument is sent
-ADD hosting/letsencrypt /app/letsencrypt
+RUN test -n "$BUDIBASE_VERSION"
-RUN chmod +x /app/letsencrypt/certificate-request.sh /app/letsencrypt/certificate-renew.sh
+ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
-# Remove cached files
-RUN rm -rf \
-  /root/.cache \
-  /root/.npm \
-  /root/.pip \
-  /usr/local/share/doc \
-  /usr/share/doc \
-  /usr/share/man \
-  /var/lib/apt/lists/* \
-  /tmp/*
 
 HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
 

hosting/single/Dockerfile.v2

@@ -1,131 +0,0 @@
-FROM node:18-slim as build
-
-# install node-gyp dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends g++ make python3 jq
-
-
-# copy and install dependencies
-WORKDIR /app
-COPY package.json .
-COPY yarn.lock .
-COPY lerna.json .
-COPY .yarnrc .
-
-COPY packages/server/package.json packages/server/package.json
-COPY packages/worker/package.json packages/worker/package.json
-# string-templates does not get bundled during the esbuild process, so we want to use the local version
-COPY packages/string-templates/package.json packages/string-templates/package.json
-
-
-COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-RUN ./scripts/removeWorkspaceDependencies.sh packages/server/package.json
-RUN ./scripts/removeWorkspaceDependencies.sh packages/worker/package.json
-
-
-# We will never want to sync pro, but the script is still required
-RUN echo '' > scripts/syncProPackage.js
-RUN jq 'del(.scripts.postinstall)' package.json > temp.json && mv temp.json package.json
-RUN ./scripts/removeWorkspaceDependencies.sh package.json
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production
-
-# copy the actual code
-COPY packages/server/dist packages/server/dist
-COPY packages/server/pm2.config.js packages/server/pm2.config.js
-COPY packages/server/client packages/server/client
-COPY packages/server/builder packages/server/builder
-COPY packages/worker/dist packages/worker/dist
-COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
-COPY packages/string-templates packages/string-templates
-
-
-FROM budibase/couchdb as runner
-ARG TARGETARCH
-ENV TARGETARCH $TARGETARCH
-ENV NODE_MAJOR 18
-#TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)
-# e.g. docker build --build-arg TARGETBUILD=aas ....
-ARG TARGETBUILD=single
-ENV TARGETBUILD $TARGETBUILD
-
-# install base dependencies
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends software-properties-common nginx uuid-runtime redis-server libaio1
-
-# Install postgres client for pg_dump utils
-RUN apt install -y software-properties-common apt-transport-https ca-certificates gnupg \
-    && curl -fsSl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null \
-    && echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
-    && apt update -y \
-    && apt install postgresql-client-15 -y \
-    && apt remove software-properties-common apt-transport-https gpg -y
-
-# install other dependencies, nodejs, oracle requirements, jdk8, redis, nginx
-WORKDIR /nodejs
-COPY scripts/install-node.sh ./install.sh
-RUN chmod +x install.sh && ./install.sh
-
-# setup nginx
-COPY hosting/single/nginx/nginx.conf /etc/nginx
-COPY hosting/single/nginx/nginx-default-site.conf /etc/nginx/sites-enabled/default
-RUN mkdir -p /var/log/nginx && \
-  touch /var/log/nginx/error.log && \
-  touch /var/run/nginx.pid && \
-  usermod -a -G tty www-data
-
-WORKDIR /
-RUN mkdir -p scripts/integrations/oracle
-COPY packages/server/scripts/integrations/oracle scripts/integrations/oracle
-RUN /bin/bash -e ./scripts/integrations/oracle/instantclient/linux/install.sh
-
-# setup minio
-WORKDIR /minio
-COPY scripts/install-minio.sh ./install.sh
-RUN chmod +x install.sh && ./install.sh
-
-# setup runner file
-WORKDIR /
-COPY hosting/single/runner.sh .
-RUN chmod +x ./runner.sh
-COPY hosting/single/healthcheck.sh .
-RUN chmod +x ./healthcheck.sh
-
-# Script below sets the path for storing data based on $DATA_DIR
-# For Azure App Service install SSH & point data locations to /home
-COPY hosting/single/ssh/sshd_config /etc/
-COPY hosting/single/ssh/ssh_setup.sh /tmp
-RUN /build-target-paths.sh
-
-
-#  setup letsencrypt certificate
-RUN apt-get install -y certbot python3-certbot-nginx
-COPY hosting/letsencrypt /app/letsencrypt
-RUN chmod +x /app/letsencrypt/certificate-request.sh /app/letsencrypt/certificate-renew.sh
-
-COPY --from=build /app/node_modules /node_modules
-COPY --from=build /app/package.json /package.json
-COPY --from=build /app/packages/server /app
-COPY --from=build /app/packages/worker /worker
-COPY --from=build /app/packages/string-templates /string-templates
-
-RUN cd /string-templates && yarn link && cd ../app && yarn link @budibase/string-templates && cd ../worker && yarn link @budibase/string-templates
-
-
-EXPOSE 80
-EXPOSE 443
-# Expose port 2222 for SSH on Azure App Service build
-EXPOSE 2222
-VOLUME /data
-
-ARG BUDIBASE_VERSION
-# Ensuring the version argument is sent
-RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
-
-HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh"
-
-# must set this just before running
-ENV NODE_ENV=production
-WORKDIR /
-
-CMD ["./runner.sh"]

hosting/single/runner.sh

@@ -22,11 +22,11 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 
 # Azure App Service customisations
 if [[ "${TARGETBUILD}" = "aas" ]]; then
-    DATA_DIR="${DATA_DIR:-/home}"
+    export DATA_DIR="${DATA_DIR:-/home}"
     WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
     /etc/init.d/ssh start
 else
-    DATA_DIR=${DATA_DIR:-/data}
+    export DATA_DIR=${DATA_DIR:-/data}
 fi
 mkdir -p ${DATA_DIR}
 # Mount NFS or GCP Filestore if env vars exist for it

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.13.15",
+  "version": "2.13.18",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/src/objectStore/objectStore.ts

@@ -260,12 +260,12 @@ export async function listAllObjects(bucketName: string, path: string) {
 }
 
 /**
- * Generate a presigned url with a default TTL of 1 hour
+ * Generate a presigned url with a default TTL of 36 hours
  */
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 3600
+  durationSeconds: number = 129600
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {

packages/backend-core/src/security/permissions.ts

@@ -160,4 +160,5 @@ export function isPermissionLevelHigherThanRead(level: PermissionLevel) {
 
 // utility as a lot of things need simply the builder permission
 export const BUILDER = PermissionType.BUILDER
+export const CREATOR = PermissionType.CREATOR
 export const GLOBAL_BUILDER = PermissionType.GLOBAL_BUILDER

packages/backend-core/src/users/db.ts

@@ -146,12 +146,12 @@ export class UserDB {
 
   static async allUsers() {
     const db = getGlobalDB()
-    const response = await db.allDocs(
+    const response = await db.allDocs<User>(
       dbUtils.getGlobalUserParams(null, {
         include_docs: true,
       })
     )
-    return response.rows.map((row: any) => row.doc)
+    return response.rows.map(row => row.doc!)
   }
 
   static async countUsersByApp(appId: string) {
@@ -209,13 +209,6 @@ export class UserDB {
       throw new Error("_id or email is required")
     }
 
-    if (
-      user.builder?.apps?.length &&
-      !(await UserDB.features.isAppBuildersEnabled())
-    ) {
-      throw new Error("Unable to update app builders, please check license")
-    }
-
     let dbUser: User | undefined
     if (_id) {
       // try to get existing user from db

packages/backend-core/src/users/users.ts

@@ -25,6 +25,7 @@ import {
 import { getGlobalDB } from "../context"
 import * as context from "../context"
 import { isCreator } from "./utils"
+import { UserDB } from "./db"
 
 type GetOpts = { cleanup?: boolean }
 
@@ -336,3 +337,20 @@ export function cleanseUserObject(user: User | ContextUser, base?: User) {
   }
   return user
 }
+
+export async function addAppBuilder(user: User, appId: string) {
+  const prodAppId = getProdAppID(appId)
+  user.builder ??= {}
+  user.builder.creator = true
+  user.builder.apps ??= []
+  user.builder.apps.push(prodAppId)
+  await UserDB.save(user, { hashPassword: false })
+}
+
+export async function removeAppBuilder(user: User, appId: string) {
+  const prodAppId = getProdAppID(appId)
+  if (user.builder && user.builder.apps?.includes(prodAppId)) {
+    user.builder.apps = user.builder.apps.filter(id => id !== prodAppId)
+  }
+  await UserDB.save(user, { hashPassword: false })
+}

packages/bbui/src/ButtonGroup/ButtonGroup.svelte

@@ -2,7 +2,7 @@
   import "@spectrum-css/buttongroup/dist/index-vars.css"
 
   export let vertical = false
-  export let gap = ""
+  export let gap = "M"
 
   $: gapStyle =
     gap === "L"

packages/bbui/src/FancyForm/FancySelect.svelte

@@ -12,11 +12,13 @@
   export let error = null
   export let validate = null
   export let options = []
+  export let footer = null
   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
@@ -100,6 +102,7 @@
     {error}
     {disabled}
     {options}
+    {footer}
     {getOptionLabel}
     {getOptionValue}
     {getOptionSubtitle}

packages/bbui/src/Form/Core/InputDropdown.svelte

@@ -17,7 +17,7 @@
   export let options = []
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
-
+  export let getOptionSubtitle = option => option?.subtitle
   export let isOptionSelected = () => false
 
   const dispatch = createEventDispatcher()
@@ -135,7 +135,7 @@
       class="spectrum-Textfield-input spectrum-InputGroup-input"
     />
   </div>
-  <div style="width: 30%">
+  <div style="width: 40%">
     <button
       {id}
       class="spectrum-Picker spectrum-Picker--sizeM override-borders"
@@ -157,38 +157,43 @@
         <use xlink:href="#spectrum-css-icon-Chevron100" />
       </svg>
     </button>
-    {#if open}
-      <div
-        use:clickOutside={handleOutsideClick}
-        transition:fly|local={{ y: -20, duration: 200 }}
-        class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open"
-      >
-        <ul class="spectrum-Menu" role="listbox">
-          {#each options as option, idx}
-            <li
-              class="spectrum-Menu-item"
-              class:is-selected={isOptionSelected(getOptionValue(option, idx))}
-              role="option"
-              aria-selected="true"
-              tabindex="0"
-              on:click={() => onPick(getOptionValue(option, idx))}
-            >
-              <span class="spectrum-Menu-itemLabel">
-                {getOptionLabel(option, idx)}
-              </span>
-              <svg
-                class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
-                focusable="false"
-                aria-hidden="true"
-              >
-                <use xlink:href="#spectrum-css-icon-Checkmark100" />
-              </svg>
-            </li>
-          {/each}
-        </ul>
-      </div>
-    {/if}
   </div>
+  {#if open}
+    <div
+      use:clickOutside={handleOutsideClick}
+      transition:fly|local={{ y: -20, duration: 200 }}
+      class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open"
+    >
+      <ul class="spectrum-Menu" role="listbox">
+        {#each options as option, idx}
+          <li
+            class="spectrum-Menu-item"
+            class:is-selected={isOptionSelected(getOptionValue(option, idx))}
+            role="option"
+            aria-selected="true"
+            tabindex="0"
+            on:click={() => onPick(getOptionValue(option, idx))}
+          >
+            <span class="spectrum-Menu-itemLabel">
+              {getOptionLabel(option, idx)}
+              {#if getOptionSubtitle(option, idx)}
+                <span class="subtitle-text">
+                  {getOptionSubtitle(option, idx)}
+                </span>
+              {/if}
+            </span>
+            <svg
+              class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
+              focusable="false"
+              aria-hidden="true"
+            >
+              <use xlink:href="#spectrum-css-icon-Checkmark100" />
+            </svg>
+          </li>
+        {/each}
+      </ul>
+    </div>
+  {/if}
 </div>
 
 <style>
@@ -196,7 +201,6 @@
     min-width: 0;
     width: 100%;
   }
-
   .spectrum-InputGroup-input {
     border-right-width: 1px;
   }
@@ -206,7 +210,6 @@
   .spectrum-Textfield-input {
     width: 0;
   }
-
   .override-borders {
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
@@ -215,5 +218,18 @@
     max-height: 240px;
     z-index: 999;
     top: 100%;
+    width: 100%;
+  }
+  .subtitle-text {
+    font-size: 12px;
+    line-height: 15px;
+    font-weight: 500;
+    color: var(--spectrum-global-color-gray-600);
+    display: block;
+    margin-top: var(--spacing-s);
+  }
+  .spectrum-Menu-checkmark {
+    align-self: center;
+    margin-top: 0;
   }
 </style>

packages/bbui/src/Form/Core/Picker.svelte

@@ -224,13 +224,12 @@
               </span>
             {/if}
             <span class="spectrum-Menu-itemLabel">
-              {#if getOptionSubtitle(option, idx)}
-                <span class="subtitle-text"
-                  >{getOptionSubtitle(option, idx)}</span
-                >
-              {/if}
-
               {getOptionLabel(option, idx)}
+              {#if getOptionSubtitle(option, idx)}
+                <span class="subtitle-text">
+                  {getOptionSubtitle(option, idx)}
+                </span>
+              {/if}
             </span>
             {#if option.tag}
               <span class="option-tag">
@@ -275,10 +274,9 @@
     font-size: 12px;
     line-height: 15px;
     font-weight: 500;
-    top: 10px;
     color: var(--spectrum-global-color-gray-600);
     display: block;
-    margin-bottom: var(--spacing-s);
+    margin-top: var(--spacing-s);
   }
 
   .spectrum-Picker-label.auto-width {

packages/bbui/src/Form/Core/Select.svelte

@@ -10,8 +10,9 @@
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
   export let getOptionIcon = () => null
-  export let useOptionIconImage = false
   export let getOptionColour = () => null
+  export let getOptionSubtitle = () => null
+  export let useOptionIconImage = false
   export let isOptionEnabled
   export let readonly = false
   export let quiet = false
@@ -82,8 +83,9 @@
   {getOptionLabel}
   {getOptionValue}
   {getOptionIcon}
-  {useOptionIconImage}
   {getOptionColour}
+  {getOptionSubtitle}
+  {useOptionIconImage}
   {isOptionEnabled}
   {autocomplete}
   {sort}

packages/bbui/src/Form/InputDropdown.svelte

@@ -43,6 +43,7 @@
     {quiet}
     {autofocus}
     {options}
+    isOptionSelected={option => option === dropdownValue}
     on:change={onChange}
     on:pick={onPick}
     on:click

packages/bbui/src/Form/Select.svelte

@@ -13,9 +13,10 @@
   export let options = []
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
+  export let getOptionSubtitle = option => option?.subtitle
   export let getOptionIcon = option => option?.icon
-  export let useOptionIconImage = false
   export let getOptionColour = option => option?.colour
+  export let useOptionIconImage = false
   export let isOptionEnabled
   export let quiet = false
   export let autoWidth = false
@@ -58,6 +59,7 @@
     {getOptionValue}
     {getOptionIcon}
     {getOptionColour}
+    {getOptionSubtitle}
     {useOptionIconImage}
     {isOptionEnabled}
     {autocomplete}

packages/builder/src/components/common/RoleSelect.svelte

@@ -20,73 +20,91 @@
   export let allowedRoles = null
   export let allowCreator = false
   export let fancySelect = false
+  export let labelPrefix = null
 
   const dispatch = createEventDispatcher()
   const RemoveID = "remove"
 
+  $: enrichLabel = label => (labelPrefix ? `${labelPrefix} ${label}` : label)
   $: options = getOptions(
     $roles,
     allowPublic,
     allowRemove,
     allowedRoles,
-    allowCreator
+    allowCreator,
+    enrichLabel
   )
+
   const getOptions = (
     roles,
     allowPublic,
     allowRemove,
     allowedRoles,
-    allowCreator
+    allowCreator,
+    enrichLabel
   ) => {
+    // Use roles whitelist if specified
     if (allowedRoles?.length) {
-      const filteredRoles = roles.filter(role =>
+      let options = roles
-        allowedRoles.includes(role._id)
+        .filter(role => allowedRoles.includes(role._id))
-      )
+        .map(role => ({
-      return [
+          name: enrichLabel(role.name),
-        ...filteredRoles,
+          _id: role._id,
-        ...(allowedRoles.includes(Constants.Roles.CREATOR)
+        }))
-          ? [{ _id: Constants.Roles.CREATOR, name: "Creator", enabled: false }]
+      if (allowedRoles.includes(Constants.Roles.CREATOR)) {
-          : []),
+        options.push({
-      ]
-    }
-    let newRoles = [...roles]
-
-    if (allowCreator) {
-      newRoles = [
-        {
           _id: Constants.Roles.CREATOR,
-          name: "Creator",
+          name: "Can edit",
-          tag:
+          enabled: false,
-            !$licensing.perAppBuildersEnabled &&
+        })
-            capitalise(Constants.PlanType.BUSINESS),
+      }
-        },
+      return options
-        ...newRoles,
-      ]
     }
+
+    // Allow all core roles
+    let options = roles.map(role => ({
+      name: enrichLabel(role.name),
+      _id: role._id,
+    }))
+
+    // Add creator if required
+    if (allowCreator) {
+      options.unshift({
+        _id: Constants.Roles.CREATOR,
+        name: "Can edit",
+        tag:
+          !$licensing.perAppBuildersEnabled &&
+          capitalise(Constants.PlanType.BUSINESS),
+      })
+    }
+
+    // Add remove option if required
     if (allowRemove) {
-      newRoles = [
+      options.push({
-        ...newRoles,
+        _id: RemoveID,
-        {
+        name: "Remove",
-          _id: RemoveID,
+      })
-          name: "Remove",
-        },
-      ]
     }
-    if (allowPublic) {
+
-      return newRoles
+    // Remove public if not allowed
+    if (!allowPublic) {
+      options = options.filter(role => role._id !== Constants.Roles.PUBLIC)
     }
-    return newRoles.filter(role => role._id !== Constants.Roles.PUBLIC)
+
+    return options
   }
 
   const getColor = role => {
-    if (allowRemove && role._id === RemoveID) {
+    // Creator and remove options have no colors
+    if (role._id === Constants.Roles.CREATOR || role._id === RemoveID) {
       return null
     }
     return RoleUtils.getRoleColour(role._id)
   }
 
   const getIcon = role => {
-    if (allowRemove && role._id === RemoveID) {
+    // Only remove option has an icon
+    if (role._id === RemoveID) {
       return "Close"
     }
     return null

packages/builder/src/components/design/settings/componentSettings.js

@@ -20,7 +20,7 @@ import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelt
 import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte"
 import BasicColumnEditor from "./controls/ColumnEditor/BasicColumnEditor.svelte"
-import GridColumnEditor from "./controls/ColumnEditor/GridColumnEditor.svelte"
+import GridColumnEditor from "./controls/GridColumnConfiguration/GridColumnConfiguration.svelte"
 import BarButtonList from "./controls/BarButtonList.svelte"
 import FieldConfiguration from "./controls/FieldConfiguration/FieldConfiguration.svelte"
 import ButtonConfiguration from "./controls/ButtonConfiguration/ButtonConfiguration.svelte"
@@ -28,6 +28,7 @@ import RelationshipFilterEditor from "./controls/RelationshipFilterEditor.svelte
 
 const componentMap = {
   text: DrawerBindableInput,
+  plainText: Input,
   select: Select,
   radio: RadioGroup,
   dataSource: DataSourceSelect,

packages/builder/src/components/design/settings/controls/ColumnEditor/GridColumnEditor.svelte

@@ -1,10 +0,0 @@
-<script>
-  import ColumnEditor from "./ColumnEditor.svelte"
-</script>
-
-<ColumnEditor
-  {...$$props}
-  on:change
-  allowCellEditing={false}
-  allowReorder={false}
-/>

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte

@@ -0,0 +1,91 @@
+<script>
+  import EditComponentPopover from "../EditComponentPopover.svelte"
+  import { FieldTypeToComponentMap } from "../FieldConfiguration/utils"
+  import { Toggle, Icon } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+  import { cloneDeep } from "lodash/fp"
+  import { store } from "builderStore"
+
+  export let item
+  export let anchor
+
+  const dispatch = createEventDispatcher()
+  const onToggle = item => {
+    return e => {
+      item.active = e.detail
+      dispatch("change", { ...cloneDeep(item), active: e.detail })
+    }
+  }
+
+  const parseSettings = settings => {
+    return settings
+      .filter(setting => setting.key !== "field")
+      .map(setting => {
+        return { ...setting, nested: true }
+      })
+  }
+
+  const getIcon = () => {
+    const component = `@budibase/standard-components/${
+      FieldTypeToComponentMap[item.columnType]
+    }`
+    return store.actions.components.getDefinition(component).icon
+  }
+</script>
+
+<div class="list-item-body">
+  <div class="list-item-left">
+    <EditComponentPopover
+      {anchor}
+      componentInstance={item}
+      {parseSettings}
+      on:change
+    >
+      <div slot="header" class="type-icon">
+        <Icon name={getIcon()} />
+        <span>{item.field}</span>
+      </div>
+    </EditComponentPopover>
+    <div class="field-label">{item.label || item.field}</div>
+  </div>
+  <div class="list-item-right">
+    <Toggle on:change={onToggle(item)} text="" value={item.active} thin />
+  </div>
+</div>
+
+<style>
+  .field-label {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  .list-item-body,
+  .list-item-left {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-m);
+    min-width: 0;
+  }
+  .list-item-right :global(div.spectrum-Switch) {
+    margin: 0px;
+  }
+  .list-item-body {
+    justify-content: space-between;
+  }
+  .type-icon {
+    display: flex;
+    gap: var(--spacing-m);
+    margin: var(--spacing-xl);
+    margin-bottom: 0px;
+    height: var(--spectrum-alias-item-height-m);
+    padding: 0px var(--spectrum-alias-item-padding-m);
+    border-width: var(--spectrum-actionbutton-border-size);
+    border-radius: var(--spectrum-alias-border-radius-regular);
+    border: 1px solid
+      var(
+        --spectrum-actionbutton-m-border-color,
+        var(--spectrum-alias-border-color)
+      );
+    align-items: center;
+  }
+</style>

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte

@@ -0,0 +1,107 @@
+<script>
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "builderStore/dataBinding"
+  import { currentAsset, store } from "builderStore"
+  import DraggableList from "../DraggableList/DraggableList.svelte"
+  import { createEventDispatcher } from "svelte"
+  import FieldSetting from "./FieldSetting.svelte"
+  import PrimaryColumnFieldSetting from "./PrimaryColumnFieldSetting.svelte"
+  import getColumns from "./getColumns.js"
+
+  export let value
+  export let componentInstance
+
+  const dispatch = createEventDispatcher()
+  let primaryDisplayColumnAnchor
+
+  const handleChange = newValues => {
+    dispatch("change", newValues)
+  }
+
+  const getSchema = (asset, datasource) => {
+    const schema = getSchemaForDatasource(asset, datasource).schema
+
+    // Don't show ID and rev in tables
+    if (schema) {
+      delete schema._id
+      delete schema._rev
+    }
+
+    return schema
+  }
+
+  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: primaryDisplayColumnName = getSchemaForDatasource(
+    $currentAsset,
+    datasource
+  )?.table?.primaryDisplay
+  $: schema = getSchema(currentAsset, datasource)
+  $: columns = getColumns({
+    columns: value,
+    schema,
+    primaryDisplayColumnName,
+    onChange: handleChange,
+    createComponent: store.actions.components.createInstance,
+  })
+</script>
+
+{#if columns.primary}
+  <div class="sticky-item">
+    <div bind:this={primaryDisplayColumnAnchor} class="sticky-item-inner">
+      <div class="right-content">
+        <PrimaryColumnFieldSetting
+          anchor={primaryDisplayColumnAnchor}
+          item={columns.primary}
+          on:change={e => columns.update(e.detail)}
+        />
+      </div>
+    </div>
+  </div>
+{/if}
+<DraggableList
+  on:change={e => columns.updateSortable(e.detail)}
+  on:itemChange={e => columns.update(e.detail)}
+  items={columns.sortable}
+  listItemKey={"_id"}
+  listType={FieldSetting}
+/>
+
+<style>
+  .right-content {
+    flex: 1;
+    min-width: 0;
+    margin-left: 17.5px;
+  }
+  .sticky-item {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    border-radius: 4px;
+    background-color: var(
+      --spectrum-table-background-color,
+      var(--spectrum-global-color-gray-50)
+    );
+    border: 1px solid
+      var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid));
+    margin-bottom: 10px;
+  }
+  .sticky-item-inner {
+    background-color: var(
+      --spectrum-table-background-color,
+      var(--spectrum-global-color-gray-50)
+    );
+    transition: background-color ease-in-out 130ms;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid
+      var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid));
+    padding-left: var(--spacing-s);
+    padding-right: var(--spacing-s);
+    box-sizing: border-box;
+    border-radius: 4px;
+    border-bottom: 0;
+  }
+</style>

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte

@@ -0,0 +1,100 @@
+<script>
+  import EditComponentPopover from "../EditComponentPopover.svelte"
+  import { Icon } from "@budibase/bbui"
+  import { setContext } from "svelte"
+  import { writable } from "svelte/store"
+  import { FieldTypeToComponentMap } from "../FieldConfiguration/utils"
+  import { store } from "builderStore"
+
+  export let item
+  export let anchor
+
+  let draggableStore = writable({
+    selected: null,
+    actions: {
+      select: id => {
+        draggableStore.update(state => ({
+          ...state,
+          selected: id,
+        }))
+      },
+    },
+  })
+
+  setContext("draggable", draggableStore)
+
+  const parseSettings = settings => {
+    return settings
+      .filter(setting => setting.key !== "field")
+      .map(setting => {
+        return { ...setting, nested: true }
+      })
+  }
+
+  const getIcon = item => {
+    const component = `@budibase/standard-components/${
+      FieldTypeToComponentMap[item.columnType]
+    }`
+    return store.actions.components.getDefinition(component)?.icon
+  }
+
+  $: icon = getIcon(item)
+</script>
+
+<div class="list-item-body">
+  <div class="list-item-left">
+    <EditComponentPopover
+      {anchor}
+      componentInstance={item}
+      {parseSettings}
+      on:change
+    >
+      <div slot="header" class="type-icon">
+        <Icon name={icon} />
+        <span>{item.field}</span>
+      </div>
+    </EditComponentPopover>
+    <div class="field-label">{item.label || item.field}</div>
+  </div>
+  <div title="The display column is always shown first" class="list-item-right">
+    <Icon name={"Info"} />
+  </div>
+</div>
+
+<style>
+  .field-label {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  .list-item-body,
+  .list-item-left {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-m);
+    min-width: 0;
+  }
+  .list-item-right :global(svg) {
+    color: var(--grey-5);
+    padding: 7px 5px 7px 0;
+  }
+  .list-item-body {
+    justify-content: space-between;
+  }
+  .type-icon {
+    display: flex;
+    gap: var(--spacing-m);
+    margin: var(--spacing-xl);
+    margin-bottom: 0px;
+    height: var(--spectrum-alias-item-height-m);
+    padding: 0px var(--spectrum-alias-item-padding-m);
+    border-width: var(--spectrum-actionbutton-border-size);
+    border-radius: var(--spectrum-alias-border-radius-regular);
+    border: 1px solid
+      var(
+        --spectrum-actionbutton-m-border-color,
+        var(--spectrum-alias-border-color)
+      );
+    align-items: center;
+  }
+</style>

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.js

@@ -0,0 +1,129 @@
+const modernize = columns => {
+  if (!columns) {
+    return []
+  }
+  // If the first element has no active key then it's safe to assume all elements are in the old format
+  if (columns?.[0] && columns[0].active === undefined) {
+    return columns.map(column => ({
+      label: column.displayName,
+      field: column.name,
+      active: true,
+    }))
+  }
+
+  return columns
+}
+
+const removeInvalidAddMissing = (
+  columns = [],
+  defaultColumns,
+  primaryDisplayColumnName
+) => {
+  const defaultColumnNames = defaultColumns.map(column => column.field)
+  const columnNames = columns.map(column => column.field)
+
+  const validColumns = columns.filter(column =>
+    defaultColumnNames.includes(column.field)
+  )
+  let missingColumns = defaultColumns.filter(
+    defaultColumn => !columnNames.includes(defaultColumn.field)
+  )
+
+  // If the user already has fields selected, any appended missing fields should be disabled by default
+  if (validColumns.length) {
+    missingColumns = missingColumns.map(field => ({ ...field, active: false }))
+  }
+
+  const combinedColumns = [...validColumns, ...missingColumns]
+
+  // Ensure the primary display column is always visible
+  const primaryDisplayIndex = combinedColumns.findIndex(
+    column => column.field === primaryDisplayColumnName
+  )
+  if (primaryDisplayIndex > -1) {
+    combinedColumns[primaryDisplayIndex].active = true
+  }
+
+  return combinedColumns
+}
+
+const getDefault = (schema = {}) => {
+  const defaultValues = Object.values(schema)
+    .filter(column => !column.nestedJSON)
+    .map(column => ({
+      label: column.name,
+      field: column.name,
+      active: column.visible ?? true,
+      order: column.visible ? column.order ?? -1 : Number.MAX_SAFE_INTEGER,
+    }))
+
+  defaultValues.sort((a, b) => a.order - b.order)
+
+  return defaultValues
+}
+
+const toGridFormat = draggableListColumns => {
+  return draggableListColumns.map(entry => ({
+    label: entry.label,
+    field: entry.field,
+    active: entry.active,
+  }))
+}
+
+const toDraggableListFormat = (gridFormatColumns, createComponent, schema) => {
+  return gridFormatColumns.map(column => {
+    return createComponent(
+      "@budibase/standard-components/labelfield",
+      {
+        _instanceName: column.field,
+        active: column.active,
+        field: column.field,
+        label: column.label,
+        columnType: schema[column.field].type,
+      },
+      {}
+    )
+  })
+}
+
+const getColumns = ({
+  columns,
+  schema,
+  primaryDisplayColumnName,
+  onChange,
+  createComponent,
+}) => {
+  const validatedColumns = removeInvalidAddMissing(
+    modernize(columns),
+    getDefault(schema),
+    primaryDisplayColumnName
+  )
+  const draggableList = toDraggableListFormat(
+    validatedColumns,
+    createComponent,
+    schema
+  )
+  const primary = draggableList.find(
+    entry => entry.field === primaryDisplayColumnName
+  )
+  const sortable = draggableList.filter(
+    entry => entry.field !== primaryDisplayColumnName
+  )
+
+  return {
+    primary,
+    sortable,
+    updateSortable: newDraggableList => {
+      onChange(toGridFormat(newDraggableList.concat(primary)))
+    },
+    update: newEntry => {
+      const newDraggableList = draggableList.map(entry => {
+        return newEntry.field === entry.field ? newEntry : entry
+      })
+
+      onChange(toGridFormat(newDraggableList))
+    },
+  }
+}
+
+export default getColumns

packages/builder/src/components/design/settings/controls/GridColumnConfiguration/getColumns.test.js

@@ -0,0 +1,374 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import getColumns from "./getColumns"
+
+describe("getColumns", () => {
+  beforeEach(ctx => {
+    ctx.schema = {
+      one: { name: "one", visible: false, order: 0, type: "foo" },
+      two: { name: "two", visible: true, order: 1, type: "foo" },
+      three: { name: "three", visible: true, order: 2, type: "foo" },
+      four: { name: "four", visible: false, order: 3, type: "foo" },
+      five: {
+        name: "excluded",
+        visible: true,
+        order: 4,
+        type: "foo",
+        nestedJSON: true,
+      },
+    }
+
+    ctx.primaryDisplayColumnName = "four"
+    ctx.onChange = vi.fn()
+    ctx.createComponent = (componentName, props) => {
+      return { componentName, ...props }
+    }
+  })
+
+  describe("nested json fields", () => {
+    beforeEach(ctx => {
+      ctx.columns = getColumns({
+        columns: null,
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+    })
+
+    it("does not return nested json fields, as the grid cannot display them", ctx => {
+      expect(ctx.columns.sortable).not.toContainEqual({
+        name: "excluded",
+        visible: true,
+        order: 4,
+        type: "foo",
+        nestedJSON: true,
+      })
+    })
+  })
+
+  describe("using the old grid column format", () => {
+    beforeEach(ctx => {
+      const oldGridFormatColumns = [
+        { displayName: "three label", name: "three" },
+        { displayName: "two label", name: "two" },
+      ]
+
+      ctx.columns = getColumns({
+        columns: oldGridFormatColumns,
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+    })
+
+    it("returns the selected and unselected fields in the modern format, respecting the original order", ctx => {
+      expect(ctx.columns.sortable).toEqual([
+        {
+          _instanceName: "three",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "three",
+          label: "three label",
+        },
+        {
+          _instanceName: "two",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "two",
+          label: "two label",
+        },
+        {
+          _instanceName: "one",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "one",
+          label: "one",
+        },
+      ])
+
+      expect(ctx.columns.primary).toEqual({
+        _instanceName: "four",
+        active: true,
+        columnType: "foo",
+        componentName: "@budibase/standard-components/labelfield",
+        field: "four",
+        label: "four",
+      })
+    })
+  })
+
+  describe("default columns", () => {
+    beforeEach(ctx => {
+      ctx.columns = getColumns({
+        columns: undefined,
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+    })
+
+    it("returns all columns, with non-hidden columns automatically selected", ctx => {
+      expect(ctx.columns.sortable).toEqual([
+        {
+          _instanceName: "two",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "two",
+          label: "two",
+        },
+        {
+          _instanceName: "three",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "three",
+          label: "three",
+        },
+        {
+          _instanceName: "one",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "one",
+          label: "one",
+        },
+      ])
+
+      expect(ctx.columns.primary).toEqual({
+        _instanceName: "four",
+        active: true,
+        columnType: "foo",
+        componentName: "@budibase/standard-components/labelfield",
+        field: "four",
+        label: "four",
+      })
+    })
+
+    it("Unselected columns should be placed at the end", ctx => {
+      expect(ctx.columns.sortable[2].field).toEqual("one")
+    })
+  })
+
+  describe("missing columns", () => {
+    beforeEach(ctx => {
+      const gridFormatColumns = [
+        { label: "three label", field: "three", active: true },
+      ]
+
+      ctx.columns = getColumns({
+        columns: gridFormatColumns,
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+    })
+
+    it("returns all columns, including those missing from the initial data", ctx => {
+      expect(ctx.columns.sortable).toEqual([
+        {
+          _instanceName: "three",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "three",
+          label: "three label",
+        },
+        {
+          _instanceName: "two",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "two",
+          label: "two",
+        },
+        {
+          _instanceName: "one",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "one",
+          label: "one",
+        },
+      ])
+
+      expect(ctx.columns.primary).toEqual({
+        _instanceName: "four",
+        active: true,
+        columnType: "foo",
+        componentName: "@budibase/standard-components/labelfield",
+        field: "four",
+        label: "four",
+      })
+    })
+  })
+
+  describe("invalid columns", () => {
+    beforeEach(ctx => {
+      const gridFormatColumns = [
+        { label: "three label", field: "three", active: true },
+        { label: "some nonsense", field: "some nonsense", active: true },
+      ]
+
+      ctx.columns = getColumns({
+        columns: gridFormatColumns,
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+    })
+
+    it("returns all valid columns, excluding those that aren't valid for the schema", ctx => {
+      expect(ctx.columns.sortable).toEqual([
+        {
+          _instanceName: "three",
+          active: true,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "three",
+          label: "three label",
+        },
+        {
+          _instanceName: "two",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "two",
+          label: "two",
+        },
+        {
+          _instanceName: "one",
+          active: false,
+          columnType: "foo",
+          componentName: "@budibase/standard-components/labelfield",
+          field: "one",
+          label: "one",
+        },
+      ])
+
+      expect(ctx.columns.primary).toEqual({
+        _instanceName: "four",
+        active: true,
+        columnType: "foo",
+        componentName: "@budibase/standard-components/labelfield",
+        field: "four",
+        label: "four",
+      })
+    })
+  })
+
+  describe("methods", () => {
+    beforeEach(ctx => {
+      const { update, updateSortable } = getColumns({
+        columns: [],
+        schema: ctx.schema,
+        primaryDisplayColumnName: ctx.primaryDisplayColumnName,
+        onChange: ctx.onChange,
+        createComponent: ctx.createComponent,
+      })
+
+      ctx.update = update
+      ctx.updateSortable = updateSortable
+    })
+
+    describe("update", () => {
+      beforeEach(ctx => {
+        ctx.update({
+          field: "one",
+          label: "a new label",
+          active: true,
+        })
+      })
+
+      it("calls the callback with the updated columns", ctx => {
+        expect(ctx.onChange).toHaveBeenCalledTimes(1)
+        expect(ctx.onChange).toHaveBeenCalledWith([
+          {
+            field: "two",
+            label: "two",
+            active: true,
+          },
+          {
+            field: "three",
+            label: "three",
+            active: true,
+          },
+          {
+            field: "one",
+            label: "a new label",
+            active: true,
+          },
+          {
+            field: "four",
+            label: "four",
+            active: true,
+          },
+        ])
+      })
+    })
+
+    describe("updateSortable", () => {
+      beforeEach(ctx => {
+        ctx.updateSortable([
+          {
+            _instanceName: "three",
+            active: true,
+            columnType: "foo",
+            componentName: "@budibase/standard-components/labelfield",
+            field: "three",
+            label: "three",
+          },
+          {
+            _instanceName: "one",
+            active: true,
+            columnType: "foo",
+            componentName: "@budibase/standard-components/labelfield",
+            field: "one",
+            label: "one",
+          },
+          {
+            _instanceName: "two",
+            active: false,
+            columnType: "foo",
+            componentName: "@budibase/standard-components/labelfield",
+            field: "two",
+            label: "two",
+          },
+        ])
+      })
+
+      it("calls the callback with the updated columns", ctx => {
+        expect(ctx.onChange).toHaveBeenCalledTimes(1)
+        expect(ctx.onChange).toHaveBeenCalledWith([
+          {
+            field: "three",
+            label: "three",
+            active: true,
+          },
+          {
+            field: "one",
+            label: "one",
+            active: true,
+          },
+          {
+            field: "two",
+            label: "two",
+            active: false,
+          },
+          {
+            field: "four",
+            label: "four",
+            active: true,
+          },
+        ])
+      })
+    })
+  })
+})

packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte

@@ -364,7 +364,10 @@
     const payload = [
       {
         email: newUserEmail,
-        builder: { global: creationRoleType === Constants.BudibaseRoles.Admin },
+        builder: {
+          global: creationRoleType === Constants.BudibaseRoles.Admin,
+          creator: creationRoleType === Constants.BudibaseRoles.Creator,
+        },
         admin: { global: creationRoleType === Constants.BudibaseRoles.Admin },
       },
     ]
@@ -471,10 +474,6 @@
     await users.removeAppBuilder(userId, prodAppId)
   }
 
-  const addGroupAppBuilder = async groupId => {
-    await groups.actions.addGroupAppBuilder(groupId, prodAppId)
-  }
-
   const removeGroupAppBuilder = async groupId => {
     await groups.actions.removeGroupAppBuilder(groupId, prodAppId)
   }
@@ -495,14 +494,12 @@
   }
 
   const getInviteRoleValue = invite => {
-    if (invite.info?.admin?.global && invite.info?.builder?.global) {
+    if (
-      return Constants.Roles.ADMIN
+      (invite.info?.admin?.global && invite.info?.builder?.global) ||
-    }
+      invite.info?.builder?.apps?.includes(prodAppId)
-
+    ) {
-    if (invite.info?.builder?.apps?.includes(prodAppId)) {
       return Constants.Roles.CREATOR
     }
-
     return invite.info.apps?.[prodAppId]
   }
 
@@ -512,7 +509,7 @@
       return `This user has been given ${role?.name} access from the ${user.group} group`
     }
     if (user.isAdminOrGlobalBuilder) {
-      return "This user's role grants admin access to all apps"
+      return "Account admins can edit all apps"
     }
     return null
   }
@@ -523,6 +520,18 @@
     }
     return user.role
   }
+
+  const checkAppAccess = e => {
+    // Ensure we don't get into an invalid combo of tenant role and app access
+    if (
+      e.detail === Constants.BudibaseRoles.AppUser &&
+      creationAccessType === Constants.Roles.CREATOR
+    ) {
+      creationAccessType = Constants.Roles.BASIC
+    } else if (e.detail === Constants.BudibaseRoles.Admin) {
+      creationAccessType = Constants.Roles.CREATOR
+    }
+  }
 </script>
 
 <svelte:window on:keydown={handleKeyDown} />
@@ -650,8 +659,9 @@
                       autoWidth
                       align="right"
                       allowedRoles={user.isAdminOrGlobalBuilder
-                        ? [Constants.Roles.ADMIN]
+                        ? [Constants.Roles.CREATOR]
                         : null}
+                      labelPrefix="Can use as"
                     />
                   </div>
                 </div>
@@ -695,19 +705,16 @@
                       allowRemove={group.role}
                       allowPublic={false}
                       quiet={true}
-                      allowCreator={true}
+                      allowCreator={group.role === Constants.Roles.CREATOR}
                       on:change={e => {
-                        if (e.detail === Constants.Roles.CREATOR) {
+                        onUpdateGroup(group, e.detail)
-                          addGroupAppBuilder(group._id)
-                        } else {
-                          onUpdateGroup(group, e.detail)
-                        }
                       }}
                       on:remove={() => {
                         onUpdateGroup(group)
                       }}
                       autoWidth
                       align="right"
+                      labelPrefix="Can use as"
                     />
                   </div>
                 </div>
@@ -753,6 +760,7 @@
                       allowedRoles={user.isAdminOrGlobalBuilder
                         ? [Constants.Roles.CREATOR]
                         : null}
+                      labelPrefix="Can use as"
                     />
                   </div>
                 </div>
@@ -781,7 +789,7 @@
       {/if}
     </div>
   {:else}
-    <Divider />
+    <Divider noMargin />
     <div class="body">
       <Layout gap="L" noPadding>
         <div class="user-invite-form">
@@ -804,31 +812,34 @@
             <FancySelect
               bind:value={creationRoleType}
               options={sdk.users.isAdmin($auth.user)
-                ? Constants.BudibaseRoleOptionsNew
+                ? Constants.BudibaseRoleOptions
-                : Constants.BudibaseRoleOptionsNew.filter(
+                : Constants.BudibaseRoleOptions.filter(
                     option => option.value !== Constants.BudibaseRoles.Admin
                   )}
               label="Role"
+              on:change={checkAppAccess}
             />
-            {#if creationRoleType !== Constants.BudibaseRoles.Admin}
+            <span class="role-wrap">
               <RoleSelect
                 placeholder={false}
                 bind:value={creationAccessType}
                 allowPublic={false}
-                allowCreator={true}
+                allowCreator={creationRoleType !==
+                  Constants.BudibaseRoles.AppUser}
                 quiet={true}
                 autoWidth
                 align="right"
                 fancySelect
+                allowedRoles={creationRoleType === Constants.BudibaseRoles.Admin
+                  ? [Constants.Roles.CREATOR]
+                  : null}
+                footer={getRoleFooter({
+                  isAdminOrGlobalBuilder:
+                    creationRoleType === Constants.BudibaseRoles.Admin,
+                })}
               />
-            {/if}
+            </span>
           </FancyForm>
-          {#if creationRoleType === Constants.BudibaseRoles.Admin}
-            <div class="admin-info">
-              <Icon name="Info" />
-              Admins will get full access to all apps and settings
-            </div>
-          {/if}
           <span class="add-user">
             <Button
               newStyles
@@ -847,6 +858,13 @@
 </div>
 
 <style>
+  .role-wrap :global(.fancy-field:not(:last-of-type)) {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+
   .search :global(input) {
     padding-left: 0px;
   }
@@ -862,16 +880,6 @@
     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;
@@ -889,7 +897,6 @@
     display: flex;
     flex-direction: column;
     gap: var(--spacing-s);
-    width: 400px;
   }
 
   .auth-entity-meta {
@@ -918,7 +925,7 @@
   .auth-entity,
   .auth-entity-header {
     display: grid;
-    grid-template-columns: 1fr 110px;
+    grid-template-columns: 1fr 180px;
     align-items: center;
     gap: var(--spacing-xl);
   }
@@ -949,7 +956,7 @@
     overflow-y: auto;
     overflow-x: hidden;
     position: absolute;
-    width: 400px;
+    width: 440px;
     right: 0;
     height: 100%;
     box-shadow: 0 0 40px 10px rgba(0, 0, 0, 0.1);

packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte

@@ -4,8 +4,6 @@
   import { url, isActive } from "@roxi/routify"
   import DeleteModal from "components/deploy/DeleteModal.svelte"
   import { isOnlyUser } from "builderStore"
-  import { auth } from "stores/portal"
-  import { sdk } from "@budibase/shared-core"
 
   let deleteModal
 </script>
@@ -46,24 +44,22 @@
             url={$url("./version")}
             active={$isActive("./version")}
           />
-          {#if sdk.users.isGlobalBuilder($auth.user)}
+          <div class="delete-action">
-            <div class="delete-action">
+            <AbsTooltip
-              <AbsTooltip
+              position={TooltipPosition.Bottom}
-                position={TooltipPosition.Bottom}
+              text={$isOnlyUser
-                text={$isOnlyUser
+                ? null
-                  ? null
+                : "Unavailable - another user is editing this app"}
-                  : "Unavailable - another user is editing this app"}
+            >
-              >
+              <SideNavItem
-                <SideNavItem
+                text="Delete app"
-                  text="Delete app"
+                disabled={!$isOnlyUser}
-                  disabled={!$isOnlyUser}
+                on:click={() => {
-                  on:click={() => {
+                  deleteModal.show()
-                    deleteModal.show()
+                }}
-                  }}
+              />
-                />
+            </AbsTooltip>
-              </AbsTooltip>
+          </div>
-            </div>
-          {/if}
         </SideNav>
         <slot />
       </Content>

packages/builder/src/pages/builder/portal/_layout.svelte

@@ -16,7 +16,7 @@
   let activeTab = "Apps"
 
   $: $url(), updateActiveTab($menu)
-  $: isOnboarding = !$apps.length && sdk.users.isGlobalBuilder($auth.user)
+  $: isOnboarding = !$apps.length && sdk.users.hasBuilderPermissions($auth.user)
 
   const updateActiveTab = menu => {
     for (let entry of menu) {

packages/builder/src/pages/builder/portal/apps/_layout.svelte

@@ -14,7 +14,7 @@
   import PortalSideBar from "./_components/PortalSideBar.svelte"
 
   // Don't block loading if we've already hydrated state
-  let loaded = $apps.length != null
+  let loaded = !!$apps?.length
 
   onMount(async () => {
     try {
@@ -34,7 +34,7 @@
       }
 
       // Go to new app page if no apps exists
-      if (!$apps.length && sdk.users.isGlobalBuilder($auth.user)) {
+      if (!$apps.length && sdk.users.hasBuilderPermissions($auth.user)) {
         $redirect("./onboarding")
       }
     } catch (error) {

packages/builder/src/pages/builder/portal/apps/index.svelte

@@ -1,5 +1,6 @@
 <script>
   import {
+    banner,
     Heading,
     Layout,
     Button,
@@ -10,6 +11,7 @@
     Notification,
     Body,
     Search,
+    BANNER_TYPES,
   } from "@budibase/bbui"
   import Spinner from "components/common/Spinner.svelte"
   import CreateAppModal from "components/start/CreateAppModal.svelte"
@@ -198,6 +200,20 @@
       if (usersLimitLockAction) {
         usersLimitLockAction()
       }
+      if (!$admin.isDev) {
+        await banner.show({
+          messages: [
+            {
+              message:
+                "We've updated our pricing - read the blog post to learn more.",
+              type: BANNER_TYPES.NEUTRAL,
+              extraButtonText: "Learn More",
+              extraButtonAction: () =>
+                window.open("https://budibase.com/pricing"),
+            },
+          ],
+        })
+      }
     } catch (error) {
       notifications.error("Error getting init info")
     }
@@ -237,7 +253,7 @@
     {#if enrichedApps.length}
       <Layout noPadding gap="L">
         <div class="title">
-          {#if $auth.user && sdk.users.isGlobalBuilder($auth.user)}
+          {#if $auth.user && sdk.users.canCreateApps($auth.user)}
             <div class="buttons">
               <Button
                 size="M"

packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte

@@ -52,7 +52,7 @@
       goToApp()
     } catch (e) {
       loading = false
-      notifications.error("There was a problem creating your app")
+      notifications.error(e.message || "There was a problem creating your app")
     }
   }
 </script>

packages/builder/src/pages/builder/portal/users/users/[userId].svelte

@@ -55,6 +55,7 @@
     },
     role: {
       width: "1fr",
+      displayName: "Access",
     },
   }
   const customGroupTableRenderers = [
@@ -98,7 +99,7 @@
       return y._id === userId
     })
   })
-  $: globalRole = sdk.users.isAdmin(user) ? "admin" : "appUser"
+  $: globalRole = users.getUserRole(user)
 
   const getAvailableApps = (appList, privileged, roles) => {
     let availableApps = appList.slice()
@@ -177,12 +178,21 @@
   }
 
   async function updateUserRole({ detail }) {
-    if (detail === "developer") {
+    if (detail === Constants.BudibaseRoles.Developer) {
       toggleFlags({ admin: { global: false }, builder: { global: true } })
-    } else if (detail === "admin") {
+    } else if (detail === Constants.BudibaseRoles.Admin) {
       toggleFlags({ admin: { global: true }, builder: { global: true } })
-    } else if (detail === "appUser") {
+    } else if (detail === Constants.BudibaseRoles.AppUser) {
       toggleFlags({ admin: { global: false }, builder: { global: false } })
+    } else if (detail === Constants.BudibaseRoles.Creator) {
+      toggleFlags({
+        admin: { global: false },
+        builder: {
+          global: false,
+          creator: true,
+          apps: user?.builder?.apps || [],
+        },
+      })
     }
   }
 
@@ -295,6 +305,7 @@
           <div class="field">
             <Label size="L">Role</Label>
             <Select
+              placeholder={null}
               disabled={!sdk.users.isAdmin($auth.user)}
               value={globalRole}
               options={Constants.BudibaseRoleOptions}

packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte

@@ -29,7 +29,6 @@
     },
   ]
   $: hasError = userData.find(x => x.error != null)
-
   $: userCount = $licensing.userCount + userData.length
   $: reached = licensing.usersLimitReached(userCount)
   $: exceeded = licensing.usersLimitExceeded(userCount)
@@ -98,7 +97,7 @@
         align-items: center;
         flex-direction: row;"
       >
-        <div style="width: 90%">
+        <div style="flex: 1 1 auto;">
           <InputDropdown
             inputType="email"
             bind:inputValue={input.email}

packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte

@@ -14,6 +14,10 @@
   }
 </script>
 
-<StatusLight square color={RoleUtils.getRoleColour(value)}>
+{#if value === Constants.Roles.CREATOR}
-  {getRoleLabel(value)}
+  Can edit
-</StatusLight>
+{:else}
+  <StatusLight square color={RoleUtils.getRoleColour(value)}>
+    Can use as {getRoleLabel(value)}
+  </StatusLight>
+{/if}

packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte

@@ -15,6 +15,7 @@
   const BYTES_IN_MB = 1000000
   const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
   const MAX_USERS_UPLOAD_LIMIT = 1000
+
   export let createUsersFromCsv
 
   let files = []
@@ -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
+  <RadioGroup bind:value={usersRole} options={roleOptions} />
-    bind:value={usersRole}
-    options={Constants.BuilderRoleDescriptions}
-  />
 
   {#if $licensing.groupsEnabled}
     <Multiselect

packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte

@@ -4,17 +4,11 @@
 
   export let row
 
-  const TooltipMap = {
+  $: role = Constants.BudibaseRoleOptions.find(
-    appUser: "Only has access to assigned apps",
-    developer: "Access to the app builder",
-    admin: "Full access",
-  }
-
-  $: role = Constants.BudibaseRoleOptionsOld.find(
     x => x.value === users.getUserRole(row)
   )
   $: value = role?.label || "Not available"
-  $: tooltip = TooltipMap[role?.value] || ""
+  $: tooltip = role.subtitle || ""
 </script>
 
 <div on:click|stopPropagation title={tooltip}>

packages/builder/src/pages/builder/portal/users/users/index.svelte

@@ -82,6 +82,7 @@
       minWidth: "200px",
     },
     role: {
+      displayName: "Access",
       sortable: false,
       width: "1fr",
     },
@@ -171,6 +172,7 @@
     const payload = userData?.users?.map(user => ({
       email: user.email,
       builder: user.role === Constants.BudibaseRoles.Developer,
+      creator: user.role === Constants.BudibaseRoles.Creator,
       admin: user.role === Constants.BudibaseRoles.Admin,
       groups: userData.groups,
     }))
@@ -189,18 +191,18 @@
 
     for (const user of userData?.users ?? []) {
       const { email } = user
-
       if (
         newUsers.find(x => x.email === email) ||
         currentUserEmails.includes(email)
-      )
+      ) {
         continue
-
+      }
       newUsers.push(user)
     }
 
-    if (!newUsers.length)
+    if (!newUsers.length) {
       notifications.info("Duplicated! There is no new users to add.")
+    }
     return { ...userData, users: newUsers }
   }
 
@@ -265,7 +267,6 @@
     try {
       await groups.actions.init()
       groupsLoaded = true
-
       pendingInvites = await users.getInvites()
       invitesLoaded = true
     } catch (error) {

packages/builder/src/stores/portal/users.js

@@ -3,6 +3,7 @@ import { API } from "api"
 import { update } from "lodash"
 import { licensing } from "."
 import { sdk } from "@budibase/shared-core"
+import { Constants } from "@budibase/frontend-core"
 
 export function createUsersStore() {
   const { subscribe, set } = writable({})
@@ -77,6 +78,9 @@ export function createUsersStore() {
         case "developer":
           body.builder = { global: true }
           break
+        case "creator":
+          body.builder = { creator: true, global: false }
+          break
         case "admin":
           body.admin = { global: true }
           body.builder = { global: true }
@@ -120,12 +124,18 @@ export function createUsersStore() {
     return await API.removeAppBuilder({ userId, appId })
   }
 
-  const getUserRole = user =>
+  const getUserRole = user => {
-    sdk.users.isAdmin(user)
+    if (sdk.users.isAdmin(user)) {
-      ? "admin"
+      return Constants.BudibaseRoles.Admin
-      : sdk.users.isBuilder(user)
+    } else if (sdk.users.isBuilder(user)) {
-      ? "developer"
+      return Constants.BudibaseRoles.Developer
-      : "appUser"
+    } else if (sdk.users.hasCreatorPermissions(user)) {
+      return Constants.BudibaseRoles.Creator
+    } else {
+      return Constants.BudibaseRoles.AppUser
+    }
+  }
+
   const refreshUsage =
     fn =>
     async (...args) => {

packages/client/manifest.json

@@ -2698,6 +2698,22 @@
       }
     ]
   },
+  "labelfield": {
+    "name": "Text Field",
+    "icon": "Text",
+    "editable": true,
+    "size": {
+      "width": 400,
+      "height": 32
+    },
+    "settings": [
+      {
+        "type": "plainText",
+        "label": "Label",
+        "key": "label"
+      }
+    ]
+  },
   "stringfield": {
     "name": "Text Field",
     "icon": "Text",
@@ -6308,19 +6324,6 @@
         "key": "table",
         "required": true
       },
-      {
-        "type": "columns/grid",
-        "label": "Columns",
-        "key": "columns",
-        "dependsOn": [
-          "table",
-          {
-            "setting": "table.type",
-            "value": "custom",
-            "invert": true
-          }
-        ]
-      },
       {
         "type": "filter",
         "label": "Filtering",
@@ -6417,6 +6420,18 @@
         "key": "stripeRows",
         "defaultValue": false
       },
+      {
+        "section": true,
+        "name": "Columns",
+        "settings": [
+          {
+            "type": "columns/grid",
+            "key": "columns",
+            "nested": true,
+            "resetOn": "table"
+          }
+        ]
+      },
       {
         "section": true,
         "name": "Buttons",

packages/client/src/components/app/GridBlock.svelte

@@ -19,6 +19,22 @@
   export let onRowClick = null
   export let buttons = null
 
+  // parses columns to fix older formats
+  const getParsedColumns = columns => {
+    // If the first element has an active key all elements should be in the new format
+    if (columns?.length && columns[0]?.active !== undefined) {
+      return columns
+    }
+
+    return columns?.map(column => ({
+      label: column.displayName || column.name,
+      field: column.name,
+      active: true,
+    }))
+  }
+
+  $: parsedColumns = getParsedColumns(columns)
+
   const context = getContext("context")
   const component = getContext("component")
   const {
@@ -33,16 +49,17 @@
 
   let grid
 
-  $: columnWhitelist = columns?.map(col => col.name)
+  $: columnWhitelist = parsedColumns
-  $: schemaOverrides = getSchemaOverrides(columns)
+    ?.filter(col => col.active)
+    ?.map(col => col.field)
+  $: schemaOverrides = getSchemaOverrides(parsedColumns)
   $: enrichedButtons = enrichButtons(buttons)
 
   const getSchemaOverrides = columns => {
     let overrides = {}
     columns?.forEach(column => {
-      overrides[column.name] = {
+      overrides[column.field] = {
-        displayName: column.displayName || column.name,
+        displayName: column.label,
-        visible: true,
       }
     })
     return overrides

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 => ({
+      body: users.map(user => {
-        email: user.email,
+        let builder = undefined
-        userInfo: {
+        if (user.admin || user.builder) {
-          admin: user.admin ? { global: true } : undefined,
+          builder = { global: true }
-          builder: user.admin || user.builder ? { global: true } : undefined,
+        } else if (user.creator) {
-          userGroups: user.groups,
+          builder = { creator: true }
-          roles: user.apps ? user.apps : undefined,
+        }
-        },
+        return {
-      })),
+          email: user.email,
+          userInfo: {
+            admin: user.admin ? { global: true } : undefined,
+            builder,
+            userGroups: user.groups,
+            roles: user.apps ? user.apps : undefined,
+          },
+        }
+      }),
     })
   },
 

packages/frontend-core/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 => {
+        const sortedColumns = {}
-          if (!$columnWhitelist.includes(key)) {
+
-            delete enrichedSchema[key]
+        $columnWhitelist.forEach((columnKey, idx) => {
+          const enrichedColumn = enrichedSchema[columnKey]
+          if (enrichedColumn) {
+            sortedColumns[columnKey] = {
+              ...enrichedColumn,
+              order: idx,
+              visible: true,
+            }
           }
         })
+
+        return sortedColumns
       }
 
       return enrichedSchema

packages/frontend-core/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: "Developer",
-  { label: "Admin", value: BudibaseRoles.Admin },
+    value: BudibaseRoles.Developer,
+  },
 ]
 export const BudibaseRoleOptions = [
-  { label: "Member", value: BudibaseRoles.AppUser },
-  { label: "Admin", value: BudibaseRoles.Admin },
-]
-
-export const BudibaseRoleOptionsNew = [
   {
-    label: "Admin",
+    label: "Account admin",
-    value: "admin",
+    value: BudibaseRoles.Admin,
     subtitle: "Has full access to all apps and settings in your account",
   },
   {
-    label: "Member",
+    label: "Creator",
-    value: "appUser",
+    value: BudibaseRoles.Creator,
-    subtitle: "Can only view apps they have access to",
+    subtitle: "Can create and edit apps they have access to",
   },
-]
-
-export const BuilderRoleDescriptions = [
   {
+    label: "App user",
     value: BudibaseRoles.AppUser,
-    icon: "User",
+    subtitle: "Can only use published apps they have access to",
-    label: "App user - Only has access to published apps",
-  },
-  {
-    value: BudibaseRoles.Admin,
-    icon: "Draw",
-    label: "Admin - Full access",
   },
 ]
 

packages/pro

@@ -1 +1 @@
-Subproject commit 5e3d59fc4060fd44b14b2599269c207753d4e5be
+Subproject commit 1037b032d49244678204704d1bca779a29e395eb

packages/server/Dockerfile

@@ -18,12 +18,12 @@ ENV TOP_LEVEL_PATH=/
 
 # handle node-gyp
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends g++ make python3
+    && apt-get install -y --no-install-recommends g++ make python3 jq
 RUN yarn global add pm2
 
 # Install client for oracle datasource
 RUN apt-get install unzip libaio1
-COPY scripts/integrations/oracle/ scripts/integrations/oracle/
+COPY packages/server/scripts/integrations/oracle/ scripts/integrations/oracle/
 RUN /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install.sh 
 
 # Install postgres client for pg_dump utils
@@ -35,18 +35,42 @@ RUN apt update && apt upgrade -y \
     && apt install postgresql-client-15 -y \
     && apt remove software-properties-common apt-transport-https curl gpg -y
 
+WORKDIR /
 
-COPY package.json .
+COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-COPY dist/yarn.lock .
+RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-RUN yarn install --production=true --network-timeout 1000000 \
+
+
+WORKDIR /string-templates
+COPY packages/string-templates/package.json package.json
+RUN ../scripts/removeWorkspaceDependencies.sh package.json
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
+COPY packages/string-templates .
+
+
+WORKDIR /app
+COPY packages/server/package.json .
+COPY packages/server/dist/yarn.lock .
+RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
+
+COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
+RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
+RUN ./scripts/removeWorkspaceDependencies.sh  package.json
+
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000 \
     # Remove unneeded data from file system to reduce image size
-    && yarn cache clean && apt-get remove -y --purge --auto-remove g++ make python \
+    && yarn cache clean && apt-get remove -y --purge --auto-remove g++ make python jq \
     && rm -rf /tmp/* /root/.node-gyp /usr/local/lib/node_modules/npm/node_modules/node-gyp
 
-COPY dist/ dist/
+COPY packages/server/dist/ dist/
-COPY docker_run.sh .
+COPY packages/server/docker_run.sh .
-COPY builder/ builder/
+COPY packages/server/builder/ builder/
-COPY client/ client/
+COPY packages/server/client/ client/
+
+ARG BUDIBASE_VERSION
+# Ensuring the version argument is sent
+RUN test -n "$BUDIBASE_VERSION"
+ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
 
 EXPOSE 4001
 

packages/server/Dockerfile.v2

@@ -1,84 +0,0 @@
-FROM node:18-slim
-
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
-
-WORKDIR /app
-
-ENV PORT=4001
-ENV COUCH_DB_URL=https://couchdb.budi.live:5984
-ENV BUDIBASE_ENVIRONMENT=PRODUCTION
-ENV SERVICE=app-service
-ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
-ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
-ENV TOP_LEVEL_PATH=/
-
-# handle node-gyp
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends g++ make python3 jq
-RUN yarn global add pm2
-
-# Install client for oracle datasource
-RUN apt-get install unzip libaio1
-COPY packages/server/scripts/integrations/oracle/ scripts/integrations/oracle/
-RUN /bin/bash -e scripts/integrations/oracle/instantclient/linux/x86-64/install.sh 
-
-# Install postgres client for pg_dump utils
-RUN apt update && apt upgrade -y \
-    && apt install software-properties-common apt-transport-https curl gpg -y \
-    && curl -fsSl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null \
-    && echo deb [arch=amd64,arm64,ppc64el signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main | tee /etc/apt/sources.list.d/postgresql.list \
-    && apt update -y \
-    && apt install postgresql-client-15 -y \
-    && apt remove software-properties-common apt-transport-https curl gpg -y
-
-WORKDIR /
-
-COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-
-
-WORKDIR /string-templates
-COPY packages/string-templates/package.json package.json
-RUN ../scripts/removeWorkspaceDependencies.sh package.json
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
-COPY packages/string-templates .
-
-
-WORKDIR /app
-COPY packages/server/package.json .
-COPY packages/server/dist/yarn.lock .
-RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
-
-COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-RUN ./scripts/removeWorkspaceDependencies.sh  package.json
-
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000 \
-    # Remove unneeded data from file system to reduce image size
-    && yarn cache clean && apt-get remove -y --purge --auto-remove g++ make python jq \
-    && rm -rf /tmp/* /root/.node-gyp /usr/local/lib/node_modules/npm/node_modules/node-gyp
-
-COPY packages/server/dist/ dist/
-COPY packages/server/docker_run.sh .
-COPY packages/server/builder/ builder/
-COPY packages/server/client/ client/
-
-ARG BUDIBASE_VERSION
-# Ensuring the version argument is sent
-RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
-
-EXPOSE 4001
-
-# have to add node environment production after install
-# due to this causing yarn to stop installing dev dependencies
-# which are actually needed to get this environment up and running
-ENV NODE_ENV=production
-ENV CLUSTER_MODE=${CLUSTER_MODE}
-ENV TOP_LEVEL_PATH=/app
-
-CMD ["./docker_run.sh"]

packages/server/src/api/controllers/application.ts

@@ -51,6 +51,7 @@ import {
 import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
 import sdk from "../../sdk"
 import { builderSocket } from "../../websockets"
+import { sdk as sharedCoreSDK } from "@budibase/shared-core"
 
 // utility function, need to do away with this
 async function getLayouts() {
@@ -394,6 +395,12 @@ async function appPostCreate(ctx: UserCtx, app: App) {
       }
     }
   }
+
+  // If the user is a creator, we need to give them access to the new app
+  if (sharedCoreSDK.users.hasCreatorPermissions(ctx.user)) {
+    const user = await users.UserDB.getUser(ctx.user._id!)
+    await users.addAppBuilder(user, app.appId)
+  }
 }
 
 export async function create(ctx: UserCtx) {

packages/server/src/api/routes/application.ts

@@ -16,7 +16,7 @@ router
   )
   .post(
     "/api/applications",
-    authorized(permissions.GLOBAL_BUILDER),
+    authorized(permissions.CREATOR),
     applicationValidator(),
     controller.create
   )

packages/server/src/middleware/authorized.ts

@@ -5,7 +5,7 @@ import {
   roles,
   users,
 } from "@budibase/backend-core"
-import { PermissionLevel, PermissionType, Role, UserCtx } from "@budibase/types"
+import { PermissionLevel, PermissionType, UserCtx } from "@budibase/types"
 import builderMiddleware from "./builder"
 import { isWebhookEndpoint } from "./utils"
 import { paramResource } from "./resourceId"
@@ -31,13 +31,20 @@ const checkAuthorized = async (
 ) => {
   const appId = context.getAppId()
   const isGlobalBuilderApi = permType === PermissionType.GLOBAL_BUILDER
+  const isCreatorApi = permType === PermissionType.CREATOR
   const isBuilderApi = permType === PermissionType.BUILDER
-  const globalBuilder = users.isGlobalBuilder(ctx.user)
+  const isGlobalBuilder = users.isGlobalBuilder(ctx.user)
-  let isBuilder = appId
+  const isCreator = users.isCreator(ctx.user)
+  const isBuilder = appId
     ? users.isBuilder(ctx.user, appId)
     : users.hasBuilderPermissions(ctx.user)
-  // check if this is a builder api and the user is not a builder
+
-  if ((isGlobalBuilderApi && !globalBuilder) || (isBuilderApi && !isBuilder)) {
+  // check api permission type against user
+  if (
+    (isGlobalBuilderApi && !isGlobalBuilder) ||
+    (isCreatorApi && !isCreator) ||
+    (isBuilderApi && !isBuilder)
+  ) {
     return ctx.throw(403, "Not Authorized")
   }
 
@@ -148,6 +155,7 @@ const authorized =
     // to find API endpoints which are builder focused
     if (
       permType === PermissionType.BUILDER ||
+      permType === PermissionType.CREATOR ||
       permType === PermissionType.GLOBAL_BUILDER
     ) {
       await builderMiddleware(ctx)

packages/server/tsconfig.build.json

@@ -17,7 +17,8 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/src"]
+      "@budibase/pro": ["../pro/src"],
+      "@budibase/string-templates": ["../string-templates/src"]
     }
   },
   "include": ["src/**/*"],

packages/shared-core/src/sdk/documents/users.ts

@@ -25,6 +25,10 @@ export function isGlobalBuilder(user: User | ContextUser): boolean {
   return (isBuilder(user) && !hasAppBuilderPermissions(user)) || isAdmin(user)
 }
 
+export function canCreateApps(user: User | ContextUser): boolean {
+  return isGlobalBuilder(user) || hasCreatorPermissions(user)
+}
+
 // alias for hasAdminPermission, currently do the same thing
 // in future whether someone has admin permissions and whether they are
 // an admin for a specific resource could be separated
@@ -66,7 +70,7 @@ export function hasAppCreatorPermissions(user?: User | ContextUser): boolean {
   return _.flow(
     _.get("roles"),
     _.values,
-    _.find(x => ["CREATOR", "ADMIN"].includes(x)),
+    _.find(x => x === "CREATOR"),
     x => !!x
   )(user)
 }
@@ -76,7 +80,11 @@ export function hasBuilderPermissions(user?: User | ContextUser): boolean {
   if (!user) {
     return false
   }
-  return user.builder?.global || hasAppBuilderPermissions(user)
+  return (
+    user.builder?.global ||
+    hasAppBuilderPermissions(user) ||
+    hasCreatorPermissions(user)
+  )
 }
 
 // checks if a user is capable of being an admin
@@ -87,13 +95,21 @@ export function hasAdminPermissions(user?: User | ContextUser): boolean {
   return !!user.admin?.global
 }
 
+export function hasCreatorPermissions(user?: User | ContextUser): boolean {
+  if (!user) {
+    return false
+  }
+  return !!user.builder?.creator
+}
+
 export function isCreator(user?: User | ContextUser): boolean {
   if (!user) {
     return false
   }
   return (
-    isGlobalBuilder(user) ||
+    isGlobalBuilder(user!) ||
     hasAdminPermissions(user) ||
+    hasCreatorPermissions(user) ||
     hasAppBuilderPermissions(user) ||
     hasAppCreatorPermissions(user)
   )

packages/types/src/documents/global/user.ts

@@ -44,6 +44,7 @@ export interface User extends Document {
   builder?: {
     global?: boolean
     apps?: string[]
+    creator?: boolean
   }
   admin?: {
     global: boolean

packages/types/src/sdk/permissions.ts

@@ -13,6 +13,7 @@ export enum PermissionType {
   AUTOMATION = "automation",
   WEBHOOK = "webhook",
   BUILDER = "builder",
+  CREATOR = "creator",
   GLOBAL_BUILDER = "globalBuilder",
   QUERY = "query",
   VIEW = "view",

packages/worker/Dockerfile

@@ -5,22 +5,38 @@ LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-ho
 LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
 LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
 
-WORKDIR /app
 
 # handle node-gyp
-RUN apk add --no-cache --virtual .gyp python3 make g++
+RUN apk add --no-cache --virtual .gyp python3 make g++ jq
 RUN yarn global add pm2
 
+WORKDIR /
 
-COPY package.json .
+COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-COPY dist/yarn.lock .
+RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-RUN yarn install --production=true --network-timeout 1000000
+
+
+WORKDIR /string-templates
+COPY packages/string-templates/package.json package.json
+RUN ../scripts/removeWorkspaceDependencies.sh package.json
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
+COPY packages/string-templates .
+
+
+WORKDIR /app
+COPY packages/worker/package.json .
+COPY packages/worker/dist/yarn.lock .
+RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
+
+RUN ../scripts/removeWorkspaceDependencies.sh package.json
+
+RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
 # Remove unneeded data from file system to reduce image size
 RUN apk del .gyp \
     && yarn cache clean
 
-COPY dist/ dist/
+COPY packages/worker/dist/ dist/
-COPY docker_run.sh .
+COPY packages/worker/docker_run.sh .
 
 EXPOSE 4001
 
@@ -34,4 +50,9 @@ ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
 ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
 ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
 
+ARG BUDIBASE_VERSION
+# Ensuring the version argument is sent
+RUN test -n "$BUDIBASE_VERSION"
+ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
+
 CMD ["./docker_run.sh"]

packages/worker/Dockerfile.v2

@@ -1,58 +0,0 @@
-FROM node:18-alpine
-
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="scripts/watchtower-hooks/pre-check.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="scripts/watchtower-hooks/pre-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-update="scripts/watchtower-hooks/post-update.sh"
-LABEL com.centurylinklabs.watchtower.lifecycle.post-check="scripts/watchtower-hooks/post-check.sh"
-
-
-# handle node-gyp
-RUN apk add --no-cache --virtual .gyp python3 make g++ jq
-RUN yarn global add pm2
-
-WORKDIR /
-
-COPY scripts/removeWorkspaceDependencies.sh scripts/removeWorkspaceDependencies.sh
-RUN chmod +x ./scripts/removeWorkspaceDependencies.sh
-
-
-WORKDIR /string-templates
-COPY packages/string-templates/package.json package.json
-RUN ../scripts/removeWorkspaceDependencies.sh package.json
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
-COPY packages/string-templates .
-
-
-WORKDIR /app
-COPY packages/worker/package.json .
-COPY packages/worker/dist/yarn.lock .
-RUN cd ../string-templates && yarn link && cd - && yarn link @budibase/string-templates
-
-RUN ../scripts/removeWorkspaceDependencies.sh package.json
-
-RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --production=true --network-timeout 1000000
-# Remove unneeded data from file system to reduce image size
-RUN apk del .gyp \
-    && yarn cache clean
-
-COPY packages/worker/dist/ dist/
-COPY packages/worker/docker_run.sh .
-
-EXPOSE 4001
-
-# have to add node environment production after install
-# due to this causing yarn to stop installing dev dependencies
-# which are actually needed to get this environment up and running
-ENV NODE_ENV=production
-ENV CLUSTER_MODE=${CLUSTER_MODE}
-ENV SERVICE=worker-service
-ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
-ENV TENANT_FEATURE_FLAGS=*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR
-ENV ACCOUNT_PORTAL_URL=https://account.budibase.app
-
-ARG BUDIBASE_VERSION
-# Ensuring the version argument is sent
-RUN test -n "$BUDIBASE_VERSION"
-ENV BUDIBASE_VERSION=$BUDIBASE_VERSION
-
-CMD ["./docker_run.sh"]

packages/worker/src/api/controllers/global/roles.ts

@@ -51,10 +51,22 @@ export async function removeAppRole(ctx: Ctx) {
   const users = await sdk.users.db.allUsers()
   const bulk = []
   const cacheInvalidations = []
+  const prodAppId = dbCore.getProdAppID(appId)
   for (let user of users) {
-    if (user.roles[appId]) {
+    let updated = false
-      cacheInvalidations.push(cache.user.invalidateUser(user._id))
+    if (user.roles[prodAppId]) {
-      delete user.roles[appId]
+      cacheInvalidations.push(cache.user.invalidateUser(user._id!))
+      delete user.roles[prodAppId]
+      updated = true
+    }
+    if (user.builder && Array.isArray(user.builder?.apps)) {
+      const idx = user.builder.apps.indexOf(prodAppId)
+      if (idx !== -1) {
+        user.builder.apps.splice(idx, 1)
+        updated = true
+      }
+    }
+    if (updated) {
       bulk.push(user)
     }
   }

scripts/build-single-image.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 yarn build --scope @budibase/server --scope @budibase/worker
 version=$(./scripts/getCurrentVersion.sh)
-docker build -f hosting/single/Dockerfile.v2 -t budibase:latest --build-arg BUDIBASE_VERSION=$version .
+docker build -f hosting/single/Dockerfile -t budibase:latest --build-arg BUDIBASE_VERSION=$version .