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 refactor/backend-core-worker

This commit is contained in:
mike12345567 2022-11-26 13:51:19 +00:00
parent 0a32126c5b 998fd7ccc8
commit b92d1855fe
30 changed files with 276 additions and 143 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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "@budibase/types": "2.1.32-alpha.10",
"@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/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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "@budibase/string-templates": "2.1.32-alpha.10",
"@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",

56
packages/bbui/src/Skeleton/Skeleton.svelte Normal file
View File

@ -0,0 +1,56 @@
<div class="skeleton">
<div class="children">
<slot />
</div>
</div>
<style>
.skeleton {
height: 100%;
width: 100%;
opacity: 0;
background-color: var(--spectrum-global-color-gray-300) !important;
border-radius: 7px;
overflow: hidden;
position: relative;
animation: fadeIn 130ms ease 0s 1 normal forwards;
}
.children {
pointer-events: none;
opacity: 0;
}
.skeleton::after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
transform: translateX(-100%);
background-image: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0,
rgba(255, 255, 255, 0.2) 20%,
rgba(255, 255, 255, 0.5) 60%,
rgba(255, 255, 255, 0)
);
animation: shimmer 2s infinite;
content: "";
}
@keyframes fadeIn {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
@keyframes shimmer {
100% {
transform: translateX(100%);
}
}
</style>

20
packages/bbui/src/Table/Table.svelte
View File

@ -71,7 +71,8 @@
visibleRowCount, visibleRowCount,
rowCount, rowCount,
totalRowCount, totalRowCount,
rowHeight rowHeight,
loading
) )
$: sortedRows = sortRows(rows, sortColumn, sortOrder) $: sortedRows = sortRows(rows, sortColumn, sortOrder)
$: gridStyle = getGridStyle(fields, schema, showEditColumn) $: gridStyle = getGridStyle(fields, schema, showEditColumn)
@ -120,8 +121,12 @@
visibleRowCount, visibleRowCount,
rowCount, rowCount,
totalRowCount, totalRowCount,
rowHeight rowHeight,
loading
) => { ) => {
if (loading) {
return `height: ${headerHeight + visibleRowCount * rowHeight}px;`
}
if (!rowCount || !visibleRowCount || totalRowCount <= rowCount) { if (!rowCount || !visibleRowCount || totalRowCount <= rowCount) {
return "" return ""
} }
@ -277,9 +282,11 @@
bind:offsetHeight={height} bind:offsetHeight={height}
style={`--row-height: ${rowHeight}px; --header-height: ${headerHeight}px;`} style={`--row-height: ${rowHeight}px; --header-height: ${headerHeight}px;`}
> >
{#if !loaded} {#if loading}
<div class="loading" style={heightStyle}> <div class="loading" style={heightStyle}>
<ProgressCircle /> <slot name="loadingIndicator">
<ProgressCircle />
</slot>
</div> </div>
{:else} {:else}
<div class="spectrum-Table" style={`${heightStyle}${gridStyle}`}> <div class="spectrum-Table" style={`${heightStyle}${gridStyle}`}>
@ -438,9 +445,10 @@
/* Loading */ /* Loading */
.loading { .loading {
display: grid; display: flex;
place-items: center; align-items: center;
min-height: 100px; min-height: 100px;
justify-content: center;
} }
/* Table */ /* Table */

1
packages/bbui/src/index.js
View File

@ -4,6 +4,7 @@ import "./bbui.css"
import "@spectrum-css/icon/dist/index-vars.css" import "@spectrum-css/icon/dist/index-vars.css"
// Components // Components
export { default as Skeleton } from "./Skeleton/Skeleton.svelte"
export { default as Input } from "./Form/Input.svelte" export { default as Input } from "./Form/Input.svelte"
export { default as Stepper } from "./Form/Stepper.svelte" export { default as Stepper } from "./Form/Stepper.svelte"
export { default as TextArea } from "./Form/TextArea.svelte" export { default as TextArea } from "./Form/TextArea.svelte"

10
packages/builder/package.json
View File

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

9
packages/builder/src/components/integration/QueryBindingBuilder.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { Body, Button, Heading, Icon, Input, Layout } from "@budibase/bbui" import { Body, Heading, Icon, Input, Layout } from "@budibase/bbui"
import { import {
readableToRuntimeBinding, readableToRuntimeBinding,
runtimeToReadableBinding, runtimeToReadableBinding,
@ -11,10 +11,6 @@
export let bindings = [] export let bindings = []
export let customParams = {} export let customParams = {}
function newQueryBinding() {
queryBindings = [...queryBindings, {}]
}
function deleteQueryBinding(idx) { function deleteQueryBinding(idx) {
queryBindings.splice(idx, 1) queryBindings.splice(idx, 1)
queryBindings = queryBindings queryBindings = queryBindings
@ -31,9 +27,6 @@
<Layout noPadding={bindable} gap="S"> <Layout noPadding={bindable} gap="S">
<div class="controls" class:height={!bindable}> <div class="controls" class:height={!bindable}>
<Heading size="XS">Bindings</Heading> <Heading size="XS">Bindings</Heading>
{#if !bindable}
<Button secondary on:click={newQueryBinding}>Add Binding</Button>
{/if}
</div> </div>
<Body size="S"> <Body size="S">
{#if !bindable} {#if !bindable}

9
packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { Body, Button, Heading, Layout } from "@budibase/bbui" import { Body, Heading, Layout } from "@budibase/bbui"
import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
import { getUserBindings } from "builderStore/dataBinding" import { getUserBindings } from "builderStore/dataBinding"
export let bindable = true export let bindable = true
@ -11,18 +11,11 @@
acc[binding.name] = binding.default acc[binding.name] = binding.default
return acc return acc
}, {}) }, {})
function newQueryBinding() {
queryBindings = [...queryBindings, {}]
}
</script> </script>
<Layout noPadding={bindable} gap="S"> <Layout noPadding={bindable} gap="S">
<div class="controls" class:height={!bindable}> <div class="controls" class:height={!bindable}>
<Heading size="XS">Bindings</Heading> <Heading size="XS">Bindings</Heading>
{#if !bindable}
<Button secondary on:click={newQueryBinding}>Add Binding</Button>
{/if}
</div> </div>
<Body size="S"> <Body size="S">
{#if !bindable} {#if !bindable}

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "@budibase/backend-core": "2.1.32-alpha.10",
"@budibase/string-templates": "2.1.32-alpha.8", "@budibase/string-templates": "2.1.32-alpha.10",
"@budibase/types": "2.1.32-alpha.8", "@budibase/types": "2.1.32-alpha.10",
"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",

23
packages/client/manifest.json
View File

@ -284,7 +284,7 @@
"editable": true, "editable": true,
"size": { "size": {
"width": 105, "width": 105,
"height": 35 "height": 32
}, },
"settings": [ "settings": [
{ {
@ -683,7 +683,7 @@
"editable": true, "editable": true,
"size": { "size": {
"width": 400, "width": 400,
"height": 30 "height": 24
}, },
"settings": [ "settings": [
{ {
@ -808,7 +808,7 @@
"editable": true, "editable": true,
"size": { "size": {
"width": 400, "width": 400,
"height": 40 "height": 32
}, },
"settings": [ "settings": [
{ {
@ -2447,6 +2447,7 @@
] ]
}, },
"stringfield": { "stringfield": {
"skeleton": false,
"name": "Text Field", "name": "Text Field",
"icon": "Text", "icon": "Text",
"styles": [ "styles": [
@ -2455,7 +2456,7 @@
"editable": true, "editable": true,
"size": { "size": {
"width": 400, "width": 400,
"height": 50 "height": 32
}, },
"settings": [ "settings": [
{ {
@ -2538,6 +2539,7 @@
] ]
}, },
"numberfield": { "numberfield": {
"skeleton": false,
"name": "Number Field", "name": "Number Field",
"icon": "123", "icon": "123",
"styles": [ "styles": [
@ -2652,6 +2654,7 @@
] ]
}, },
"optionsfield": { "optionsfield": {
"skeleton": false,
"name": "Options Picker", "name": "Options Picker",
"icon": "Menu", "icon": "Menu",
"styles": [ "styles": [
@ -2820,6 +2823,7 @@
] ]
}, },
"multifieldselect": { "multifieldselect": {
"skeleton": false,
"name": "Multi-select Picker", "name": "Multi-select Picker",
"icon": "ViewList", "icon": "ViewList",
"styles": [ "styles": [
@ -2982,12 +2986,13 @@
] ]
}, },
"booleanfield": { "booleanfield": {
"skeleton": false,
"name": "Checkbox", "name": "Checkbox",
"icon": "SelectBox", "icon": "SelectBox",
"editable": true, "editable": true,
"size": { "size": {
"width": 400, "width": 20,
"height": 50 "height": 20
}, },
"settings": [ "settings": [
{ {
@ -3139,6 +3144,7 @@
] ]
}, },
"datetimefield": { "datetimefield": {
"skeleton": false,
"name": "Date Picker", "name": "Date Picker",
"icon": "Date", "icon": "Date",
"styles": [ "styles": [
@ -3220,6 +3226,7 @@
] ]
}, },
"codescanner": { "codescanner": {
"skeleton": false,
"name": "Barcode/QR Scanner", "name": "Barcode/QR Scanner",
"icon": "Camera", "icon": "Camera",
"styles": [ "styles": [
@ -3385,6 +3392,7 @@
] ]
}, },
"attachmentfield": { "attachmentfield": {
"skeleton": false,
"name": "Attachment", "name": "Attachment",
"icon": "Attach", "icon": "Attach",
"styles": [ "styles": [
@ -3443,6 +3451,7 @@
] ]
}, },
"relationshipfield": { "relationshipfield": {
"skeleton": false,
"name": "Relationship Picker", "name": "Relationship Picker",
"icon": "TaskList", "icon": "TaskList",
"styles": [ "styles": [
@ -3506,6 +3515,7 @@
] ]
}, },
"jsonfield": { "jsonfield": {
"skeleton": false,
"name": "JSON Field", "name": "JSON Field",
"icon": "Brackets", "icon": "Brackets",
"styles": [ "styles": [
@ -3707,6 +3717,7 @@
} }
}, },
"table": { "table": {
"skeleton": false,
"name": "Table", "name": "Table",
"icon": "Table", "icon": "Table",
"illegalChildren": [ "illegalChildren": [

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "@budibase/bbui": "2.1.32-alpha.10",
"@budibase/frontend-core": "2.1.32-alpha.8", "@budibase/frontend-core": "2.1.32-alpha.10",
"@budibase/string-templates": "2.1.32-alpha.8", "@budibase/string-templates": "2.1.32-alpha.10",
"@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",

1
packages/client/src/components/BlockComponent.svelte
View File

@ -23,6 +23,7 @@
// to render this part of the block, taking advantage of binding enrichment // to render this part of the block, taking advantage of binding enrichment
$: id = `${block.id}-${context ?? rand}` $: id = `${block.id}-${context ?? rand}`
$: instance = { $: instance = {
_blockElementHasChildren: $$slots?.default ?? false,
_component: `@budibase/standard-components/${type}`, _component: `@budibase/standard-components/${type}`,
_id: id, _id: id,
_instanceName: type[0].toUpperCase() + type.slice(1), _instanceName: type[0].toUpperCase() + type.slice(1),

16
packages/client/src/components/Component.svelte
View File

@ -29,6 +29,7 @@
import Placeholder from "components/app/Placeholder.svelte" import Placeholder from "components/app/Placeholder.svelte"
import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte" import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte"
import ComponentPlaceholder from "components/app/ComponentPlaceholder.svelte" import ComponentPlaceholder from "components/app/ComponentPlaceholder.svelte"
import Skeleton from "components/app/Skeleton.svelte"
export let instance = {} export let instance = {}
export let isLayout = false export let isLayout = false
@ -38,6 +39,7 @@
// Get parent contexts // Get parent contexts
const context = getContext("context") const context = getContext("context")
const loading = getContext("loading")
const insideScreenslot = !!getContext("screenslot") const insideScreenslot = !!getContext("screenslot")
// Create component context // Create component context
@ -470,9 +472,21 @@
componentStore.actions.unregisterInstance(id) componentStore.actions.unregisterInstance(id)
} }
}) })
$: showSkeleton =
$loading &&
definition.name !== "Screenslot" &&
children.length === 0 &&
!instance._blockElementHasChildren &&
definition.skeleton !== false
</script> </script>
{#if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden} {#if showSkeleton}
<Skeleton
height={initialSettings?.height || definition?.size?.height || 0}
width={initialSettings?.width || definition?.size?.width || 0}
/>
{:else if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
<!-- The ID is used as a class because getElementsByClassName is O(1) --> <!-- The ID is used as a class because getElementsByClassName is O(1) -->
<!-- and the performance matters for the selection indicators --> <!-- and the performance matters for the selection indicators -->
<div <div

4
packages/client/src/components/Router.svelte
View File

@ -1,4 +1,5 @@
<script> <script>
import { writable } from "svelte/store"
import { setContext, getContext, onMount } from "svelte" import { setContext, getContext, onMount } from "svelte"
import Router, { querystring } from "svelte-spa-router" import Router, { querystring } from "svelte-spa-router"
import { routeStore, stateStore } from "stores" import { routeStore, stateStore } from "stores"
@ -9,6 +10,9 @@
const component = getContext("component") const component = getContext("component")
setContext("screenslot", true) setContext("screenslot", true)
const loading = writable(false)
setContext("loading", loading)
// Only wrap this as an array to take advantage of svelte keying, // Only wrap this as an array to take advantage of svelte keying,
// to ensure the svelte-spa-router is fully remounted when route config // to ensure the svelte-spa-router is fully remounted when route config
// changes // changes

46
packages/client/src/components/app/DataProvider.svelte
View File

@ -1,6 +1,7 @@
<script> <script>
import { getContext } from "svelte" import { writable } from "svelte/store"
import { ProgressCircle, Pagination } from "@budibase/bbui" import { setContext, getContext } from "svelte"
import { Pagination } from "@budibase/bbui"
import { fetchData, LuceneUtils } from "@budibase/frontend-core" import { fetchData, LuceneUtils } from "@budibase/frontend-core"
export let dataSource export let dataSource
@ -10,6 +11,8 @@
export let limit export let limit
export let paginate export let paginate
const loading = writable(false)
const { styleable, Provider, ActionTypes, API } = getContext("sdk") const { styleable, Provider, ActionTypes, API } = getContext("sdk")
const component = getContext("component") const component = getContext("component")
@ -77,9 +80,13 @@
sortColumn: $fetch.sortColumn, sortColumn: $fetch.sortColumn,
sortOrder: $fetch.sortOrder, sortOrder: $fetch.sortOrder,
}, },
loaded: $fetch.loaded, limit: limit,
} }
const parentLoading = getContext("loading")
setContext("loading", loading)
$: loading.set($parentLoading || !$fetch.loaded)
const createFetch = datasource => { const createFetch = datasource => {
return fetchData({ return fetchData({
API, API,
@ -127,23 +134,17 @@
<div use:styleable={$component.styles} class="container"> <div use:styleable={$component.styles} class="container">
<Provider {actions} data={dataContext}> <Provider {actions} data={dataContext}>
{#if !$fetch.loaded} <slot />
<div class="loading"> {#if paginate && $fetch.supportsPagination}
<ProgressCircle /> <div class="pagination">
<Pagination
page={$fetch.pageNumber + 1}
hasPrevPage={$fetch.hasPrevPage}
hasNextPage={$fetch.hasNextPage}
goToPrevPage={fetch.prevPage}
goToNextPage={fetch.nextPage}
/>
</div> </div>
{:else}
<slot />
{#if paginate && $fetch.supportsPagination}
<div class="pagination">
<Pagination
page={$fetch.pageNumber + 1}
hasPrevPage={$fetch.hasPrevPage}
hasNextPage={$fetch.hasNextPage}
goToPrevPage={fetch.prevPage}
goToNextPage={fetch.nextPage}
/>
</div>
{/if}
{/if} {/if}
</Provider> </Provider>
</div> </div>
@ -155,13 +156,6 @@
justify-content: flex-start; justify-content: flex-start;
align-items: stretch; align-items: stretch;
} }
.loading {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
height: 100px;
}
.pagination { .pagination {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

13
packages/client/src/components/app/Repeater.svelte
View File

@ -12,22 +12,25 @@
const { Provider } = getContext("sdk") const { Provider } = getContext("sdk")
const component = getContext("component") const component = getContext("component")
const loading = getContext("loading")
$: rows = dataProvider?.rows ?? [] // If the parent DataProvider is loading, fill the rows array with a number of empty objects corresponding to the DataProvider's page size; this allows skeleton loader components to be rendered further down the tree.
$: loaded = dataProvider?.loaded ?? true $: rows = $loading
? new Array(dataProvider.limit > 20 ? 20 : dataProvider.limit).fill({})
: dataProvider?.rows
</script> </script>
<Container {direction} {hAlign} {vAlign} {gap} wrap> <Container {direction} {hAlign} {vAlign} {gap} wrap>
{#if $component.empty} {#if $component.empty}
<Placeholder /> <Placeholder />
{:else if rows.length > 0} {:else if !$loading && rows.length === 0}
<div class="noRows"><i class="ri-list-check-2" />{noRowsMessage}</div>
{:else}
{#each rows as row, index} {#each rows as row, index}
<Provider data={{ ...row, index }}> <Provider data={{ ...row, index }}>
<slot /> <slot />
</Provider> </Provider>
{/each} {/each}
{:else if loaded && noRowsMessage}
<div class="noRows"><i class="ri-list-check-2" />{noRowsMessage}</div>
{/if} {/if}
</Container> </Container>

31
packages/client/src/components/app/Skeleton.svelte Normal file
View File

@ -0,0 +1,31 @@
<script>
import { getContext } from "svelte"
import { Skeleton } from "@budibase/bbui"
const { styleable } = getContext("sdk")
const component = getContext("component")
export let height
export let width
let styles
$: {
styles = JSON.parse(JSON.stringify($component.styles))
if (!styles.normal.height && height) {
// The height and width props provided to this component can either be numbers or strings set by users (ex. '100%', '100px', '100'). A string of '100' wouldn't be a valid CSS property, but some of our components respect that input, so we need to handle it here also, hence the `!isNaN` check.
styles.normal.height = !isNaN(height) ? `${height}px` : height
}
if (!styles.normal.width && width) {
styles.normal.width = !isNaN(width) ? `${width}px` : width
}
}
</script>
<div use:styleable={styles}>
<Skeleton>
<slot />
</Skeleton>
</div>

36
packages/client/src/components/app/forms/AttachmentField.svelte
View File

@ -76,18 +76,26 @@
bind:fieldApi bind:fieldApi
defaultValue={[]} defaultValue={[]}
> >
{#if fieldState} <div class="minHeightWrapper">
<CoreDropzone {#if fieldState}
value={fieldState.value} <CoreDropzone
disabled={fieldState.disabled} value={fieldState.value}
error={fieldState.error} disabled={fieldState.disabled}
on:change={handleChange} error={fieldState.error}
{processFiles} on:change={handleChange}
{deleteAttachments} {processFiles}
{handleFileTooLarge} {deleteAttachments}
{handleTooManyFiles} {handleFileTooLarge}
{maximum} {handleTooManyFiles}
{extensions} {maximum}
/> {extensions}
{/if} />
{/if}
</div>
</Field> </Field>
<style>
.minHeightWrapper {
min-height: 220px;
}
</style>

7
packages/client/src/components/app/forms/Field.svelte
View File

@ -1,6 +1,7 @@
<script> <script>
import Placeholder from "../Placeholder.svelte" import Placeholder from "../Placeholder.svelte"
import FieldGroupFallback from "./FieldGroupFallback.svelte" import FieldGroupFallback from "./FieldGroupFallback.svelte"
import Skeleton from "../Skeleton.svelte"
import { getContext, onDestroy } from "svelte" import { getContext, onDestroy } from "svelte"
export let label export let label
@ -53,6 +54,8 @@
builderStore.actions.updateProp("label", e.target.textContent) builderStore.actions.updateProp("label", e.target.textContent)
} }
const loading = getContext("loading")
onDestroy(() => { onDestroy(() => {
fieldApi?.deregister() fieldApi?.deregister()
unsubscribe?.() unsubscribe?.()
@ -76,6 +79,10 @@
<div class="spectrum-Form-itemField"> <div class="spectrum-Form-itemField">
{#if !formContext} {#if !formContext}
<Placeholder text="Form components need to be wrapped in a form" /> <Placeholder text="Form components need to be wrapped in a form" />
{:else if $loading}
<Skeleton>
<slot />
</Skeleton>
{:else if !fieldState} {:else if !fieldState}
<Placeholder /> <Placeholder />
{:else if schemaType && schemaType !== type && type !== "options"} {:else if schemaType && schemaType !== type && type !== "options"}

14
packages/client/src/components/app/table/Table.svelte
View File

@ -1,6 +1,6 @@
<script> <script>
import { getContext } from "svelte" import { getContext } from "svelte"
import { Table } from "@budibase/bbui" import { Table, Skeleton } from "@budibase/bbui"
import SlotRenderer from "./SlotRenderer.svelte" import SlotRenderer from "./SlotRenderer.svelte"
import { UnsortableTypes } from "../../../constants" import { UnsortableTypes } from "../../../constants"
import { onDestroy } from "svelte" import { onDestroy } from "svelte"
@ -18,6 +18,7 @@
export let allowSelectRows export let allowSelectRows
export let compact export let compact
const loading = getContext("loading")
const component = getContext("component") const component = getContext("component")
const { styleable, getAction, ActionTypes, routeStore, rowSelectionStore } = const { styleable, getAction, ActionTypes, routeStore, rowSelectionStore } =
getContext("sdk") getContext("sdk")
@ -30,7 +31,6 @@
] ]
let selectedRows = [] let selectedRows = []
$: hasChildren = $component.children $: hasChildren = $component.children
$: loading = dataProvider?.loading ?? false
$: data = dataProvider?.rows || [] $: data = dataProvider?.rows || []
$: fullSchema = dataProvider?.schema ?? {} $: fullSchema = dataProvider?.schema ?? {}
$: fields = getFields(fullSchema, columns, showAutoColumns) $: fields = getFields(fullSchema, columns, showAutoColumns)
@ -140,7 +140,7 @@
<Table <Table
{data} {data}
{schema} {schema}
{loading} loading={$loading}
{rowCount} {rowCount}
{quiet} {quiet}
{compact} {compact}
@ -155,6 +155,9 @@
on:sort={onSort} on:sort={onSort}
on:click={onClick} on:click={onClick}
> >
<div class="skeleton" slot="loadingIndicator">
<Skeleton />
</div>
<slot /> <slot />
</Table> </Table>
{#if allowSelectRows && selectedRows.length} {#if allowSelectRows && selectedRows.length}
@ -169,6 +172,11 @@
background-color: var(--spectrum-alias-background-color-secondary); background-color: var(--spectrum-alias-background-color-secondary);
} }
.skeleton {
height: 100%;
width: 100%;
}
.row-count { .row-count {
margin-top: var(--spacing-l); margin-top: var(--spacing-l);
} }

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

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

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -43,11 +43,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": "2.1.32-alpha.8", "@budibase/backend-core": "2.1.32-alpha.10",
"@budibase/client": "2.1.32-alpha.8", "@budibase/client": "2.1.32-alpha.10",
"@budibase/pro": "2.1.32-alpha.8", "@budibase/pro": "2.1.32-alpha.10",
"@budibase/string-templates": "2.1.32-alpha.8", "@budibase/string-templates": "2.1.32-alpha.10",
"@budibase/types": "2.1.32-alpha.8", "@budibase/types": "2.1.32-alpha.10",
"@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",

30
packages/server/yarn.lock
View File

@ -1273,12 +1273,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@2.1.32-alpha.8": "@budibase/backend-core@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.8.tgz#c654df007132edc892754807ed6c393501bfdbfc" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988"
integrity sha512-sdPxuQDivXH0+7f0+FdlZqzLdv4dpHnl7f8DyWzgwV0kqxbSgf0I9p2/rxUoCRj3/scH2qiQJdiRB17cwu+BTw== integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw==
dependencies: dependencies:
"@budibase/types" "2.1.32-alpha.8" "@budibase/types" "2.1.32-alpha.10"
"@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"
@ -1361,13 +1361,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@2.1.32-alpha.8": "@budibase/pro@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.8.tgz#cabd930a644c66636efefc422764b1c65ee24566" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972"
integrity sha512-2FQSQ7FmeCntRQLCXG8xCMEuquS/zglEIgtsmk01u8zU9YAI4rmgtmTIIPd9wIFAhgyOOBvLrD4O2aGrY88AMQ== integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ==
dependencies: dependencies:
"@budibase/backend-core" "2.1.32-alpha.8" "@budibase/backend-core" "2.1.32-alpha.10"
"@budibase/types" "2.1.32-alpha.8" "@budibase/types" "2.1.32-alpha.10"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -1391,10 +1391,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@2.1.32-alpha.8": "@budibase/types@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.8.tgz#45ee233aecb12d2529e506d7b7073b88147cc845" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca"
integrity sha512-37ErxjUifVbJfpvJihj1yN3tEdtga6pSxM+tt4KRO0L/qaHzZZMKpE6HUobVOUF8Ty8sJi/vUhl500f09ATPsg== integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg==
"@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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

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": "2.1.32-alpha.8", "version": "2.1.32-alpha.10",
"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": "2.1.32-alpha.8", "@budibase/backend-core": "2.1.32-alpha.10",
"@budibase/pro": "2.1.32-alpha.8", "@budibase/pro": "2.1.32-alpha.10",
"@budibase/string-templates": "2.1.32-alpha.8", "@budibase/string-templates": "2.1.32-alpha.10",
"@budibase/types": "2.1.32-alpha.8", "@budibase/types": "2.1.32-alpha.10",
"@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",

5
packages/worker/src/environment.ts
View File

@ -67,7 +67,8 @@ const environment = {
ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY, ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
_set(key: any, value: any) { _set(key: any, value: any) {
process.env[key] = value process.env[key] = value
module.exports[key] = value // @ts-ignore
env[key] = value
}, },
isDev, isDev,
isTest, isTest,
@ -84,7 +85,7 @@ if (!environment.APPS_URL) {
} }
// clean up any environment variable edge cases // clean up any environment variable edge cases
for (let [key, value] of Object.entries(module.exports)) { for (let [key, value] of Object.entries(env)) {
// handle the edge case of "0" to disable an environment variable // handle the edge case of "0" to disable an environment variable
if (value === "0") { if (value === "0") {
// @ts-ignore // @ts-ignore

30
packages/worker/yarn.lock
View File

@ -470,12 +470,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@2.1.32-alpha.8": "@budibase/backend-core@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.8.tgz#c654df007132edc892754807ed6c393501bfdbfc" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.10.tgz#a6c25582cc29be1d4dae2b6de5e36e650c5a7988"
integrity sha512-sdPxuQDivXH0+7f0+FdlZqzLdv4dpHnl7f8DyWzgwV0kqxbSgf0I9p2/rxUoCRj3/scH2qiQJdiRB17cwu+BTw== integrity sha512-zzOzo1Hsa0gIu5kSTv5vul4SqI6tgP76RI1CAzf6h0837WPe9MRI2jtFVo0htlq/Mz6yvQl/XCsA3ALfFBPIhw==
dependencies: dependencies:
"@budibase/types" "2.1.32-alpha.8" "@budibase/types" "2.1.32-alpha.10"
"@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"
@ -508,22 +508,22 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@2.1.32-alpha.8": "@budibase/pro@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.8.tgz#cabd930a644c66636efefc422764b1c65ee24566" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.10.tgz#a848093083836322602fc90a331e9d2478389972"
integrity sha512-2FQSQ7FmeCntRQLCXG8xCMEuquS/zglEIgtsmk01u8zU9YAI4rmgtmTIIPd9wIFAhgyOOBvLrD4O2aGrY88AMQ== integrity sha512-woWWgxyYbPPQplIkUKG6Aibg1j69ByQZZWuW8xrkeMzs9VUFQgYhBSHyvE91CewuJcqAuh06dC2tNxa3kVM4RQ==
dependencies: dependencies:
"@budibase/backend-core" "2.1.32-alpha.8" "@budibase/backend-core" "2.1.32-alpha.10"
"@budibase/types" "2.1.32-alpha.8" "@budibase/types" "2.1.32-alpha.10"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@2.1.32-alpha.8": "@budibase/types@2.1.32-alpha.10":
version "2.1.32-alpha.8" version "2.1.32-alpha.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.8.tgz#45ee233aecb12d2529e506d7b7073b88147cc845" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.10.tgz#caef3d4cefa8e1abb6b816d6a222ad5a77cc06ca"
integrity sha512-37ErxjUifVbJfpvJihj1yN3tEdtga6pSxM+tt4KRO0L/qaHzZZMKpE6HUobVOUF8Ty8sJi/vUhl500f09ATPsg== integrity sha512-FuO6hCB2Yq/FXWl4VQOje+iknO+KVKLZ5WZD1ttSHwWAcn2935k62c71D6pabyBkVT297dq6VWCOQMAg9xxZyg==
"@cspotcode/source-map-support@^0.8.0": "@cspotcode/source-map-support@^0.8.0":
version "0.8.1" version "0.8.1"