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 fix/mike-oct-fixes

This commit is contained in:
mike12345567 2022-10-26 10:37:01 +01:00
parent a24694a4ea 94f4ed5604
commit 6228d3346e
21 changed files with 111 additions and 95 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.0.34-alpha.1",
"version": "2.0.34-alpha.3",
"npmClient": "yarn",
"packages": [
"packages/*"

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

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

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

@ -1,5 +1,6 @@
const { join } = require("path")
const { tmpdir } = require("os")
const fs = require("fs")
const env = require("../environment")
/****************************************************
@ -16,6 +17,11 @@ exports.ObjectStoreBuckets = {
PLUGINS: env.PLUGIN_BUCKET_NAME,
}
exports.budibaseTempDir = function () {
return join(tmpdir(), ".budibase")
const bbTmp = join(tmpdir(), ".budibase")
if (!fs.existsSync(bbTmp)) {
fs.mkdirSync(bbTmp)
}
exports.budibaseTempDir = function () {
return bbTmp
}

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.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"@budibase/string-templates": "2.0.34-alpha.3",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

2
packages/bbui/src/Form/Core/DatePicker.svelte
View File

@ -66,7 +66,7 @@
newValue = newValue.toISOString()
}
// If time only set date component to 2000-01-01
else if (timeOnly) {
if (timeOnly) {
// Classic flackpickr causing issues.
// When selecting a value for the first time for a "time only" field,
// the time is always offset by 1 hour for some reason (regardless of time

10
packages/builder/package.json
View File

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

2
packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
View File

@ -77,7 +77,7 @@
title="Confirm Deletion"
>
Are you sure you wish to delete the backup
<i>{row.name}</i>
<i>{row.name}?</i>
This action cannot be undone.
</ConfirmDialog>

57
packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
View File

@ -37,7 +37,7 @@
let startDate = null
let endDate = null
let filters = getFilters()
let loaded = false
$: page = $pageInfo.page
$: fetchBackups(filterOpt, page, startDate, endDate)
@ -62,24 +62,31 @@
const schema = {
type: {
displayName: "Type",
width: "auto",
},
createdAt: {
displayName: "Date",
width: "auto",
},
name: {
displayName: "Name",
width: "auto",
},
appSize: {
displayName: "App size",
width: "auto",
},
createdBy: {
displayName: "User",
width: "auto",
},
status: {
displayName: "Status",
width: "auto",
},
actions: {
displayName: null,
width: "5%",
},
}
@ -154,6 +161,7 @@
onMount(() => {
fetchBackups(filterOpt, page, startDate, endDate)
loaded = true
})
</script>
@ -169,7 +177,7 @@
</div>
<div>
<Body>
Backup your apps and restore them to their previous state.
Back up your apps and restore them to their previous state.
{#if !$auth.accountPortalAccess && !$licensing.groupsEnabled && $admin.cloud}
Contact your account holder to upgrade your plan.
{/if}
@ -195,12 +203,32 @@
window.open("https://budibase.com/pricing/", "_blank")
}}
>
View Plans
View plans
</Button>
</div>
</Layout>
</Page>
{:else if backupData?.length > 0}
{:else if backupData?.length === 0 && !loaded && !filterOpt && !startDate}
<Page wide={false}>
<div class="align">
<img
width="220px"
height="130px"
src={BackupsDefault}
alt="BackupsDefault"
/>
<Layout gap="S">
<Heading>You have no backups yet</Heading>
<div class="opacity">
<Body size="S">You can manually backup your app any time</Body>
</div>
<div class="padding">
<Button on:click={modal.show} cta>Create Backup</Button>
</div>
</Layout>
</div>
</Page>
{:else if loaded}
<Layout noPadding gap="M" alignContent="start">
<div class="search">
<div class="select">
@ -235,6 +263,7 @@
<div>
<Table
{schema}
disableSorting
allowSelectRows={false}
allowEditColumns={false}
allowEditRows={false}
@ -255,26 +284,6 @@
</div>
</div>
</Layout>
{:else if backupData?.length === 0}
<Page wide={false}>
<div class="align">
<img
width="200px"
height="120px"
src={BackupsDefault}
alt="BackupsDefault"
/>
<Layout gap="S">
<Heading>You have no backups yet</Heading>
<div class="opacity">
<Body size="S">You can manually backup your app any time</Body>
</div>
<div class="padding">
<Button on:click={modal.show} cta>Create Backup</Button>
</div>
</Layout>
</div>
</Page>
{/if}
</div>

1
packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
View File

@ -13,6 +13,7 @@
<ModalContent
onConfirm={() => createManualBackup(name)}
title="Create new backup"
diabled={!name}
confirmText="Create"
><Input label="Backup name" bind:value={name} /></ModalContent
>

2
packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
View File

@ -12,7 +12,7 @@
<ModalContent
onConfirm={() => confirm(name)}
title="Backup your current version"
title="Back up your current version"
confirmText="Confirm Restore"
disabled={!name}
>

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.0.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"@budibase/string-templates": "2.0.34-alpha.1",
"@budibase/types": "2.0.34-alpha.1",
"@budibase/backend-core": "2.0.34-alpha.3",
"@budibase/string-templates": "2.0.34-alpha.3",
"@budibase/types": "2.0.34-alpha.3",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View File

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

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

@ -515,8 +515,8 @@
display: contents;
}
.component.pad :global(> *) {
padding: var(--spacing-l) !important;
gap: var(--spacing-l) !important;
padding: var(--spacing-m) !important;
gap: var(--spacing-m) !important;
border: 2px dashed var(--spectrum-global-color-gray-400) !important;
border-radius: 4px !important;
transition: padding 260ms ease-out, border 260ms ease-out;

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

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "2.0.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"@budibase/bbui": "2.0.34-alpha.3",
"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.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"@budibase/client": "2.0.34-alpha.1",
"@budibase/pro": "2.0.34-alpha.1",
"@budibase/string-templates": "2.0.34-alpha.1",
"@budibase/types": "2.0.34-alpha.1",
"@budibase/backend-core": "2.0.34-alpha.3",
"@budibase/client": "2.0.34-alpha.3",
"@budibase/pro": "2.0.34-alpha.3",
"@budibase/string-templates": "2.0.34-alpha.3",
"@budibase/types": "2.0.34-alpha.3",
"@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.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
"@budibase/backend-core@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.3.tgz#a05c7bb0b3b8537f46b0d797c613a1d54cbcc3a3"
integrity sha512-L4qZBkpc7LVMsHY8B9imXs3ZI1xNcuPeNe7q64k1VxypSkTwDdW6YmIebd0aoXrQxgl1FfotVR94dSM3B6sTxQ==
dependencies:
"@budibase/types" "2.0.34-alpha.1"
"@budibase/types" "2.0.34-alpha.3"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1181,13 +1181,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@2.0.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
"@budibase/pro@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.3.tgz#ebdf5f29f12273eda268d52940ba0d2b07147e3a"
integrity sha512-PwXETyajP40H5VvqKJGzKldsIBLnnXXxAMIKmWTz7dnDBCzjdurawotaSFXIno7Tr2NUG1H22inwKm99zs8pZg==
dependencies:
"@budibase/backend-core" "2.0.34-alpha.1"
"@budibase/types" "2.0.34-alpha.1"
"@budibase/backend-core" "2.0.34-alpha.3"
"@budibase/types" "2.0.34-alpha.3"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1211,10 +1211,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@2.0.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
"@budibase/types@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.3.tgz#f2301ece6e65c09beb4a9c76b3b90bd77835f14b"
integrity sha512-1GUNU0NOSy/KkwUpDaPXLCHl3nRAeX2G0i2+ueERcpjbEVcQwwAG7hRUbcwS93lkddrukFipE+Qmh8cvtq751A==
"@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.34-alpha.1",
"version": "2.0.34-alpha.3",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.0.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"version": "2.0.34-alpha.3",
"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.34-alpha.1",
"@budibase/pro": "2.0.34-alpha.1",
"@budibase/string-templates": "2.0.34-alpha.1",
"@budibase/types": "2.0.34-alpha.1",
"@budibase/backend-core": "2.0.34-alpha.3",
"@budibase/pro": "2.0.34-alpha.3",
"@budibase/string-templates": "2.0.34-alpha.3",
"@budibase/types": "2.0.34-alpha.3",
"@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.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.1.tgz#855277b12c31d7f9bc2d83b8b8c84031924cae50"
integrity sha512-4GZ3PzVIHBNtWkcUy6XvThGisdY+79waLiLngUp1HDawO+xJrpr1rA0WofwoYrK14ZfQzib8ujfMZWH2ujEtBQ==
"@budibase/backend-core@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.0.34-alpha.3.tgz#a05c7bb0b3b8537f46b0d797c613a1d54cbcc3a3"
integrity sha512-L4qZBkpc7LVMsHY8B9imXs3ZI1xNcuPeNe7q64k1VxypSkTwDdW6YmIebd0aoXrQxgl1FfotVR94dSM3B6sTxQ==
dependencies:
"@budibase/types" "2.0.34-alpha.1"
"@budibase/types" "2.0.34-alpha.3"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -328,22 +328,22 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@2.0.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.1.tgz#7da5e46bb38b7defe49b6029bd28cde1c7850eba"
integrity sha512-pIDQ0WXL3YfqBX0SjBGA9uxRFcHh+ydsC2aRe0gKCeTriNx0F76WlY4SiIn/5LuwnaH3xIcOAViMOGPDF1WTiQ==
"@budibase/pro@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.0.34-alpha.3.tgz#ebdf5f29f12273eda268d52940ba0d2b07147e3a"
integrity sha512-PwXETyajP40H5VvqKJGzKldsIBLnnXXxAMIKmWTz7dnDBCzjdurawotaSFXIno7Tr2NUG1H22inwKm99zs8pZg==
dependencies:
"@budibase/backend-core" "2.0.34-alpha.1"
"@budibase/types" "2.0.34-alpha.1"
"@budibase/backend-core" "2.0.34-alpha.3"
"@budibase/types" "2.0.34-alpha.3"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@2.0.34-alpha.1":
version "2.0.34-alpha.1"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.1.tgz#8e7a093ac12bedcb71a5b075cdd4d8bd543823b5"
integrity sha512-YbID4zuwktUNgX5PRvJVgt6LzuXLDVt0Vxs5SNOd+IsoC6yz8fZjKC4pNj4wd6QAiIw2+eOxzaNFbj8ogE1tPg==
"@budibase/types@2.0.34-alpha.3":
version "2.0.34-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.0.34-alpha.3.tgz#f2301ece6e65c09beb4a9c76b3b90bd77835f14b"
integrity sha512-1GUNU0NOSy/KkwUpDaPXLCHl3nRAeX2G0i2+ueERcpjbEVcQwwAG7hRUbcwS93lkddrukFipE+Qmh8cvtq751A==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"