ui comments

2022-10-24 16:52:29 +01:00 · 2022-10-24 16:52:29 +01:00 · 195beec069
parent 5942c65d31
commit 195beec069
4 changed files with 25 additions and 13 deletions
--- a/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
+++ b/packages/builder/src/components/portal/overview/backups/ActionsRenderer.svelte
@ -47,7 +47,7 @@
  }

  async function downloadExport() {
-    window.location = `/api/apps/${row.appId}/backups/${row._id}/file`
+    window.open(`/api/apps/${row.appId}/backups/${row._id}/file`, "_blank")
  }
 </script>

@ -88,7 +88,7 @@
  title="Confirm restore"
  warning={false}
 >
-  <Heading size="S">{row.name}</Heading>
+  <Heading size="S">{row.name || "Backup"}</Heading>
  <Body size="S">{new Date(row.timestamp).toLocaleString()}</Body>
 </ConfirmDialog>

--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@ -26,6 +26,8 @@
  import StatusRenderer from "./StatusRenderer.svelte"
  import TypeRenderer from "./TypeRenderer.svelte"
  import BackupsDefault from "assets/backups-default.png"
+  import { onMount } from "svelte"
+
  export let app

  let backupData = null
@ -149,6 +151,10 @@
      await fetchBackups(filterOpt, page)
    }
  }
+
+  onMount(() => {
+    fetchBackups(filterOpt, page, startDate, endDate)
+  })
 </script>

 <div class="root">
@ -171,14 +177,16 @@
        </div>
        <Divider />
        <div class="pro-buttons">
-          <Button
-            newStyles
-            primary
-            disabled={!$auth.accountPortalAccess && $admin.cloud}
-            on:click={$licensing.goToUpgradePage()}
-          >
-            Upgrade
-          </Button>
+          {#if $auth.accountPortalAccess}
+            <Button
+              newStyles
+              primary
+              disabled={!$auth.accountPortalAccess && $admin.cloud}
+              on:click={$licensing.goToUpgradePage()}
+            >
+              Upgrade
+            </Button>
+          {/if}
          <!--Show the view plans button-->
          <Button
            newStyles
@ -252,7 +260,7 @@
      <div class="align">
        <img
          width="200px"
-          height="100px"
+          height="120px"
          src={BackupsDefault}
          alt="BackupsDefault"
        />
--- a/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateBackupModal.svelte
@ -1,9 +1,13 @@
 <script>
  import { ModalContent, Input } from "@budibase/bbui"
+  import { auth } from "stores/portal"

  export let createManualBackup

-  let name
+  let templateName = $auth.user.firstName
+    ? `${$auth.user.firstName}'s Backup`
+    : "New Backup"
+  let name = templateName
 </script>

 <ModalContent
--- a/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
+++ b/packages/builder/src/components/portal/overview/backups/CreateRestoreModal.svelte
@ -1,7 +1,7 @@
 <script>
  import { ModalContent, Input, Body } from "@budibase/bbui"
  import { auth } from "stores/portal"
-  $: console.log($auth.user)
+
  export let confirm

  let templateName = $auth.user.firstName