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..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}
@@ -235,6 +263,7 @@
- {:else if backupData?.length === 0} - -
- BackupsDefault - - You have no backups yet -
- You can manually backup your app any time -
-
- -
- -
- {/if} diff --git a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte index d7a511890e..4701115640 100644 --- a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte +++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte @@ -13,6 +13,7 @@ createManualBackup(name)} title="Create new backup" + diabled={!name} confirmText="Create" > diff --git a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte index 4ffb105772..62ef3e239d 100644 --- a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte +++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte @@ -12,7 +12,7 @@ confirm(name)} - title="Backup your current version" + title="Back up your current version" confirmText="Confirm Restore" disabled={!name} >