Merge branch 'master' into bug/sev3/display-column-relationship-bug

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

@@ -4,8 +4,6 @@ on:
   workflow_dispatch:
 
 env:
-  BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
-  BRANCH: ${{ github.event.pull_request.head.ref }}
   CI: true
   PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   REGISTRY_URL: registry.hub.docker.com
@@ -17,6 +15,11 @@ jobs:
       matrix:
         node-version: [14.x]
     steps:
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master'
+        run: | 
+          echo "Ref is not master, you must run this job from master."
+          exit 1
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -28,8 +31,6 @@ jobs:
       - name: Setup Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
-      - name: Install Pro
-        run: yarn install:pro $BRANCH $BASE_BRANCH
       - name: Run Yarn
         run: yarn
       - name: Run Yarn Bootstrap

.github/workflows/release-selfhost.yml

@@ -3,10 +3,6 @@ name: Budibase Release Selfhost
 on:
  workflow_dispatch:
 
-env:
-  BRANCH: ${{ github.event.pull_request.head.ref }}
-  BASE_BRANCH: ${{ github.event.pull_request.base.ref}}
-
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -54,9 +50,6 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
           SELFHOST_TAG: latest
 
-      - name: Install Pro
-        run: yarn install:pro $BRANCH $BASE_BRANCH
-
       - name: Bootstrap and build (CLI)
         run: |
           yarn

charts/budibase/templates/app-service-deployment.yaml

@@ -78,6 +78,8 @@ spec:
               key: objectStoreSecret
         - name: MINIO_URL
           value: {{ .Values.services.objectStore.url }}
+        - name: PLUGIN_BUCKET_NAME
+          value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
         - name: PORT
           value: {{ .Values.services.apps.port | quote }}
         {{ if .Values.services.worker.publicApiRateLimitPerSecond }}

charts/budibase/templates/worker-service-deployment.yaml

@@ -77,6 +77,8 @@ spec:
               key: objectStoreSecret
         - name: MINIO_URL
           value: {{ .Values.services.objectStore.url }}
+        - name: PLUGIN_BUCKET_NAME
+          value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
         - name: PORT
           value: {{ .Values.services.worker.port | quote }}
         - name: MULTI_TENANCY

lerna.json

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

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "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.4.3",
+    "@budibase/types": "^1.4.16",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",

packages/backend-core/src/context/index.ts

@@ -226,6 +226,10 @@ export const getAppId = () => {
   }
 }
 
+export const isTenancyEnabled = () => {
+  return env.MULTI_TENANCY
+}
+
 /**
  * Opens the app database based on whatever the request
  * contained, dev or prod.

packages/backend-core/src/environment.ts

@@ -16,6 +16,15 @@ if (!LOADED && isDev() && !isTest()) {
   LOADED = true
 }
 
+const DefaultBucketName = {
+  BACKUPS: "backups",
+  APPS: "prod-budi-app-assets",
+  TEMPLATES: "templates",
+  GLOBAL: "global",
+  CLOUD: "prod-budi-tenant-uploads",
+  PLUGINS: "plugins",
+}
+
 const env = {
   isTest,
   isDev,
@@ -45,13 +54,17 @@ const env = {
   POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   TENANT_FEATURE_FLAGS: process.env.TENANT_FEATURE_FLAGS,
-  BACKUPS_BUCKET_NAME: process.env.BACKUPS_BUCKET_NAME || "backups",
+  BACKUPS_BUCKET_NAME:
-  APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || "prod-budi-app-assets",
+    process.env.BACKUPS_BUCKET_NAME || DefaultBucketName.BACKUPS,
-  TEMPLATES_BUCKET_NAME: process.env.TEMPLATES_BUCKET_NAME || "templates",
+  APPS_BUCKET_NAME: process.env.APPS_BUCKET_NAME || DefaultBucketName.APPS,
-  GLOBAL_BUCKET_NAME: process.env.GLOBAL_BUCKET_NAME || "global",
+  TEMPLATES_BUCKET_NAME:
+    process.env.TEMPLATES_BUCKET_NAME || DefaultBucketName.TEMPLATES,
+  GLOBAL_BUCKET_NAME:
+    process.env.GLOBAL_BUCKET_NAME || DefaultBucketName.GLOBAL,
   GLOBAL_CLOUD_BUCKET_NAME:
-    process.env.GLOBAL_CLOUD_BUCKET_NAME || "prod-budi-tenant-uploads",
+    process.env.GLOBAL_CLOUD_BUCKET_NAME || DefaultBucketName.CLOUD,
-  PLUGIN_BUCKET_NAME: process.env.PLUGIN_BUCKET_NAME || "plugins",
+  PLUGIN_BUCKET_NAME:
+    process.env.PLUGIN_BUCKET_NAME || DefaultBucketName.PLUGINS,
   USE_COUCH: process.env.USE_COUCH || true,
   DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
   DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,

packages/backend-core/src/migrations/definitions.ts

@@ -33,4 +33,8 @@ export const DEFINITIONS: MigrationDefinition[] = [
     type: MigrationType.GLOBAL,
     name: MigrationName.GLOBAL_INFO_SYNC_USERS,
   },
+  {
+    type: MigrationType.GLOBAL,
+    name: MigrationName.PLUGIN_COUNT,
+  },
 ]

packages/backend-core/src/objectStore/utils.js

@@ -2,6 +2,11 @@ const { join } = require("path")
 const { tmpdir } = require("os")
 const env = require("../environment")
 
+/****************************************************
+ *      NOTE: When adding a new bucket - name       *
+ *     sure that S3 usages (like budibase-infra)    *
+ *  have been updated to have a unique bucket name. *
+ ****************************************************/
 exports.ObjectStoreBuckets = {
   BACKUPS: env.BACKUPS_BUCKET_NAME,
   APPS: env.APPS_BUCKET_NAME,

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "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.4.3",
+    "@budibase/string-templates": "^1.4.16",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

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

@@ -65,6 +65,9 @@
     }
   }
 
