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

Merge remote-tracking branch 'origin/master' into fix/json-field-in-automation-step

This commit is contained in:
Dean 2022-10-21 15:35:34 +01:00
parent 7bfd07ac6c f840cb1d05
commit 11189205ff
24 changed files with 134 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,10 @@ spec:
value: {{ .Values.services.objectStore.url }}
- name: PLUGIN_BUCKET_NAME
value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
- name: APPS_BUCKET_NAME
value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
- name: GLOBAL_CLOUD_BUCKET_NAME
value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
- name: PORT
value: {{ .Values.services.apps.port | quote }}
{{ if .Values.services.worker.publicApiRateLimitPerSecond }}

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

@ -79,6 +79,10 @@ spec:
value: {{ .Values.services.objectStore.url }}
- name: PLUGIN_BUCKET_NAME
value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
- name: APPS_BUCKET_NAME
value: {{ .Values.services.objectStore.appsBucketName | default "apps" | quote }}
- name: GLOBAL_CLOUD_BUCKET_NAME
value: {{ .Values.services.objectStore.globalBucketName | default "global" | quote }}
- name: PORT
value: {{ .Values.services.worker.port | quote }}
- name: MULTI_TENANCY

0
hosting/proxy/10-listen-on-ipv6-by-default.sh → hosting/proxy/80-listen-on-ipv6-by-default.sh
View File

5
hosting/proxy/Dockerfile
View File

@ -5,7 +5,10 @@ FROM nginx:latest
# override the output dir to output directly to /etc/nginx instead of /etc/nginx/conf.d
ENV NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
COPY .generated-nginx.prod.conf /etc/nginx/templates/nginx.conf.template
COPY 10-listen-on-ipv6-by-default.sh /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
# IPv6 removal needs to happen after envsubst
RUN rm -rf /docker-entrypoint.d/10-listen-on-ipv6-by-default.sh
COPY 80-listen-on-ipv6-by-default.sh /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
RUN chmod +x /docker-entrypoint.d/80-listen-on-ipv6-by-default.sh
# Error handling
COPY error.html /usr/share/nginx/html/error.html

2
lerna.json
View File

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

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

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

4
packages/bbui/package.json
View File

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

10
packages/builder/package.json
View File

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

2
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -487,7 +487,7 @@
]}
getOptionLabel={option => option.label}
getOptionValue={option => option.value}
tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered,
tooltip="Dynamic formula are calculated when retrieved, but cannot be filtered or sorted by,
while static formula are calculated when the row is saved."
/>
{/if}

2
packages/builder/src/components/design/settings/componentSettings.js
View File

@ -7,6 +7,7 @@ import TableSelect from "./controls/TableSelect.svelte"
import ColorPicker from "./controls/ColorPicker.svelte"
import { IconSelect } from "./controls/IconSelect"
import FieldSelect from "./controls/FieldSelect.svelte"
import SortableFieldSelect from "./controls/SortableFieldSelect.svelte"
import MultiFieldSelect from "./controls/MultiFieldSelect.svelte"
import SearchFieldSelect from "./controls/SearchFieldSelect.svelte"
import SchemaSelect from "./controls/SchemaSelect.svelte"
@ -41,6 +42,7 @@ const componentMap = {
filter: FilterEditor,
url: URLSelect,
columns: ColumnEditor,
"field/sortable": SortableFieldSelect,
"field/string": FormFieldSelect,
"field/number": FormFieldSelect,
"field/options": FormFieldSelect,

47
packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte Normal file
View File

@ -0,0 +1,47 @@
<script>
import { Select } from "@budibase/bbui"
import {
getDatasourceForProvider,
getSchemaForDatasource,
} from "builderStore/dataBinding"
import { currentAsset } from "builderStore"
import { createEventDispatcher } from "svelte"
import { UNSORTABLE_TYPES } from "constants"
export let componentInstance = {}
export let value = ""
export let placeholder
const dispatch = createEventDispatcher()
$: datasource = getDatasourceForProvider($currentAsset, componentInstance)
$: schema = getSchemaForDatasource($currentAsset, datasource).schema
$: options = getSortableFields(schema)
$: boundValue = getValidValue(value, options)
const getSortableFields = schema => {
return Object.entries(schema || {})
.filter(entry => !UNSORTABLE_TYPES.includes(entry[1].type))
.map(entry => entry[0])
}
const getValidValue = (value, options) => {
// Reset value if there aren't any options
if (!Array.isArray(options)) {
return null
}
// Reset value if the value isn't found in the options
if (options.indexOf(value) === -1) {
return null
}
return value
}
const onChange = value => {
boundValue = getValidValue(value.detail, options)
dispatch("change", boundValue)
}
</script>
<Select {placeholder} value={boundValue} on:change={onChange} {options} />

2
packages/builder/src/pages/builder/portal/manage/plugins/index.svelte
View File

@ -55,7 +55,7 @@
Add plugin
</Button>
</div>
{#if filteredPlugins?.length}
{#if $plugins?.length}
<div class="filters">
<div class="select">
<Select

8
packages/cli/package.json
View File

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

8
packages/client/manifest.json
View File

@ -3523,7 +3523,7 @@
"key": "filter"
},
{
"type": "field",
"type": "field/sortable",
"label": "Sort Column",
"key": "sortColumn"
},
@ -3853,7 +3853,7 @@
"key": "filter"
},
{
"type": "field",
"type": "field/sortable",
"label": "Sort Column",
"key": "sortColumn"
},
@ -4018,7 +4018,7 @@
"key": "filter"
},
{
"type": "field",
"type": "field/sortable",
"label": "Sort Column",
"key": "sortColumn"
},
@ -4177,7 +4177,7 @@
"key": "filter"
},
{
"type": "field",
"type": "field/sortable",
"label": "Sort Column",
"key": "sortColumn"
},

