Merge branch 'master' of github.com:Budibase/budibase into develop

.github/workflows/deploy-single-image.yml

@@ -57,3 +57,12 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: budibase/budibase,budibase/budibase:v${{ env.RELEASE_VERSION }}
           file: ./hosting/single/Dockerfile
+      - name: Tag and release Budibase Azure App Service docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64
+          build-args: TARGETBUILD=aas
+          tags: budibase/budibase-aas,budibase/budibase-aas:v${{ env.RELEASE_VERSION }}
+          file: ./hosting/single/Dockerfile

hosting/scripts/build-target-paths.sh

@@ -3,15 +3,15 @@
 echo ${TARGETBUILD} > /buildtarget.txt
 if [[ "${TARGETBUILD}" = "aas" ]]; then
     # Azure AppService uses /home for persisent data & SSH on port 2222
-    mkdir -p /home/budibase/{minio,couchdb}
+    mkdir -p /home/{search,minio,couch}
-    mkdir -p  /home/budibase/couchdb/data
+    mkdir -p /home/couch/{dbs,views}
-    chown -R couchdb:couchdb /home/budibase/couchdb/
+    chown -R couchdb:couchdb /home/couch/
     apt update
     apt-get install -y openssh-server
-    sed -i 's#dir=/opt/couchdb/data/search#dir=/home/budibase/couchdb/data/search#' /opt/clouseau/clouseau.ini
+    sed -i 's#dir=/opt/couchdb/data/search#dir=/home/search#' /opt/clouseau/clouseau.ini
-    sed -i 's#/minio/minio server /minio &#/minio/minio server /home/budibase/minio &#' /runner.sh
+    sed -i 's#/minio/minio server /minio &#/minio/minio server /home/minio &#' /runner.sh
-    sed -i 's#database_dir = ./data#database_dir = /home/budibase/couchdb/data#' /opt/couchdb/etc/default.ini
+    sed -i 's#database_dir = ./data#database_dir = /home/couch/dbs#' /opt/couchdb/etc/default.ini
-    sed -i 's#view_index_dir = ./data#view_index_dir = /home/budibase/couchdb/data#' /opt/couchdb/etc/default.ini
+    sed -i 's#view_index_dir = ./data#view_index_dir = /home/couch/views#' /opt/couchdb/etc/default.ini
     sed -i "s/#Port 22/Port 2222/" /etc/ssh/sshd_config
     /etc/init.d/ssh restart
 fi

hosting/single/Dockerfile

@@ -122,8 +122,7 @@ RUN yarn cache clean -f
 
 EXPOSE 80
 EXPOSE 443
-VOLUME /opt/couchdb/data
+VOLUME /data
-VOLUME /minio
 
 #  setup letsencrypt certificate
 RUN apt-get install -y certbot python3-certbot-nginx

hosting/single/runner.sh

@@ -24,8 +24,8 @@ if [ ! -f "/data/.env" ]; then
 fi
 
 # make these directories in runner, incase of mount
-mkdir -p /data/couch/dbs /data/couch/views
+mkdir -p /data/couch/{dbs,views} /home/couch/{dbs,views}
-chown couchdb:couchdb /data/couch /data/couch/dbs /data/couch/views
+chown -R couchdb:couchdb /data/couch /home/couch
 redis-server --requirepass $REDIS_PASSWORD &
 /opt/clouseau/bin/clouseau &
 /minio/minio server /data/minio &

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "^1.1.10-alpha.4",
+    "@budibase/types": "^1.1.14",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.1.10-alpha.4",
+    "@budibase/string-templates": "^1.1.14",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.1.10-alpha.4",
+    "@budibase/bbui": "^1.1.14",
-    "@budibase/client": "^1.1.10-alpha.4",
+    "@budibase/client": "^1.1.14",
-    "@budibase/frontend-core": "^1.1.10-alpha.4",
+    "@budibase/frontend-core": "^1.1.14",
-    "@budibase/string-templates": "^1.1.10-alpha.4",
+    "@budibase/string-templates": "^1.1.14",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/builder/src/analytics/IntercomClient.js

