Update backup endpoints and fix some errors

packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte

@@ -99,21 +99,18 @@
   }
 
   async function fetchBackups(filters, page, dateRange = []) {
-    const body = {
+    const opts = {
-      appId: $appStore.appId,
       ...filters,
       page,
     }
-
     const [startDate, endDate] = dateRange
     if (startDate) {
-      body.startDate = startDate
+      opts.startDate = startDate
     }
     if (endDate) {
-      body.endDate = endDate
+      opts.endDate = endDate
     }
-
+    const response = await backups.searchBackups($appStore.appId, opts)
-    const response = await backups.searchBackups(body)
     pageInfo.fetched(response.hasNextPage, response.nextPage)
 
     // flatten so we have an easier structure to use for the table schema
@@ -123,9 +120,7 @@
   async function createManualBackup() {
     try {
       loading = true
-      let response = await backups.createManualBackup({
+      let response = await backups.createManualBackup($appStore.appId)
-        appId: $appStore.appId,
-      })
       await fetchBackups(filterOpt, page)
       notifications.success(response.message)
     } catch (err) {
@@ -149,24 +144,14 @@
 
   async function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
-      await backups.deleteBackup({
+      await backups.deleteBackup($appStore.appId, detail.backupId)
-        appId: $appStore.appId,
-        backupId: detail.backupId,
-      })
       await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupRestore") {
-      await backups.restoreBackup({
+      await backups.restoreBackup(
-        appId: $appStore.appId,
+        $appStore.appId,
-        backupId: detail.backupId,
+        detail.backupId,
-        name: detail.restoreBackupName,
+        detail.restoreBackupName
-      })
+      )
-      await fetchBackups(filterOpt, page)
-    } else if (detail.type === "backupUpdate") {
-      await backups.updateBackup({
-        appId: $appStore.appId,
-        backupId: detail.backupId,
-        name: detail.name,
-      })
       await fetchBackups(filterOpt, page)
     }
   }

packages/builder/src/stores/portal/backups.js

@@ -11,40 +11,28 @@ export function createBackupsStore() {
     })
   }
 
-  async function searchBackups({
+  async function searchBackups(appId, opts) {
-    appId,
+    return API.searchBackups(appId, opts)
-    trigger,
-    type,
-    page,
-    startDate,
-    endDate,
-  }) {
-    return API.searchBackups(appId, { trigger, type, page, startDate, endDate })
   }
 
-  async function restoreBackup({ appId, backupId, name }) {
+  async function restoreBackup(appId, backupId, name) {
-    return API.restoreBackup({ appId, backupId, name })
+    return API.restoreBackup(appId, backupId, name)
   }
 
-  async function deleteBackup({ appId, backupId }) {
+  async function deleteBackup(appId, backupId) {
-    return API.deleteBackup({ appId, backupId })
+    return API.deleteBackup(appId, backupId)
   }
 
   async function createManualBackup(appId) {
     return API.createManualBackup(appId)
   }
 
-  async function updateBackup({ appId, backupId, name }) {
-    return API.updateBackup({ appId, backupId, name })
-  }
-
   return {
     createManualBackup,
     searchBackups,
     selectBackup,
     deleteBackup,
     restoreBackup,
-    updateBackup,
     subscribe: store.subscribe,
   }
 }

packages/builder/src/stores/portal/backups.test.js

@@ -20,7 +20,6 @@ vi.mock("api", () => {
       restoreBackup: vi.fn(() => "restoreBackupReturn"),
       deleteBackup: vi.fn(() => "deleteBackupReturn"),
       createManualBackup: vi.fn(() => "createManualBackupReturn"),
-      updateBackup: vi.fn(() => "updateBackupReturn"),
     },
   }
 })