8
packages/client/package.json
View File

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

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

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

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.0.30",
"version": "2.0.34",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

12
packages/server/package.json
View File

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

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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
"@budibase/backend-core@2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
dependencies:
"@budibase/types" "^2.0.30"
"@budibase/types" "^2.0.34"
"@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@2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
"@budibase/pro@2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
dependencies:
"@budibase/backend-core" "2.0.30"
"@budibase/types" "2.0.30"
"@budibase/backend-core" "2.0.34"
"@budibase/types" "2.0.34"
"@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@2.0.30", "@budibase/types@^2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
"@bull-board/api@3.7.0":
version "3.7.0"

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

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

3
packages/string-templates/src/index.js
View File

@ -323,6 +323,9 @@ module.exports.doesContainStrings = (template, strings) => {
* @return {string[]} The found HBS blocks.
*/
module.exports.findHBSBlocks = string => {
if (!string || typeof string !== "string") {
return []
}
let regexp = new RegExp(FIND_ANY_HBS_REGEX)
let matches = string.match(regexp)
if (matches == null) {

2
packages/types/package.json
View File

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

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "2.0.30",
"version": "2.0.34",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^2.0.30",
"@budibase/pro": "2.0.30",
"@budibase/string-templates": "^2.0.30",
"@budibase/types": "^2.0.30",
"@budibase/backend-core": "^2.0.34",
"@budibase/pro": "2.0.34",
"@budibase/string-templates": "^2.0.34",
"@budibase/types": "^2.0.34",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.30.tgz#5cc53e8560572d789ae687ec2181b629526c2f3f"
integrity sha512-+X4DwtMf1Xv4ygG7OJN0wOxZgjJ1wul1gUVOXJm44sRIEOx0LHpyx8xT4npC9e2VKKezpF5GZFE2IrB9lwWsoQ==
"@budibase/backend-core@2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34.tgz#67d140a55a3a1bc807bb60bf06062e1361588977"
integrity sha512-ofJZNOTA8oO5FxhwBPEuZ6Rq7lO47QkHVreEvESgAb4aJLpCoLNmWhizKN2iRgZ0+avgoauAd36Yj+qI1mVjkQ==
dependencies:
"@budibase/types" "^2.0.30"
"@budibase/types" "^2.0.34"
"@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@2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.30.tgz#4c739ed97e04d6dfc875dfb550262ef7085dc9d4"
integrity sha512-unel/xYLpeWUI+I0vstITH9UTVkjKS+SS0Ce4jCQlpMyOSB8zCie/sO6Ie2TakrI+vnuYuypnRT8fqlbgtrNyA==
"@budibase/pro@2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34.tgz#8b8e51bd847eb415f259d71b26c6f89ed2166a49"
integrity sha512-lJQAOw9SBDkLwLsglriGNIuOHMPNrKzLCRCCpETGNuhnRi/kvILck1lk3oyhz3dxllyBb8iDOMleEUBxSAum1Q==
dependencies:
"@budibase/backend-core" "2.0.30"
"@budibase/types" "2.0.30"
"@budibase/backend-core" "2.0.34"
"@budibase/types" "2.0.34"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@2.0.30", "@budibase/types@^2.0.30":
version "2.0.30"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.30.tgz#ac3d2d714ebf2820875150739959e5f6b851aceb"
integrity sha512-46uCHPcLAAjAFRkE53skS7oLjI/Fa+2Mn4vZjIApa1/0JXyR2HnzTzJocbrQfYFTYLkdniMfLRticcKC/E2X1w==
"@budibase/types@2.0.34", "@budibase/types@^2.0.34":
version "2.0.34"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34.tgz#1a7c483a1577596cc896d5d03f04ebafe037b664"
integrity sha512-pt8/gCRuErKfSv3sVu75bHSjgpPv/bAaMb+Vam1xyp0gY7YUR1yBhllWY0tEIVXroCe0kgn40+fKZOR2Yli0ag==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"