+  $: showDropzone =
+    (!maximum || (maximum && value?.length < maximum)) && !disabled
+
   async function processFileList(fileList) {
     if (
       handleFileTooLarge &&
@@ -211,7 +214,7 @@
       {/each}
     {/if}
   {/if}
-  {#if !maximum || (maximum && value?.length < maximum)}
+  {#if showDropzone}
     <div
       class="spectrum-Dropzone"
       class:is-invalid={!!error}

packages/bbui/src/Table/AttachmentRenderer.svelte

@@ -20,6 +20,9 @@
       target="_blank"
       download={attachment.name}
       href={attachment.url}
+      on:click={e => {
+        e.stopPropagation()
+      }}
     >
       <div class="center" title={attachment.name}>
         <img src={attachment.url} alt={attachment.extension} />
@@ -32,6 +35,9 @@
         target="_blank"
         download={attachment.name}
         href={attachment.url}
+        on:click={e => {
+          e.stopPropagation()
+        }}
       >
         {attachment.extension}
       </Link>

packages/builder/package.json

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

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

@@ -113,8 +113,9 @@
 
     // Extract all outputs from all previous steps as available bindins
     let bindings = []
+    let loopBlockCount = 0
     for (let idx = 0; idx < blockIdx; idx++) {
-      let wasLoopBlock = allSteps[idx]?.stepId === ActionStepID.LOOP
+      let wasLoopBlock = allSteps[idx - 1]?.stepId === ActionStepID.LOOP
       let isLoopBlock =
         allSteps[idx]?.stepId === ActionStepID.LOOP &&
         allSteps.find(x => x.blockToLoop === block.id)
@@ -122,7 +123,8 @@
       // If the previous block was a loop block, decerement the index so the following
       // steps are in the correct order
       if (wasLoopBlock) {
-        blockIdx--
+        loopBlockCount++
+        continue
       }
 
       let schema = allSteps[idx]?.schema?.outputs?.properties ?? {}
@@ -143,8 +145,8 @@
           let runtimeName = isLoopBlock
             ? `loop.${name}`
             : block.name.startsWith("JS")
-            ? `steps[${idx}].${name}`
+            ? `steps[${idx - loopBlockCount}].${name}`
-            : `steps.${idx}.${name}`
+            : `steps.${idx - loopBlockCount}.${name}`
           const runtime = idx === 0 ? `trigger.${name}` : runtimeName
           return {
             label: runtime,
@@ -155,7 +157,7 @@
                 ? "Trigger outputs"
                 : isLoopBlock
                 ? "Loop Outputs"
-                : `Step ${idx} outputs`,
+                : `Step ${idx - loopBlockCount} outputs`,
             path: runtime,
           }
         })
@@ -229,6 +231,7 @@
             {bindings}
             {schemaFields}
             panel={AutomationBindingPanel}
+            fillWidth
           />
         </Drawer>
       {:else if value.customType === "password"}

packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte

@@ -90,6 +90,16 @@
     if (inSchema(toTable, toRelate.name, originalToName)) {
       errObj.toCol = colError
     }
+
+    let fromType, toType
+    if (fromPrimary && fromRelate.fieldName) {
+      fromType = fromTable?.schema[fromPrimary]?.type
+      toType = toTable?.schema[fromRelate.fieldName]?.type
+    }
+    if (fromType && toType && fromType !== toType) {
+      errObj.foreign =
+        "Column type of the foreign key must match the primary key"
+    }
     errors = errObj
   }
 

packages/builder/src/components/common/bindings/BindingPanel.svelte

@@ -247,7 +247,7 @@
                       return
                     }
                     hoverTarget = {
-                      title: binding.display.name || binding.fieldSchema.name,
+                      title: binding.display?.name || binding.fieldSchema.name,
                       description: binding.description,
                     }
                     popover.show()

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

@@ -32,6 +32,8 @@
           {
             readableBinding: "Value",
             runtimeBinding: "[value]",
+            category: `Column: ${column.name}`,
+            icon: "TableColumnMerge",
           },
         ]}
       />

packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte

@@ -27,6 +27,7 @@
   export let panel = ClientBindingPanel
   export let allowBindings = true
   export let allOr = false
+  export let fillWidth = false
 
   $: dispatch("change", filters)
   $: enrichedSchemaFields = getFields(schemaFields || [])
@@ -177,6 +178,7 @@
                   {panel}
                   {bindings}
                   on:change={event => (filter.value = event.detail)}
+                  {fillWidth}
                 />
               {:else if ["string", "longform", "number", "formula"].includes(filter.type)}
                 <Input disabled={filter.noValue} bind:value={filter.value} />

packages/builder/src/components/start/AppRow.svelte

@@ -9,7 +9,7 @@
 </script>
 
 <div class="title" data-cy={`${app.devId}`}>
-  <div style="display: flex;">
+  <div>
     <div class="app-icon" style="color: {app.icon?.color || ''}">
       <Icon size="XL" name={app.icon?.name || "Apps"} />
     </div>
@@ -61,6 +61,11 @@
 </div>
 
 <style>
+  div.title,
+  div.title > div {
+    display: flex;
+    max-width: 100%;
+  }
   .app-row-actions {
     grid-gap: var(--spacing-s);
     display: flex;

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

@@ -478,9 +478,10 @@
   .appTable :global(> div) {
     border-bottom: var(--border-light);
   }
+
   @media (max-width: 640px) {
     .appTable {
-      grid-template-columns: 1fr auto;
+      grid-template-columns: 1fr auto !important;
     }
   }
   .empty-wrapper {

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

@@ -34,8 +34,7 @@ export function createPluginsStore() {
     }
 
     let res = await API.createPlugin(pluginData)
-
+    let newPlugin = res.plugin
-    let newPlugin = res.plugins[0]
     update(state => {
       const currentIdx = state.findIndex(plugin => plugin._id === newPlugin._id)
       if (currentIdx >= 0) {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -26,7 +26,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^1.4.3",
+    "@budibase/backend-core": "^1.4.16",
+    "@budibase/string-templates": "^1.4.16",
+    "@budibase/types": "^1.4.16",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "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.4.3",
+    "@budibase/bbui": "^1.4.16",
-    "@budibase/frontend-core": "^1.4.3",
+    "@budibase/frontend-core": "^1.4.16",
-    "@budibase/string-templates": "^1.4.3",
+    "@budibase/string-templates": "^1.4.16",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/client/src/components/app/embedded-map/EmbeddedMap.svelte

@@ -374,6 +374,11 @@
     min-height: 180px;
     min-width: 200px;
   }
+  .embedded-map :global(a.map-svg-button) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
   .embedded-map :global(.leaflet-top),
   .embedded-map :global(.leaflet-bottom) {
     z-index: 998;

packages/client/src/components/app/embedded-map/EmbeddedMapControls.js

@@ -37,7 +37,7 @@ const FullScreenControl = L.Control.extend({
     this._fullScreenButton = this._createButton(
       options.fullScreenContent,
       options.fullScreenTitle,
-      "map-fullscreen",
+      "map-fullscreen map-svg-button",
       container,
       this._fullScreen
     )
@@ -87,7 +87,7 @@ const LocationControl = L.Control.extend({
     this._locationButton = this._createButton(
       options.locationContent,
       options.locationTitle,
-      "map-location",
+      "map-location map-svg-button",
       container,
       this._location
     )

packages/client/src/websocket.js

@@ -1,12 +1,13 @@
-import { builderStore } from "./stores/index.js"
+import { builderStore, environmentStore } from "./stores/index.js"
 import { get } from "svelte/store"
 import { io } from "socket.io-client"
 
 export const initWebsocket = () => {
   const { inBuilder, location } = get(builderStore)
+  const { cloud } = get(environmentStore)
 
   // Only connect when we're inside the builder preview, for now
-  if (!inBuilder || !location) {
+  if (!inBuilder || !location || cloud) {
     return
   }
 
@@ -17,6 +18,14 @@ export const initWebsocket = () => {
   const port = location.port || (tls ? 443 : 80)
   const socket = io(`${proto}//${host}:${port}`, {
     path: "/socket/client",
+    // Cap reconnection attempts to 10 (total of 95 seconds before giving up)
+    reconnectionAttempts: 10,
+    // Delay initial reconnection attempt by 5 seconds
+    reconnectionDelay: 5000,
+    // Then decrease to 10 second intervals
+    reconnectionDelayMax: 10000,
+    // Timeout after 5 seconds so we never stack requests
+    timeout: 5000,
   })
 
   // Event handlers

packages/frontend-core/package.json

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

packages/frontend-core/src/fetch/DataFetch.js

@@ -136,14 +136,12 @@ export default class DataFetch {
     }
 
     // Determine what sort type to use
-    if (!this.options.sortType) {
+    let sortType = "string"
-      let sortType = "string"
+    if (sortColumn) {
-      if (sortColumn) {
+      const type = schema?.[sortColumn]?.type
-        const type = schema?.[sortColumn]?.type
+      sortType = type === "number" ? "number" : "string"
-        sortType = type === "number" ? "number" : "string"
-      }
-      this.options.sortType = sortType
     }
+    this.options.sortType = sortType
 
     // Build the lucene query
     let query = this.options.query

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "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.4.3",
+    "@budibase/backend-core": "^1.4.16",
-    "@budibase/client": "^1.4.3",
+    "@budibase/client": "^1.4.16",
-    "@budibase/pro": "1.4.3",
+    "@budibase/pro": "1.4.16",
-    "@budibase/string-templates": "^1.4.3",
+    "@budibase/string-templates": "^1.4.16",
-    "@budibase/types": "^1.4.3",
+    "@budibase/types": "^1.4.16",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",

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

@@ -304,7 +304,7 @@ const performAppCreate = async (ctx: any) => {
     })
 
     // Migrate navigation settings and screens if required
-    if (existing && !existing.navigation) {
+    if (existing) {
       const navigation = await migrateAppNavigation()
       if (navigation) {
         newApplication.navigation = navigation
@@ -601,7 +601,7 @@ const migrateAppNavigation = async () => {
   // Migrate all screens, removing custom layouts
   for (let screen of screens) {
     if (!screen.layoutId) {
-      return
+      continue
     }
     const layout = layouts.find(layout => layout._id === screen.layoutId)
     screen.layoutId = undefined
@@ -615,7 +615,7 @@ const migrateAppNavigation = async () => {
   const layout = layouts?.find(
     (layout: Layout) => layout._id === BASE_LAYOUT_PROP_IDS.PRIVATE
   )
-  if (layout) {
+  if (layout && !existing.navigation) {
     let navigationSettings: any = {
       navigation: "Top",
       title: name,

packages/server/src/api/controllers/plugin/index.ts

@@ -129,6 +129,6 @@ export async function processUploadedPlugin(
   }
 
   const doc = await plugins.storePlugin(metadata, directory, source)
-  ClientAppSocket.emit("plugins-update", { name: doc.name, hash: doc.hash })
+  ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
   return doc
 }

packages/server/src/automations/steps/queryRows.js

@@ -80,7 +80,7 @@ exports.definition = {
         },
         success: {
           type: "boolean",
-          description: "Whether the deletion was successful",
+          description: "Whether the query was successful",
         },
       },
       required: ["rows", "success"],

packages/server/src/integrations/mysql.ts

@@ -30,6 +30,7 @@ interface MySQLConfig {
   ssl?: { [key: string]: any }
   rejectUnauthorized: boolean
   typeCast: Function
+  multipleStatements: boolean
 }
 
 const SCHEMA: Integration = {
@@ -136,6 +137,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
     delete config.rejectUnauthorized
     this.config = {
       ...config,
+      multipleStatements: true,
       typeCast: function (field: any, next: any) {
         if (
           field.type == "DATETIME" ||

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

@@ -0,0 +1,12 @@
+import { tenancy, logging } from "@budibase/backend-core"
+import { plugins } from "@budibase/pro"
+
+export const run = async () => {
+  try {
+    await tenancy.doInTenant(tenancy.DEFAULT_TENANT_ID, async () => {
+      await plugins.checkPluginQuotas()
+    })
+  } catch (err) {
+    logging.logAlert("Failed to update plugin quotas", err)
+  }
+}

packages/server/src/migrations/index.ts

@@ -7,6 +7,7 @@ import * as userEmailViewCasing from "./functions/userEmailViewCasing"
 import * as quota1 from "./functions/quotas1"
 import * as appUrls from "./functions/appUrls"
 import * as backfill from "./functions/backfill"
+import * as pluginCount from "./functions/pluginCount"
 
 /**
  * Populate the migration function and additional configuration from
@@ -68,6 +69,16 @@ export const buildMigrations = () => {
         })
         break
       }
+      case MigrationName.PLUGIN_COUNT: {
+        if (env.SELF_HOSTED) {
+          serverMigrations.push({
+            ...definition,
+            fn: pluginCount.run,
+            silent: !!env.SELF_HOSTED,
+            preventRetry: false,
+          })
+        }
+      }
     }
   }
 

packages/server/yarn.lock

@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.4.3":
+"@budibase/backend-core@1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3.tgz#b071e9e16ac224efc4193b0a7030f68f4de30cf6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.16.tgz#71d5e50db4b8c669f4d353563a78b30cc1d39e86"
-  integrity sha512-LOiX4QFNpRWj6EV0i6OsIrP+uYlLQdcmPPa89N7G8XzaMoRUgfiLKctiIVcObiKZRht1vfnCcOq2BiE/1PMCrQ==
+  integrity sha512-uFq49pw/P8QUjT9YEBmaXj04zwjYHLxKGp2bcG8dnzE7BGXfCbvMbgO732brYhk1hRvCUw5DbAjEIFTDj6VZFA==
   dependencies:
-    "@budibase/types" "^1.4.3"
+    "@budibase/types" "^1.4.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -1180,13 +1180,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.4.3":
+"@budibase/pro@1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3.tgz#3d94397711ce8dc32b7c3c4fd3d1a7b05e730059"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.16.tgz#746db325e5704b222b42567eea7babd528a0d6a6"
-  integrity sha512-GmZMA1xElsTTIYNegpzKpE2p7RWWyVbWWkPqmCFXnZlji8VoVwQRs/PnJhqYxo4CQguNp8F7NuCtjmNKpgUYBg==
+  integrity sha512-6nWEKzpFWUP+zTzeCVDzQqUMZNTsH3ACZ9jnZ0tj5RiREakux3UOwvQAWwzbQu4p7myru44s4sQeuVjgg6aufw==
   dependencies:
-    "@budibase/backend-core" "1.4.3"
+    "@budibase/backend-core" "1.4.16"
-    "@budibase/types" "1.4.3"
+    "@budibase/types" "1.4.16"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1209,10 +1209,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.4.3", "@budibase/types@^1.4.3":
+"@budibase/types@1.4.16", "@budibase/types@^1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3.tgz#cc765bf2882af8f82bc1d8d2dff2a99e79cabc52"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.16.tgz#18165147d0e145c855354f558062a080df939a19"
-  integrity sha512-/V7zUOlTDCCp6aRLtH2ZrHBweHEgpaIJcXJJIePugSc3n2cFCoD/W0MCMWdvrT1x3ocLzU1P5TpwQJ5fyVH4Kg==
+  integrity sha512-evA9FeSkJOTXodrY+1X1JXSNYcNdlGEvVqpY6ePhmqsCTuefYS5BPsNsHOshcj49eZk6iraUM5Lm8TNQRstu1Q==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "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.4.3",
+  "version": "1.4.16",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/types/src/sdk/migrations.ts

@@ -46,6 +46,7 @@ export enum MigrationName {
   EVENT_INSTALLATION_BACKFILL = "event_installation_backfill",
   GLOBAL_INFO_SYNC_USERS = "global_info_sync_users",
   PLATFORM_USERS_EMAIL_CASING = "platform_users_email_casing",
+  PLUGIN_COUNT = "plugin_count",
 }
 
 export interface MigrationDefinition {

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.4.3",
+  "version": "1.4.16",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.4.3",
+    "@budibase/backend-core": "^1.4.16",
-    "@budibase/pro": "1.4.3",
+    "@budibase/pro": "1.4.16",
-    "@budibase/string-templates": "^1.4.3",
+    "@budibase/string-templates": "^1.4.16",
-    "@budibase/types": "^1.4.3",
+    "@budibase/types": "^1.4.16",
     "@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.4.3":
+"@budibase/backend-core@1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3.tgz#b071e9e16ac224efc4193b0a7030f68f4de30cf6"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.16.tgz#71d5e50db4b8c669f4d353563a78b30cc1d39e86"
-  integrity sha512-LOiX4QFNpRWj6EV0i6OsIrP+uYlLQdcmPPa89N7G8XzaMoRUgfiLKctiIVcObiKZRht1vfnCcOq2BiE/1PMCrQ==
+  integrity sha512-uFq49pw/P8QUjT9YEBmaXj04zwjYHLxKGp2bcG8dnzE7BGXfCbvMbgO732brYhk1hRvCUw5DbAjEIFTDj6VZFA==
   dependencies:
-    "@budibase/types" "^1.4.3"
+    "@budibase/types" "^1.4.16"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
@@ -327,21 +327,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.4.3":
+"@budibase/pro@1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3.tgz#3d94397711ce8dc32b7c3c4fd3d1a7b05e730059"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.16.tgz#746db325e5704b222b42567eea7babd528a0d6a6"
-  integrity sha512-GmZMA1xElsTTIYNegpzKpE2p7RWWyVbWWkPqmCFXnZlji8VoVwQRs/PnJhqYxo4CQguNp8F7NuCtjmNKpgUYBg==
+  integrity sha512-6nWEKzpFWUP+zTzeCVDzQqUMZNTsH3ACZ9jnZ0tj5RiREakux3UOwvQAWwzbQu4p7myru44s4sQeuVjgg6aufw==
   dependencies:
-    "@budibase/backend-core" "1.4.3"
+    "@budibase/backend-core" "1.4.16"
-    "@budibase/types" "1.4.3"
+    "@budibase/types" "1.4.16"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.4.3", "@budibase/types@^1.4.3":
+"@budibase/types@1.4.16", "@budibase/types@^1.4.16":
-  version "1.4.3"
+  version "1.4.16"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3.tgz#cc765bf2882af8f82bc1d8d2dff2a99e79cabc52"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.16.tgz#18165147d0e145c855354f558062a080df939a19"
-  integrity sha512-/V7zUOlTDCCp6aRLtH2ZrHBweHEgpaIJcXJJIePugSc3n2cFCoD/W0MCMWdvrT1x3ocLzU1P5TpwQJ5fyVH4Kg==
+  integrity sha512-evA9FeSkJOTXodrY+1X1JXSNYcNdlGEvVqpY6ePhmqsCTuefYS5BPsNsHOshcj49eZk6iraUM5Lm8TNQRstu1Q==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"

qa-core/src/tests/public-api/tables/rows.spec.ts

@@ -32,7 +32,8 @@ describe("Public API - /rows endpoints", () => {
     expect(row._id).toBeDefined()
   })
 
-  it("POST - Search rows", async () => {
+  // search really isn't supported
+  xit("POST - Search rows", async () => {
     const [response, rows] = await config.rows.search({
       query: {
         string: {