From fc2e399a1ca7d3c334e569cf086c8af053920e3a Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 25 Oct 2022 16:05:19 +0100 Subject: [PATCH 01/11] Assorted Backups UI fixes --- packages/bbui/src/Form/Core/DatePicker.svelte | 2 +- .../overview/backups/ActionsRenderer.svelte | 2 +- .../portal/overview/backups/BackupsTab.svelte | 54 +++++++++++-------- .../overview/backups/CreateBackupModal.svelte | 1 + .../backups/CreateRestoreModal.svelte | 2 +- 5 files changed, 35 insertions(+), 26 deletions(-) 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/src/components/portal/overview/backups/ActionsRenderer.svelte b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte index b9ca38cf72..a243992c5c 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..9c1db4e978 100644 --- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte +++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte @@ -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%", }, } @@ -169,7 +176,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 +202,32 @@ window.open("https://budibase.com/pricing/", "_blank") }} > - View Plans + View plans
- {:else if backupData?.length > 0} + {:else if backupData?.length === 0 && !filterOpt && !startDate} + +
+ BackupsDefault + + You have no backups yet +
+ You can manually backup your app any time +
+
+ +
+
+
+
+ {:else}