@@ -61,8 +60,7 @@ describe("backups store", () => {
       ctx.page = "page"
       ctx.startDate = "startDate"
       ctx.endDate = "endDate"
-      ctx.value = await ctx.returnedStore.searchBackups({
+      ctx.value = await ctx.returnedStore.searchBackups(ctx.appId, {
-        appId: ctx.appId,
         trigger: ctx.trigger,
         type: ctx.type,
         page: ctx.page,
@@ -73,8 +71,7 @@ describe("backups store", () => {
 
     it("calls and returns the API searchBackups method", ctx => {
       expect(API.searchBackups).toHaveBeenCalledTimes(1)
-      expect(API.searchBackups).toHaveBeenCalledWith({
+      expect(API.searchBackups).toHaveBeenCalledWith(ctx.appId, {
-        appId: ctx.appId,
         trigger: ctx.trigger,
         type: ctx.type,
         page: ctx.page,
@@ -103,18 +100,12 @@ describe("backups store", () => {
     beforeEach(async ctx => {
       ctx.appId = "appId"
       ctx.backupId = "backupId"
-      ctx.value = await ctx.returnedStore.deleteBackup({
+      ctx.value = await ctx.returnedStore.deleteBackup(ctx.appId, ctx.backupId)
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-      })
     })
 
     it("calls and returns the API deleteBackup method", ctx => {
       expect(API.deleteBackup).toHaveBeenCalledTimes(1)
-      expect(API.deleteBackup).toHaveBeenCalledWith({
+      expect(API.deleteBackup).toHaveBeenCalledWith(ctx.appId, ctx.backupId)
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-      })
       expect(ctx.value).toBe("deleteBackupReturn")
     })
   })
@@ -124,47 +115,24 @@ describe("backups store", () => {
       ctx.appId = "appId"
       ctx.backupId = "backupId"
       ctx.$name = "name" // `name` is used by some sort of internal ctx thing and is readonly
-      ctx.value = await ctx.returnedStore.restoreBackup({
+      ctx.value = await ctx.returnedStore.restoreBackup(
-        appId: ctx.appId,
+        ctx.appId,
-        backupId: ctx.backupId,
+        ctx.backupId,
-        name: ctx.$name,
+        ctx.$name
-      })
+      )
     })
 
     it("calls and returns the API restoreBackup method", ctx => {
       expect(API.restoreBackup).toHaveBeenCalledTimes(1)
-      expect(API.restoreBackup).toHaveBeenCalledWith({
+      expect(API.restoreBackup).toHaveBeenCalledWith(
-        appId: ctx.appId,
+        ctx.appId,
-        backupId: ctx.backupId,
+        ctx.backupId,
-        name: ctx.$name,
+        ctx.$name
-      })
+      )
       expect(ctx.value).toBe("restoreBackupReturn")
     })
   })
 
-  describe("updateBackup", () => {
-    beforeEach(async ctx => {
-      ctx.appId = "appId"
-      ctx.backupId = "backupId"
-      ctx.$name = "name" // `name` is used by some sort of internal ctx thing and is readonly
-      ctx.value = await ctx.returnedStore.updateBackup({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
-    })
-
-    it("calls and returns the API updateBackup method", ctx => {
-      expect(API.updateBackup).toHaveBeenCalledTimes(1)
-      expect(API.updateBackup).toHaveBeenCalledWith({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
-      expect(ctx.value).toBe("updateBackupReturn")
-    })
-  })
-
   describe("subscribe", () => {
     it("calls and returns the API updateBackup method", ctx => {
       expect(ctx.returnedStore.subscribe).toBe(ctx.writableReturn.subscribe)

packages/frontend-core/src/api/analytics.ts

@@ -30,6 +30,7 @@ export const buildAnalyticsEndpoints = (
         ...request,
         timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       },
+      parseResponse: () => null,
     })
   },
 })

packages/frontend-core/src/api/backups.ts

@@ -1,26 +1,20 @@
 import {
-  CreateAppBackupRequest,
   CreateAppBackupResponse,
   ImportAppBackupResponse,
   SearchAppBackupsRequest,
-  UpdateAppBackupRequest,
 } from "@budibase/types"
 import { BaseAPIClient } from "./types"
 
 export interface BackupEndpoints {
-  createManualBackup: (
+  createManualBackup: (appId: string) => Promise<CreateAppBackupResponse>
-    appId: string,
-    name?: string
-  ) => Promise<CreateAppBackupResponse>
   restoreBackup: (
     appId: string,
     backupId: string,
-    name: string
+    name?: string
   ) => Promise<ImportAppBackupResponse>
 
   // Missing request or response types
   searchBackups: (appId: string, opts: SearchAppBackupsRequest) => Promise<any>
-  updateBackup: (appId: string, backupId: string, name: string) => Promise<any>
   deleteBackup: (
     appId: string,
     backupId: string
@@ -28,14 +22,9 @@ export interface BackupEndpoints {
 }
 
 export const buildBackupEndpoints = (API: BaseAPIClient): BackupEndpoints => ({
-  createManualBackup: async (appId, name) => {
+  createManualBackup: async appId => {
-    return await API.post<CreateAppBackupRequest, CreateAppBackupResponse>({
+    return await API.post({
       url: `/api/apps/${appId}/backups`,
-      body: name
-        ? {
-            name,
-          }
-        : undefined,
     })
   },
   searchBackups: async (appId, opts) => {
@@ -49,15 +38,12 @@ export const buildBackupEndpoints = (API: BaseAPIClient): BackupEndpoints => ({
       url: `/api/apps/${appId}/backups/${backupId}`,
     })
   },
-  updateBackup: async (appId, backupId, name) => {
-    return await API.patch<UpdateAppBackupRequest, any>({
-      url: `/api/apps/${appId}/backups/${backupId}`,
-      body: { name },
-    })
-  },
   restoreBackup: async (appId, backupId, name) => {
     return await API.post({
       url: `/api/apps/${appId}/backups/${backupId}/import`,
+      // Name is a legacy thing, but unsure if it is needed for restoring.
+      // Leaving this in just in case, but not type casting the body here
+      // as we won't normally have it, but it's required in the type.
       body: { name },
     })
   },

packages/frontend-core/src/api/index.ts

@@ -160,8 +160,10 @@ export const createAPIClient = (config: APIClientConfig = {}): APIClient => {
       try {
         if (parseResponse) {
           return await parseResponse(response)
-        } else {
+        } else if (response.status !== 204) {
           return (await response.json()) as ResponseT
+        } else {
+          return undefined
         }
       } catch (error) {
         delete cache[url]