MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into bug/sev2/is-in-filter-startswith-crash

This commit is contained in:
Andrew Kingston 2022-09-26 15:04:02 +01:00
parent eaddd72d66 07e6538ced
commit 8563f1df90
35 changed files with 183 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/budibase/templates/app-service-deployment.yaml
View File

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

2
charts/budibase/templates/worker-service-deployment.yaml
View File

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

2
lerna.json
View File

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

4
packages/backend-core/package.json
View File

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

4
packages/backend-core/src/context/index.ts
View File

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

25
packages/backend-core/src/environment.ts
View File

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

4
packages/backend-core/src/migrations/definitions.ts
View File

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

5
packages/backend-core/src/objectStore/utils.js
View File

@ -2,6 +2,11 @@ const { join } = require("path")
const { tmpdir } = require("os") const { tmpdir } = require("os")
const env = require("../environment") 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 = { exports.ObjectStoreBuckets = {
BACKUPS: env.BACKUPS_BUCKET_NAME, BACKUPS: env.BACKUPS_BUCKET_NAME,
APPS: env.APPS_BUCKET_NAME, APPS: env.APPS_BUCKET_NAME,

4
packages/bbui/package.json
View File

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

5
packages/bbui/src/Form/Core/Dropzone.svelte
View File

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

6
packages/bbui/src/Table/AttachmentRenderer.svelte
View File

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

10
packages/builder/package.json
View File

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

13
packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
View File

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

10
packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
View File

@ -90,6 +90,16 @@
if (inSchema(toTable, toRelate.name, originalToName)) { if (inSchema(toTable, toRelate.name, originalToName)) {
errObj.toCol = colError 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 errors = errObj
} }

2
packages/builder/src/components/common/bindings/BindingPanel.svelte
View File

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

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

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

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

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

7
packages/builder/src/components/start/AppRow.svelte
View File

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

3
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

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

8
packages/cli/package.json
View File

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

8
packages/client/package.json
View File

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

13
packages/client/src/websocket.js
View File

@ -1,12 +1,13 @@
import { builderStore } from "./stores/index.js" import { builderStore, environmentStore } from "./stores/index.js"
import { get } from "svelte/store" import { get } from "svelte/store"
import { io } from "socket.io-client" import { io } from "socket.io-client"
export const initWebsocket = () => { export const initWebsocket = () => {
const { inBuilder, location } = get(builderStore) const { inBuilder, location } = get(builderStore)
const { cloud } = get(environmentStore)
// Only connect when we're inside the builder preview, for now // Only connect when we're inside the builder preview, for now
if (!inBuilder || !location) { if (!inBuilder || !location || cloud) {
return return
} }
@ -17,6 +18,14 @@ export const initWebsocket = () => {
const port = location.port || (tls ? 443 : 80) const port = location.port || (tls ? 443 : 80)
const socket = io(`${proto}//${host}:${port}`, { const socket = io(`${proto}//${host}:${port}`, {
path: "/socket/client", 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 // Event handlers

4
packages/frontend-core/package.json
View File

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

2
packages/frontend-core/src/fetch/DataFetch.js
View File

@ -136,14 +136,12 @@ export default class DataFetch {
} }
// Determine what sort type to use // 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 // Build the lucene query
let query = this.options.query let query = this.options.query

12
packages/server/package.json
View File

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

2
packages/server/src/automations/steps/queryRows.js
View File

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

12
packages/server/src/migrations/functions/pluginCount.ts Normal file
View File

@ -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)
}
}

11
packages/server/src/migrations/index.ts
View File

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

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.7": "@budibase/backend-core@1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.16.tgz#71d5e50db4b8c669f4d353563a78b30cc1d39e86"
integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ== integrity sha512-uFq49pw/P8QUjT9YEBmaXj04zwjYHLxKGp2bcG8dnzE7BGXfCbvMbgO732brYhk1hRvCUw5DbAjEIFTDj6VZFA==
dependencies: dependencies:
"@budibase/types" "^1.4.7" "@budibase/types" "^1.4.16"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@1.4.7": "@budibase/pro@1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.16.tgz#746db325e5704b222b42567eea7babd528a0d6a6"
integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg== integrity sha512-6nWEKzpFWUP+zTzeCVDzQqUMZNTsH3ACZ9jnZ0tj5RiREakux3UOwvQAWwzbQu4p7myru44s4sQeuVjgg6aufw==
dependencies: dependencies:
"@budibase/backend-core" "1.4.7" "@budibase/backend-core" "1.4.16"
"@budibase/types" "1.4.7" "@budibase/types" "1.4.16"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@1.4.7", "@budibase/types@^1.4.7": "@budibase/types@1.4.16", "@budibase/types@^1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.16.tgz#18165147d0e145c855354f558062a080df939a19"
integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g== integrity sha512-evA9FeSkJOTXodrY+1X1JXSNYcNdlGEvVqpY6ePhmqsCTuefYS5BPsNsHOshcj49eZk6iraUM5Lm8TNQRstu1Q==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

2
packages/string-templates/package.json
View File

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "1.4.7", "version": "1.4.16",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

1
packages/types/src/sdk/migrations.ts
View File

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

10
packages/worker/package.json
View File

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

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.7": "@budibase/backend-core@1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.7.tgz#964019383fd3d7e0acc98cc025dbb85d060c4288" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.16.tgz#71d5e50db4b8c669f4d353563a78b30cc1d39e86"
integrity sha512-2o3WYFssVFCnSTx8JyEGRGEqGwExrKm5Ab+z44sREjFHIv3NgFXbde65D66U1tzi5vWD+gB3SfDKxNeyg+xqLQ== integrity sha512-uFq49pw/P8QUjT9YEBmaXj04zwjYHLxKGp2bcG8dnzE7BGXfCbvMbgO732brYhk1hRvCUw5DbAjEIFTDj6VZFA==
dependencies: dependencies:
"@budibase/types" "^1.4.7" "@budibase/types" "^1.4.16"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@1.4.7": "@budibase/pro@1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.7.tgz#05d0aac81a7a5e57226e6d7c80db83a3f1095ec1" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.16.tgz#746db325e5704b222b42567eea7babd528a0d6a6"
integrity sha512-a/l+Dfs8AlLWjVZ9MN7f5HzeczWZbiPJGjzeLHEjPdbjXZ/52RZfz1M8oR1FVo/Ph+XpJALck+B1ai9rDzOyXg== integrity sha512-6nWEKzpFWUP+zTzeCVDzQqUMZNTsH3ACZ9jnZ0tj5RiREakux3UOwvQAWwzbQu4p7myru44s4sQeuVjgg6aufw==
dependencies: dependencies:
"@budibase/backend-core" "1.4.7" "@budibase/backend-core" "1.4.16"
"@budibase/types" "1.4.7" "@budibase/types" "1.4.16"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@1.4.7", "@budibase/types@^1.4.7": "@budibase/types@1.4.16", "@budibase/types@^1.4.16":
version "1.4.7" version "1.4.16"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.7.tgz#6d352516e26c416a47bcf82915c9f92af3f6fce7" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.16.tgz#18165147d0e145c855354f558062a080df939a19"
integrity sha512-lBU0gfRwZCwssKJKo3rCq4kyfW/BAed8zrH40j/KJIrdcw28Jh0WSrr/wOynOgMdCBoh1oHZsRJr1SfZp/wh4g== integrity sha512-evA9FeSkJOTXodrY+1X1JXSNYcNdlGEvVqpY6ePhmqsCTuefYS5BPsNsHOshcj49eZk6iraUM5Lm8TNQRstu1Q==
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":
version "0.8.0" version "0.8.0"

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

@ -32,7 +32,8 @@ describe("Public API - /rows endpoints", () => {
expect(row._id).toBeDefined() 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({ const [response, rows] = await config.rows.search({
query: { query: {
string: { string: {