MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix download issue and pass name for backup after restore

This commit is contained in:
Peter Clement 2022-10-21 14:10:08 +01:00
parent b4a223be3d
commit 02b505c75c
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,6 @@
import ConfirmDialog from "components/common/ConfirmDialog.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import CreateRestoreModal from "./CreateRestoreModal.svelte" import CreateRestoreModal from "./CreateRestoreModal.svelte"
import { createEventDispatcher } from "svelte" import { createEventDispatcher } from "svelte"
import download from "downloadjs"
import { backups } from "stores/portal"
export let row export let row
@ -20,7 +18,6 @@
let restoreDialog let restoreDialog
let updateDialog let updateDialog
let name let name
let restoreBackupName
let restoreBackupModal let restoreBackupModal
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
@ -30,7 +27,7 @@
type: "backupRestore", type: "backupRestore",
name, name,
backupId: row._id, backupId: row._id,
restoreBackupName, restoreBackupName: name,
}) })
} }
@ -48,12 +45,9 @@
name, name,
}) })
} }
async function downloadExport() { async function downloadExport() {
let resp = await backups.downloadBackup({ window.location = `/api/apps/${row.appId}/backups/${row._id}/file`
backupId: row._id,
appId: row.appId,
})
download(resp, row.filename)
} }
</script> </script>

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

@ -107,7 +107,6 @@
} }
async function handleButtonClick({ detail }) { async function handleButtonClick({ detail }) {
console.log(detail.type)
if (detail.type === "backupDelete") { if (detail.type === "backupDelete") {
await backups.deleteBackup({ await backups.deleteBackup({
appId: app.instance._id, appId: app.instance._id,
@ -118,6 +117,7 @@
await backups.restoreBackup({ await backups.restoreBackup({
appId: app.instance._id, appId: app.instance._id,
backupId: detail.backupId, backupId: detail.backupId,
name: detail.restoreBackupName,
}) })
} else if (detail.type === "backupUpdate") { } else if (detail.type === "backupUpdate") {
await backups.updateBackup({ await backups.updateBackup({

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

@ -2,7 +2,7 @@
import { Badge } from "@budibase/bbui" import { Badge } from "@budibase/bbui"
export let value = "started" export let value = "started"
$: status = value.charAt(0).toUpperCase() + value.slice(1) $: status = value?.charAt(0).toUpperCase() + value?.slice(1)
</script> </script>
<Badge green={value === "complete"} red={value === "failed"} size="S"> <Badge green={value === "complete"} red={value === "failed"} size="S">

4
packages/builder/src/stores/portal/backups.js
View File

@ -15,8 +15,8 @@ export function createBackupsStore() {
return API.searchBackups({ appId, trigger, page, startDate, endDate }) return API.searchBackups({ appId, trigger, page, startDate, endDate })
} }
async function restoreBackup({ appId, backupId }) { async function restoreBackup({ appId, backupId, name }) {
return API.restoreBackup({ appId, backupId }) return API.restoreBackup({ appId, backupId, name })
} }
async function deleteBackup({ appId, backupId }) { async function deleteBackup({ appId, backupId }) {