diff --git a/lerna.json b/lerna.json index 249ae6885e..16540f235e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.0.34-alpha.1", + "version": "2.0.34-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6d9ea76a66..83ed8eb7d6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -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", diff --git a/packages/backend-core/src/objectStore/utils.js b/packages/backend-core/src/objectStore/utils.js index 9cf4f5f70e..2d4faf55d1 100644 --- a/packages/backend-core/src/objectStore/utils.js +++ b/packages/backend-core/src/objectStore/utils.js @@ -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 } diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8deaa4aaa8..37650dda37 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -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", diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 15200e111e..9e7d44dbc3 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -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 diff --git a/packages/builder/package.json b/packages/builder/package.json index 9bd800e205..a1d217f0a7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -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", diff --git a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte index b9ca38cf72..576cec488b 100644 --- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte +++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte @@ -77,7 +77,7 @@ title="Confirm Deletion" > Are you sure you wish to delete the backup - {row.name} + {row.name}? This action cannot be undone. diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte index 958ee995c7..9a9dc3c5c0 100644 --- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte +++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte @@ -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 }) @@ -169,7 +177,7 @@
- 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
- {:else if backupData?.length > 0} + {:else if backupData?.length === 0 && !loaded && !filterOpt && !startDate} + +
+ BackupsDefault + + You have no backups yet +
+ You can manually backup your app any time +
+
+ +
+
+
+
+ {:else if loaded}