@@ -52,8 +52,8 @@ export default class IntercomClient {
    * @param {Object} user - user to identify
    * @returns Intercom global object
    */
-  show(user = {}) {
+  show(user = {}, enabled) {
-    if (!this.initialised || !user?.admin) return
+    if (!this.initialised || !enabled) return
 
     return window.Intercom("boot", {
       app_id: this.token,

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte

@@ -12,6 +12,7 @@
     notifications,
     Modal,
   } from "@budibase/bbui"
+  import { ActionStepID } from "constants/backend/automations"
 
   export let automation
   let testDataModal
@@ -82,7 +83,7 @@
       in:fly|local={{ x: 500, duration: 500 }}
       out:fly|local={{ x: 500, duration: 500 }}
     >
-      {#if block.stepId !== "LOOP"}
+      {#if block.stepId !== ActionStepID.LOOP}
         <FlowItem {testDataModal} {block} />
       {/if}
     </div>

packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte

@@ -10,11 +10,15 @@
     Select,
     ActionButton,
     notifications,
+    Label,
   } from "@budibase/bbui"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
   import ActionModal from "./ActionModal.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
+  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
+  import { ActionStepID, TriggerStepID } from "constants/backend/automations"
+  import { permissions } from "stores/backend"
 
   export let block
   export let testDataModal
@@ -23,9 +27,12 @@
   let actionModal
   let blockComplete
   let showLooping = false
+  let role
 
+  $: automationId = $automationStore.selectedAutomation?.automation._id
   $: showBindingPicker =
-    block.stepId === "CREATE_ROW" || block.stepId === "UPDATE_ROW"
+    block.stepId === ActionStepID.CREATE_ROW ||
+    block.stepId === ActionStepID.UPDATE_ROW
 
   $: isTrigger = block.type === "TRIGGER"
 
@@ -45,6 +52,32 @@
       x => x.blockToLoop === block.id
     )
 
+  $: setPermissions(role)
+  $: getPermissions(automationId)
+
+  async function setPermissions(role) {
+    if (!role || !automationId) {
+      return
+    }
+    await permissions.save({
+      level: "execute",
+      role,
+      resource: automationId,
+    })
+  }
+
+  async function getPermissions(automationId) {
+    if (!automationId) {
+      return
+    }
+    const perms = await permissions.forResource(automationId)
+    if (!perms["execute"]) {
+      role = "BASIC"
+    } else {
+      role = perms["execute"]
+    }
+  }
+
   async function removeLooping() {
     loopingSelected = false
     let loopBlock =
@@ -205,6 +238,10 @@
           </div>
         {/if}
 
+        {#if block.stepId === TriggerStepID.APP}
+          <Label>Role</Label>
+          <RoleSelect bind:value={role} />
+        {/if}
         <AutomationBlockSetup
           schemaProperties={Object.entries(block.schema.inputs.properties)}
           {block}

packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte

@@ -1,6 +1,7 @@
 <script>
   import { Icon, Divider, Tabs, Tab, TextArea, Label } from "@budibase/bbui"
   import FlowItemHeader from "./FlowChart/FlowItemHeader.svelte"
+  import { ActionStepID } from "constants/backend/automations"
 
   export let automation
   export let testResults
@@ -10,7 +11,7 @@
   let blocks
 
   function prepTestResults(results) {
-    return results?.steps.filter(x => x.stepId !== "LOOP" || [])
+    return results?.steps.filter(x => x.stepId !== ActionStepID.LOOP || [])
   }
 
   function textArea(results, message) {
@@ -30,7 +31,7 @@
       }
       blocks = blocks
         .concat(automation.definition.steps || [])
-        .filter(x => x.stepId !== "LOOP")
+        .filter(x => x.stepId !== ActionStepID.LOOP)
     } else if (filteredResults) {
       blocks = filteredResults || []
       // make sure there is an ID for each block being displayed
@@ -45,7 +46,7 @@
 <div class="container">
   {#each blocks as block, idx}
     <div class="block" style={width ? `width: ${width}` : ""}>
-      {#if block.stepId !== "LOOP"}
+      {#if block.stepId !== ActionStepID.LOOP}
         <FlowItemHeader
           showTestStatus={true}
           bind:showParameters

packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte

@@ -2,6 +2,7 @@
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
   import { automationStore } from "builderStore"
+  import { ActionStepID } from "constants/backend/automations"
 
   export let automation
   export let testResults
@@ -16,7 +17,7 @@
       }
       blocks = blocks
         .concat(automation.definition.steps || [])
-        .filter(x => x.stepId !== "LOOP")
+        .filter(x => x.stepId !== ActionStepID.LOOP)
     } else if (testResults) {
       blocks = testResults.steps || []
     }

packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte

@@ -11,6 +11,7 @@
     Body,
     Icon,
   } from "@budibase/bbui"
+  import { TriggerStepID } from "constants/backend/automations"
 
   let name
   let selectedTrigger
@@ -35,7 +36,7 @@
       )
 
       automationStore.actions.addBlockToAutomation(newBlock)
-      if (triggerVal.stepId === "WEBHOOK") {
+      if (triggerVal.stepId === TriggerStepID.WEBHOOK) {
         webhookModal.show
       }
 

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -30,6 +30,7 @@
   import { LuceneUtils } from "@budibase/frontend-core"
   import { getSchemaForTable } from "builderStore/dataBinding"
   import { Utils } from "@budibase/frontend-core"
+  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 
   export let block
   export let testData
@@ -54,12 +55,13 @@
   $: schema = getSchemaForTable(tableId, { searchableSchema: true }).schema
   $: schemaFields = Object.values(schema || {})
   $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
+  $: isTrigger = block?.type === "TRIGGER"
 
   const onChange = Utils.sequential(async (e, key) => {
     try {
       if (isTestModal) {
         // Special case for webhook, as it requires a body, but the schema already brings back the body's contents
-        if (stepId === "WEBHOOK") {
+        if (stepId === TriggerStepID.WEBHOOK) {
           automationStore.actions.addTestDataToAutomation({
             body: {
               [key]: e.detail,
@@ -100,9 +102,9 @@
     // Extract all outputs from all previous steps as available bindins
     let bindings = []
     for (let idx = 0; idx < blockIdx; idx++) {
-      let wasLoopBlock = allSteps[idx]?.stepId === "LOOP"
+      let wasLoopBlock = allSteps[idx]?.stepId === ActionStepID.LOOP
       let isLoopBlock =
-        allSteps[idx]?.stepId === "LOOP" &&
+        allSteps[idx]?.stepId === ActionStepID.LOOP &&
         allSteps.find(x => x.blockToLoop === block.id)
 
       // If the previous block was a loop block, decerement the index so the following
@@ -261,6 +263,7 @@
         />
       {:else if value.customType === "table"}
         <TableSelector
+          {isTrigger}
           value={inputData[key]}
           on:change={e => onChange(e, key)}
         />
@@ -343,7 +346,7 @@
   <CreateWebhookModal />
 </Modal>
 
-{#if stepId === "WEBHOOK"}
+{#if stepId === TriggerStepID.WEBHOOK}
   <Button secondary on:click={() => webhookModal.show()}>Set Up Webhook</Button>
 {/if}
 

packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte

@@ -1,5 +1,5 @@
 <script>
-  import { Button, Select, Input } from "@budibase/bbui"
+  import { Button, Select, Input, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   const dispatch = createEventDispatcher()
 
@@ -9,6 +9,7 @@
     dispatch("change", e.detail)
   }
 
+  let touched = false
   let presets = false
 
   const CRON_EXPRESSIONS = [
@@ -36,8 +37,10 @@
 </script>
 
 <div class="block-field">
-  <Input on:change={onChange} {value} />
+  <Input on:change={onChange} {value} on:blur={() => (touched = true)} />
-
+  {#if touched && !value}
+    <Label><div class="error">Please specify a CRON expression</div></Label>
+  {/if}
   <div class="presets">
     <Button on:click={() => (presets = !presets)}
       >{presets ? "Hide" : "Show"} Presets</Button
@@ -62,4 +65,8 @@
   .block-field {
     padding-top: var(--spacing-s);
   }
+  .error {
+    padding-top: var(--spacing-xs);
+    color: var(--spectrum-global-color-red-500);
+  }
 </style>

packages/builder/src/components/automation/SetupPanel/TableSelector.svelte

@@ -2,10 +2,16 @@
   import { tables } from "stores/backend"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
+  import { TableNames } from "constants"
 
   const dispatch = createEventDispatcher()
 
   export let value
+  export let isTrigger
+
+  $: filteredTables = $tables.list.filter(table => {
+    return !isTrigger || table._id !== TableNames.USERS
+  })
 
   const onChange = e => {
     value = e.detail
@@ -16,7 +22,7 @@
 <Select
   on:change={onChange}
   bind:value
-  options={$tables.list}
+  options={filteredTables}
   getOptionLabel={table => table.name}
   getOptionValue={table => table._id}
 />

packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte

@@ -3,6 +3,7 @@
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
+  import { TriggerStepID } from "constants/backend/automations"
 
   let webhookUrls = []
 
@@ -11,7 +12,7 @@
   onMount(() => {
     webhookUrls = automations.map(automation => {
       const trigger = automation.definition.trigger
-      if (trigger?.stepId === "WEBHOOK" && trigger.inputs) {
+      if (trigger?.stepId === TriggerStepID.WEBHOOK && trigger.inputs) {
         return {
           type: "Automation",
           name: automation.name,

packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte

@@ -2,6 +2,7 @@
   import { Select, Label, Input, Checkbox } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import SaveFields from "./SaveFields.svelte"
+  import { TriggerStepID } from "constants/backend/automations"
 
   export let parameters = {}
   export let bindings = []
@@ -16,7 +17,7 @@
     : AUTOMATION_STATUS.NEW
 
   $: automations = $automationStore.automations
-    .filter(a => a.definition.trigger?.stepId === "APP")
+    .filter(a => a.definition.trigger?.stepId === TriggerStepID.APP)
     .map(automation => {
       const schema = Object.entries(
         automation.definition.trigger.inputs.fields || {}

packages/builder/src/constants/backend/automations.js

@@ -0,0 +1,28 @@
+export const TriggerStepID = {
+  ROW_SAVED: "ROW_SAVED",
+  ROW_UPDATED: "ROW_UPDATED",
+  ROW_DELETED: "ROW_DELETED",
+  WEBHOOK: "WEBHOOK",
+  APP: "APP",
+  CRON: "CRON",
+}
+
+export const ActionStepID = {
+  SEND_EMAIL_SMTP: "SEND_EMAIL_SMTP",
+  CREATE_ROW: "CREATE_ROW",
+  UPDATE_ROW: "UPDATE_ROW",
+  DELETE_ROW: "DELETE_ROW",
+  OUTGOING_WEBHOOK: "OUTGOING_WEBHOOK",
+  EXECUTE_SCRIPT: "EXECUTE_SCRIPT",
+  EXECUTE_QUERY: "EXECUTE_QUERY",
+  SERVER_LOG: "SERVER_LOG",
+  DELAY: "DELAY",
+  FILTER: "FILTER",
+  QUERY_ROWS: "QUERY_ROWS",
+  LOOP: "LOOP",
+  // these used to be lowercase step IDs, maintain for backwards compat
+  discord: "discord",
+  slack: "slack",
+  zapier: "zapier",
+  integromat: "integromat",
+}

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

@@ -58,17 +58,20 @@ export function createAuthStore() {
         .activate()
         .then(() => {
           analytics.identify(user._id)
-          analytics.showChat({
+          analytics.showChat(
-            email: user.email,
+            {
-            created_at: (user.createdAt || Date.now()) / 1000,
+              email: user.email,
-            name: user.account?.name,
+              created_at: (user.createdAt || Date.now()) / 1000,
-            user_id: user._id,
+              name: user.account?.name,
-            tenant: user.tenantId,
+              user_id: user._id,
-            admin: user?.admin?.global,
+              tenant: user.tenantId,
-            builder: user?.builder?.global,
+              admin: user?.admin?.global,
-            "Company size": user.account?.size,
+              builder: user?.builder?.global,
-            "Job role": user.account?.profession,
+              "Company size": user.account?.size,
-          })
+              "Job role": user.account?.profession,
+            },
+            !!user?.account
+          )
         })
         .catch(() => {
           // This request may fail due to browser extensions blocking requests

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.1.10-alpha.4",
+    "@budibase/bbui": "^1.1.14",
-    "@budibase/frontend-core": "^1.1.10-alpha.4",
+    "@budibase/frontend-core": "^1.1.14",
-    "@budibase/string-templates": "^1.1.10-alpha.4",
+    "@budibase/string-templates": "^1.1.14",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.1.10-alpha.4",
+    "@budibase/bbui": "^1.1.14",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.1.10-alpha.4",
+    "@budibase/backend-core": "^1.1.14",
-    "@budibase/client": "^1.1.10-alpha.4",
+    "@budibase/client": "^1.1.14",
-    "@budibase/pro": "1.1.10-alpha.4",
+    "@budibase/pro": "1.1.14",
-    "@budibase/string-templates": "^1.1.10-alpha.4",
+    "@budibase/string-templates": "^1.1.14",
-    "@budibase/types": "^1.1.10-alpha.4",
+    "@budibase/types": "^1.1.14",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",

packages/server/src/api/routes/tests/permissions.spec.js

@@ -37,9 +37,10 @@ describe("/permission", () => {
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body).toBeDefined()
-      expect(res.body.length).toEqual(2)
+      expect(res.body.length).toEqual(3)
       expect(res.body).toContain("read")
       expect(res.body).toContain("write")
+      expect(res.body).toContain("execute")
     })
   })
 

packages/server/src/automations/utils.ts

@@ -97,7 +97,7 @@ export async function enableCronTrigger(appId: any, automation: any) {
     )
   }
   // need to create cron job
-  if (isCronTrigger(automation)) {
+  if (isCronTrigger(automation) && trigger?.inputs.cron) {
     // make a job id rather than letting Bull decide, makes it easier to handle on way out
     const jobId = `${appId}_cron_${newid()}`
     const job: any = await queue.add(

packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js

@@ -4,15 +4,13 @@ const { getGlobalDB, doInTenant } = require("@budibase/backend-core/tenancy")
 
 // mock email view creation
 const coreDb = require("@budibase/backend-core/db")
-const createUserEmailView = jest.fn()
+const createNewUserEmailView = jest.fn()
-coreDb.createUserEmailView = createUserEmailView
+coreDb.createNewUserEmailView = createNewUserEmailView
 
 const migration = require("../userEmailViewCasing")
 
 describe("run", () => {
-  doInTenant(TENANT_ID, () => {
     let config = new TestConfig(false)
-    const globalDb = getGlobalDB()
 
     beforeEach(async () => {
       await config.init()
@@ -21,8 +19,10 @@ describe("run", () => {
     afterAll(config.end)
 
     it("runs successfully", async () => {
-      await migration.run(globalDb)
+      await doInTenant(TENANT_ID, async () => {
-      expect(createUserEmailView).toHaveBeenCalledTimes(1)
+        const globalDb = getGlobalDB()
+        await migration.run(globalDb)
+        expect(createNewUserEmailView).toHaveBeenCalledTimes(1)
+      })
     })
-  })
 })

packages/server/src/migrations/functions/userEmailViewCasing.ts

@@ -1,4 +1,4 @@
-const { createUserEmailView } = require("@budibase/backend-core/db")
+const { createNewUserEmailView } = require("@budibase/backend-core/db")
 
 /**
  * Date:
@@ -9,5 +9,5 @@ const { createUserEmailView } = require("@budibase/backend-core/db")
  */
 
 export const run = async (db: any) => {
-  await createUserEmailView(db)
+  await createNewUserEmailView(db)
 }

packages/server/src/utilities/security.js

@@ -13,6 +13,7 @@ const { DocumentTypes } = require("../db/utils")
 const CURRENTLY_SUPPORTED_LEVELS = [
   PermissionLevels.WRITE,
   PermissionLevels.READ,
+  PermissionLevels.EXECUTE,
 ]
 
 exports.getPermissionType = resourceId => {

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.1.10-alpha.4",
+  "version": "1.1.14",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.1.10-alpha.4",
+    "@budibase/backend-core": "^1.1.14",
-    "@budibase/pro": "1.1.10-alpha.4",
+    "@budibase/pro": "1.1.14",
-    "@budibase/string-templates": "^1.1.10-alpha.4",
+    "@budibase/string-templates": "^1.1.14",
-    "@budibase/types": "^1.1.10-alpha.4",
+    "@budibase/types": "^1.1.14",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",

packages/worker/yarn.lock

@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.1.7":
+"@budibase/backend-core@1.1.14":
-  version "1.1.7"
+  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.7.tgz#371048be47828da1f13e03b6d808bccb7114cdb5"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.14.tgz#c4cb61dc8b841b6ae37aeb1e34c418fffb7aa597"
-  integrity sha512-FZnGTQihKugHnaim5osfITwTfIeachtO3ZERRqU68CpoJVI52oyzPixK1oUP2HYFGCcttqIJN90XD/keC1LzQQ==
+  integrity sha512-fElYKOj53VtlzySGpXTjP2kyyllz7VZESVbcS5fJsoREBzP3JFY4a4F89U8GGqjPO5KS3AsfLJqWIjU6aE+yow==
   dependencies:
-    "@budibase/types" "^1.1.7"
+    "@budibase/types" "^1.1.14"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -324,19 +324,19 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.1.7":
+"@budibase/pro@1.1.14":
-  version "1.1.7"
+  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.7.tgz#b9120c60a38d4bbc87dc99ef219a8f23418b9d82"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.14.tgz#c99755c239e3f7c957c02c8c709649077409c73b"
-  integrity sha512-APMPIWbxPWzAWWKBglGa1csbVxllAsF5Lt7e5hrNVfN51rzJ3TvQ56iIUru0xGOWpelDQWd4FXe1/dpN0hSvEA==
+  integrity sha512-S88/Fc2hkc2SRNXQrHdBNX+yiywv7ufsOeLO7blA8Ygec0FmCB81yKl6NWIZJ2RbrBIfGD2XqwXmBT6AvxKosQ==
   dependencies:
-    "@budibase/backend-core" "1.1.7"
+    "@budibase/backend-core" "1.1.14"
-    "@budibase/types" "1.1.7"
+    "@budibase/types" "1.1.14"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.1.7", "@budibase/types@^1.1.7":
+"@budibase/types@1.1.14", "@budibase/types@^1.1.14":
-  version "1.1.7"
+  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.7.tgz#d1da67c6c6b09de639130775ed80290148434be0"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.14.tgz#519a0b16d7356324082d51efc7b313d4f31793f0"
-  integrity sha512-WkR9bS4DdVAAzIgzHDsfMLPBcXs+RVwzOXp2eSFrun1fZQfkiAnMO7+EYhYx4+zF6RLBXiF6iYXPDJLzviufGQ==
+  integrity sha512-h0bma0AN4HiML2v6ZEnc0dcHs4CWi2i49x1jI5r6q4w61wdFt4eQ2pDS/Qv1R+BRBGGsbAwkxJRWoBxnqdBVuw==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"