From c0d16bd395698ef18528f9ca07d7e624be553cc6 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 21 Oct 2022 17:03:01 +0100
Subject: [PATCH] Updating frontend to allow searching by type and trigger.

---
 .../portal/overview/backups/BackupsTab.svelte | 51 ++++++++++++-------
 packages/builder/src/stores/portal/backups.js | 11 +++-
 packages/frontend-core/src/api/backups.js     |  5 +-
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
index 7ba2bd8370..cb20013b9b 100644
--- a/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
+++ b/packages/builder/src/components/portal/overview/backups/BackupsTab.svelte
@@ -24,18 +24,31 @@
 
   let backupData = null
   let modal
-  let trigger = null
   let pageInfo = createPaginationStore()
-  let startDate
-  let endDate
+  let filterOpt = null
+  let startDate = null
+  let endDate = null
+  let filters = getFilters()
 
   $: page = $pageInfo.page
-  $: fetchBackups(trigger, page, startDate, endDate)
+  $: fetchBackups(filterOpt, page, startDate, endDate)
 
-  const triggers = {
-    PUBLISH: "publish",
-    SCHEDULED: "scheduled",
-    MANUAL: "manual",
+  function getFilters() {
+    const options = []
+    let types = ["backup"]
+    let triggers = ["manual", "publish", "scheduled", "restoring"]
+    for (let type of types) {
+      for (let trigger of triggers) {
+        let label = `${trigger} ${type}`
+        label = label.charAt(0).toUpperCase() + label?.slice(1)
+        options.push({ label, value: { type, trigger } })
+      }
+    }
+    options.push({
+      label: `Manual restore`,
+      value: { type: "restore", trigger: "manual" },
+    })
+    return options
   }
 
   const schema = {
@@ -80,10 +93,10 @@
     })
   }
 
-  async function fetchBackups(trigger, page, startDate, endDate) {
+  async function fetchBackups(filters, page, startDate, endDate) {
     const response = await backups.searchBackups({
       appId: app.instance._id,
-      trigger,
+      ...filters,
       page,
       startDate,
       endDate,
@@ -100,7 +113,7 @@
         appId: app.instance._id,
         name,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
       notifications.success(response.message)
     } catch {
       notifications.error("Unable to create backup")
@@ -113,21 +126,21 @@
         appId: app.instance._id,
         backupId: detail.backupId,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupRestore") {
       await backups.restoreBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.restoreBackupName,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupUpdate") {
       await backups.updateBackup({
         appId: app.instance._id,
         backupId: detail.backupId,
         name: detail.name,
       })
-      await fetchBackups(trigger, page)
+      await fetchBackups(filterOpt, page)
     }
   }
 </script>
@@ -138,11 +151,11 @@
       <div class="select">
         <Select
           placeholder="All"
-          label="Trigger"
-          options={Object.values(triggers)}
-          getOptionLabel={trigger =>
-            trigger.charAt(0).toUpperCase() + trigger.slice(1)}
-          bind:value={trigger}
+          label="Type"
+          options={filters}
+          getOptionValue={filter => filter.value}
+          getOptionLabel={filter => filter.label}
+          bind:value={filterOpt}
         />
       </div>
       <div>
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
index af336c73ab..c041edbed8 100644
--- a/packages/builder/src/stores/portal/backups.js
+++ b/packages/builder/src/stores/portal/backups.js
@@ -11,8 +11,15 @@ export function createBackupsStore() {
     })
   }
 
-  async function searchBackups({ appId, trigger, page, startDate, endDate }) {
-    return API.searchBackups({ appId, trigger, page, startDate, endDate })
+  async function searchBackups({
+    appId,
+    trigger,
+    type,
+    page,
+    startDate,
+    endDate,
+  }) {
+    return API.searchBackups({ appId, trigger, type, page, startDate, endDate })
   }
 
   async function restoreBackup({ appId, backupId, name }) {
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
index 85df0eab1e..ad0be0ed70 100644
--- a/packages/frontend-core/src/api/backups.js
+++ b/packages/frontend-core/src/api/backups.js
@@ -2,13 +2,14 @@ export const buildBackupsEndpoints = API => ({
   /**
    * Gets a list of users in the current tenant.
    */
-  searchBackups: async ({ appId, trigger, page, startDate, endDate }) => {
+  searchBackups: async ({ appId, trigger, type, page, startDate, endDate }) => {
     const opts = {}
     if (page) {
       opts.page = page
     }
-    if (trigger) {
+    if (trigger && type) {
       opts.trigger = trigger.toLowerCase()
+      opts.type = type.toLowerCase()
     }
     if (startDate && endDate) {
       opts.startDate = startDate