1
0
Fork 0
mirror of synced 2024-06-27 18:40:42 +12:00

Merge pull request #8395 from Budibase/pc/backups-ui-fixes

Assorted Backups UI fixes
This commit is contained in:
Peter Clement 2022-10-26 10:03:18 +01:00 committed by GitHub
commit 0dc7463826
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 27 deletions

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

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>

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>

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
>

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}
>