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/inclusion-row-parsing

This commit is contained in:
Dean 2023-05-12 14:58:19 +01:00
parent 77d1f9250c 0b8cf0f9bc
commit d8b59b989d
15 changed files with 130 additions and 111 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.6.8", "version": "2.6.10",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"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.6.8", "version": "2.6.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",
@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.2", "@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10", "@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "^2.6.8", "@budibase/types": "^2.6.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-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

6
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.6.8", "version": "2.6.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,8 +38,8 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "^2.6.8", "@budibase/shared-core": "^2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@spectrum-css/accordion": "3.0.24", "@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.6.8", "version": "2.6.10",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -58,10 +58,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^2.6.8", "@budibase/bbui": "^2.6.10",
"@budibase/frontend-core": "^2.6.8", "@budibase/frontend-core": "^2.6.10",
"@budibase/shared-core": "^2.6.8", "@budibase/shared-core": "^2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1",

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

@ -107,8 +107,9 @@
useSampleData, useSampleData,
isGoogle, isGoogle,
}) => { }) => {
let app
try { try {
const app = await createApp(useSampleData) app = await createApp(useSampleData)
let datasource let datasource
if (datasourceConfig) { if (datasourceConfig) {
@ -134,6 +135,17 @@
console.log(e) console.log(e)
creationLoading = false creationLoading = false
notifications.error("There was a problem creating your app") notifications.error("There was a problem creating your app")
// Reset the store so that we don't send up stale headers
store.actions.reset()
// If we successfully created an app, delete it again so that we
// can try again once the error has been corrected.
// This also ensures onboarding can't be skipped by entering invalid
// data credentials.
if (app?.appId) {
await API.deleteApp(app.appId)
}
} }
} }
</script> </script>
@ -146,80 +158,87 @@
/> />
</Modal> </Modal>
<SplitPage> <div class="full-width">
{#if stage === "name"} <SplitPage>
<NamePanel bind:name bind:url onNext={() => (stage = "data")} /> {#if stage === "name"}
{:else if googleComplete} <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
<div class="centered"> {:else if googleComplete}
<Body <div class="centered">
>Please login to your Google account in the new tab which as opened to <Body
continue.</Body >Please login to your Google account in the new tab which as opened to
> continue.</Body
</div> >
{:else if integrationsLoading || creationLoading}
<div class="centered">
<Spinner />
</div>
{:else if stage === "data"}
<DataPanel onBack={() => (stage = "name")}>
<div class="dataButton">
<FancyButton on:click={() => handleCreateApp({ useSampleData: true })}>
<div class="dataButtonContent">
<div class="dataButtonIcon">
<img
alt="Budibase Logo"
class="budibaseLogo"
src={"https://i.imgur.com/Xhdt1YP.png"}
/>
</div>
Budibase Sample data
</div>
</FancyButton>
</div> </div>
<div class="dataButton"> {:else if integrationsLoading || creationLoading}
<FancyButton on:click={uploadModal.show}> <div class="centered">
<div class="dataButtonContent"> <Spinner />
<div class="dataButtonIcon">
<FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
</div>
Upload data (CSV or JSON)
</div>
</FancyButton>
</div> </div>
{#each Object.entries(plusIntegrations) as [integrationType, schema]} {:else if stage === "data"}
<DataPanel onBack={() => (stage = "name")}>
<div class="dataButton"> <div class="dataButton">
<FancyButton on:click={() => (stage = integrationType)}> <FancyButton
on:click={() => handleCreateApp({ useSampleData: true })}
>
<div class="dataButtonContent"> <div class="dataButtonContent">
<div class="dataButtonIcon"> <div class="dataButtonIcon">
<IntegrationIcon {integrationType} {schema} /> <img
alt="Budibase Logo"
class="budibaseLogo"
src={"https://i.imgur.com/Xhdt1YP.png"}
/>
</div> </div>
{schema.friendlyName} Budibase Sample data
</div> </div>
</FancyButton> </FancyButton>
</div> </div>
{/each} <div class="dataButton">
</DataPanel> <FancyButton on:click={uploadModal.show}>
{:else if stage in plusIntegrations} <div class="dataButtonContent">
<DatasourceConfigPanel <div class="dataButtonIcon">
title={plusIntegrations[stage].friendlyName} <FontAwesomeIcon name="fa-solid fa-file-arrow-up" />
fields={plusIntegrations[stage].datasource} </div>
type={stage} Upload data (CSV or JSON)
onBack={() => (stage = "data")} </div>
onNext={data => { </FancyButton>
const isGoogle = data.isGoogle </div>
delete data.isGoogle {#each Object.entries(plusIntegrations) as [integrationType, schema]}
return handleCreateApp({ datasourceConfig: data, isGoogle }) <div class="dataButton">
}} <FancyButton on:click={() => (stage = integrationType)}>
/> <div class="dataButtonContent">
{:else} <div class="dataButtonIcon">
<p>There was an problem. Please refresh the page and try again.</p> <IntegrationIcon {integrationType} {schema} />
{/if} </div>
<div slot="right"> {schema.friendlyName}
<ExampleApp {name} showData={stage !== "name"} /> </div>
</div> </FancyButton>
</SplitPage> </div>
{/each}
</DataPanel>
{:else if stage in plusIntegrations}
<DatasourceConfigPanel
title={plusIntegrations[stage].friendlyName}
fields={plusIntegrations[stage].datasource}
type={stage}
onBack={() => (stage = "data")}
onNext={data => {
const isGoogle = data.isGoogle
delete data.isGoogle
return handleCreateApp({ datasourceConfig: data, isGoogle })
}}
/>
{:else}
<p>There was an problem. Please refresh the page and try again.</p>
{/if}
<div slot="right">
<ExampleApp {name} showData={stage !== "name"} />
</div>
</SplitPage>
</div>
<style> <style>
.full-width {
width: 100%;
}
.centered { .centered {
display: flex; display: flex;
justify-content: center; justify-content: center;

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.6.8", "version": "2.6.10",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@ -29,9 +29,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "^2.6.8", "@budibase/backend-core": "^2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@budibase/types": "^2.6.8", "@budibase/types": "^2.6.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",

12
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.6.8", "version": "2.6.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,11 +19,11 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "^2.6.8", "@budibase/bbui": "^2.6.10",
"@budibase/frontend-core": "^2.6.8", "@budibase/frontend-core": "^2.6.10",
"@budibase/shared-core": "^2.6.8", "@budibase/shared-core": "^2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@budibase/types": "^2.6.8", "@budibase/types": "^2.6.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",

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

@ -1,13 +1,13 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "2.6.8", "version": "2.6.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.6.8", "@budibase/bbui": "^2.6.10",
"@budibase/shared-core": "^2.6.8", "@budibase/shared-core": "^2.6.10",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"socket.io-client": "^4.6.1", "socket.io-client": "^4.6.1",

2
packages/sdk/package.json
View File

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

14
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.6.8", "version": "2.6.10",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -45,12 +45,12 @@
"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.6.8", "@budibase/backend-core": "^2.6.10",
"@budibase/client": "^2.6.8", "@budibase/client": "^2.6.10",
"@budibase/pro": "2.6.8", "@budibase/pro": "2.6.10",
"@budibase/shared-core": "^2.6.8", "@budibase/shared-core": "^2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@budibase/types": "^2.6.8", "@budibase/types": "^2.6.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",

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/shared-core", "name": "@budibase/shared-core",
"version": "2.6.8", "version": "2.6.10",
"description": "Shared data utils", "description": "Shared data utils",
"main": "dist/cjs/src/index.js", "main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts", "types": "dist/mjs/src/index.d.ts",
@ -20,7 +20,7 @@
"dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
}, },
"dependencies": { "dependencies": {
"@budibase/types": "^2.6.8" "@budibase/types": "^2.6.10"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^7.6.0", "concurrently": "^7.6.0",

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "2.6.8", "version": "2.6.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.6.8", "version": "2.6.10",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/cjs/index.js", "main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts", "types": "dist/mjs/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.6.8", "version": "2.6.10",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -37,10 +37,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "^2.6.8", "@budibase/backend-core": "^2.6.10",
"@budibase/pro": "2.6.8", "@budibase/pro": "2.6.10",
"@budibase/string-templates": "^2.6.8", "@budibase/string-templates": "^2.6.10",
"@budibase/types": "^2.6.8", "@budibase/types": "^2.6.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",

12
yarn.lock
View File

@ -1486,15 +1486,15 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.6.7": "@budibase/pro@2.6.9":
version "2.6.7" version "2.6.9"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.9.tgz#a6c00ca1e684efa7f09f66e6b8c878e129915afb"
integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA== integrity sha512-e/VWKERuB3Vtux5TwvgT7T9YCk51HbIJlHvV++hzGf+3zPF0VRrFq/0WD553Mj3amLHUk8zsBgfOoPPLiaprtg==
dependencies: dependencies:
"@budibase/backend-core" "2.6.7" "@budibase/backend-core" "2.6.9"
"@budibase/shared-core" "2.5.9" "@budibase/shared-core" "2.5.9"
"@budibase/string-templates" "2.5.9" "@budibase/string-templates" "2.5.9"
"@budibase/types" "2.6.7" "@budibase/types" "2.6.9"
"@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"