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

Merge branch 'develop' of github.com:Budibase/budibase into copy-paste-improvements

This commit is contained in:
Andrew Kingston 2022-03-08 17:58:12 +00:00
parent eabe1a0057 516cadab9d
commit 556c71ed31
17 changed files with 1377 additions and 2160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

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

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "src/index.js", "main": "src/index.js",
"author": "Budibase", "author": "Budibase",

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.0.81-alpha.0", "version": "1.0.81-alpha.4",
"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.0.81-alpha.0", "@budibase/string-templates": "^1.0.81-alpha.4",
"@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",

935
packages/bbui/yarn.lock
View File

File diff suppressed because it is too large Load Diff

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -65,10 +65,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.81-alpha.0", "@budibase/bbui": "^1.0.81-alpha.4",
"@budibase/client": "^1.0.81-alpha.0", "@budibase/client": "^1.0.81-alpha.4",
"@budibase/frontend-core": "^1.0.81-alpha.0", "@budibase/frontend-core": "^1.0.81-alpha.4",
"@budibase/string-templates": "^1.0.81-alpha.0", "@budibase/string-templates": "^1.0.81-alpha.4",
"@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",

39
packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte
View File

@ -1,10 +1,26 @@
<script> <script>
import { Label, Select, Body } from "@budibase/bbui" import { Label, Select, Body } from "@budibase/bbui"
import { tables } from "stores/backend" import { findAllMatchingComponents } from "builderStore/componentUtils"
import { currentAsset } from "builderStore"
import { onMount } from "svelte" import { onMount } from "svelte"
export let parameters export let parameters
$: tableOptions = $tables.list || []
$: tables = findAllMatchingComponents($currentAsset?.props, component =>
component._component.endsWith("table")
).map(table => ({
label: table._instanceName,
value: table._id,
}))
$: tableBlocks = findAllMatchingComponents($currentAsset?.props, component =>
component._component.endsWith("tableblock")
).map(block => ({
label: block._instanceName,
value: `${block._id}-table`,
}))
$: componentOptions = tables.concat(tableBlocks)
const FORMATS = [ const FORMATS = [
{ {
@ -26,21 +42,20 @@
<div class="root"> <div class="root">
<Body size="S"> <Body size="S">
Choose the table that you would like to export your row selection from. Choose the table component that you would like to export your row selection
from.
<br /> <br />
Please ensure you have enabled row selection in the table settings Please ensure you have enabled row selection in the table settings.
</Body> </Body>
<div class="params"> <div class="params">
<Label small>Table</Label> <Label small>Table</Label>
<Select <Select
bind:value={parameters.tableId} bind:value={parameters.tableComponentId}
options={tableOptions} options={componentOptions}
getOptionLabel={option => option.name}
getOptionValue={option => option._id}
/> />
<Label small>Type</Label> <Label small>Export as</Label>
<Select bind:value={parameters.type} options={FORMATS} /> <Select bind:value={parameters.type} options={FORMATS} />
</div> </div>
</div> </div>
@ -48,7 +63,7 @@
<style> <style>
.root { .root {
width: 100%; width: 100%;
max-width: 800px; max-width: 500px;
margin: 0 auto; margin: 0 auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -63,9 +78,9 @@
.params { .params {
display: grid; display: grid;
column-gap: var(--spacing-l); column-gap: var(--spacing-xs);
row-gap: var(--spacing-s); row-gap: var(--spacing-s);
grid-template-columns: 100px 1fr; grid-template-columns: 70px 1fr;
align-items: center; align-items: center;
} }
</style> </style>

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"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": {

22
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"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,12 +19,26 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^1.0.81-alpha.0", "@budibase/bbui": "^1.0.80-alpha.6",
"@budibase/frontend-core": "^1.0.81-alpha.0", "@budibase/frontend-core": "^1.0.80-alpha.6",
"@budibase/string-templates": "^1.0.81-alpha.0", "@budibase/string-templates": "^1.0.80-alpha.6",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",
"@spectrum-css/link": "^3.1.3",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/tag": "^3.1.4",
"@spectrum-css/typography": "^3.0.2",
"@spectrum-css/vars": "^3.0.1",
"apexcharts": "^3.22.1",
"dayjs": "^1.10.5",
"downloadjs": "1.4.7",
"regexparam": "^1.3.0", "regexparam": "^1.3.0",
"rollup-plugin-polyfill-node": "^0.8.0", "rollup-plugin-polyfill-node": "^0.8.0",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"svelte": "^3.38.2",
"svelte-apexcharts": "^1.0.2",
"svelte-flatpickr": "^3.1.0",
"svelte-spa-router": "^3.0.5" "svelte-spa-router": "^3.0.5"
}, },
"devDependencies": { "devDependencies": {

6
packages/client/src/stores/rowSelection.js
View File

@ -10,12 +10,12 @@ const createRowSelectionStore = () => {
}) })
} }
function getSelection(tableId) { function getSelection(tableComponentId) {
const selection = get(store) const selection = get(store)
const componentId = Object.keys(selection).find( const componentId = Object.keys(selection).find(
componentId => selection[componentId].tableId === tableId componentId => componentId === tableComponentId
) )
return componentId ? selection[componentId] : {} return selection[componentId] || {}
} }
return { return {

2
packages/client/src/utils/buttonActions.js
View File

@ -243,7 +243,7 @@ const s3UploadHandler = async action => {
const exportDataHandler = async action => { const exportDataHandler = async action => {
let selection = rowSelectionStore.actions.getSelection( let selection = rowSelectionStore.actions.getSelection(
action.parameters.tableId action.parameters.tableComponentId
) )
if (selection.selectedRows && selection.selectedRows.length > 0) { if (selection.selectedRows && selection.selectedRows.length > 0) {
try { try {

2
packages/client/stats.html
View File

File diff suppressed because one or more lines are too long

1310
packages/client/yarn.lock
View File

File diff suppressed because it is too large Load Diff

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

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"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.0.81-alpha.0", "@budibase/bbui": "^1.0.81-alpha.4",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

8
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.0.81-alpha.0", "version": "1.0.81-alpha.4",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -71,9 +71,9 @@
"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.0.81-alpha.0", "@budibase/backend-core": "^1.0.81-alpha.4",
"@budibase/client": "^1.0.81-alpha.0", "@budibase/client": "^1.0.81-alpha.4",
"@budibase/string-templates": "^1.0.81-alpha.0", "@budibase/string-templates": "^1.0.81-alpha.4",
"@bull-board/api": "^3.7.0", "@bull-board/api": "^3.7.0",
"@bull-board/koa": "^3.7.0", "@bull-board/koa": "^3.7.0",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "1.0.81-alpha.0", "version": "1.0.81-alpha.4",
"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",

6
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.0.81-alpha.0", "version": "1.0.81-alpha.4",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -34,8 +34,8 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^1.0.81-alpha.0", "@budibase/backend-core": "^1.0.81-alpha.4",
"@budibase/string-templates": "^1.0.81-alpha.0", "@budibase/string-templates": "^1.0.81-alpha.4",
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"@sentry/node": "^6.0.0", "@sentry/node": "^6.0.0",
"@techpass/passport-openidconnect": "^0.3.0", "@techpass/passport-openidconnect": "^0.3.0",

1181
packages/worker/yarn.lock
View File

File diff suppressed because it is too large Load Diff