From 9ec77c45c8c9334db977c9f2ca0652231198fea2 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 8 Mar 2024 10:24:48 +0000 Subject: [PATCH] Adding test case to confirm works as expected. --- packages/server/src/api/controllers/public/utils.ts | 3 ++- packages/server/src/api/controllers/row/index.ts | 5 ++++- packages/server/src/api/routes/tests/row.spec.ts | 11 +++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/public/utils.ts b/packages/server/src/api/controllers/public/utils.ts index 1d67b49e0d..ec1d7cfa47 100644 --- a/packages/server/src/api/controllers/public/utils.ts +++ b/packages/server/src/api/controllers/public/utils.ts @@ -1,11 +1,12 @@ import { context } from "@budibase/backend-core" import { isExternalTableID } from "../../../integrations/utils" import { APP_PREFIX, DocumentType } from "../../../db/utils" +import { Row } from "@budibase/types" export async function addRev( body: { _id?: string; _rev?: string }, tableId?: string -) { +): Promise { if (!body._id || (tableId && isExternalTableID(tableId))) { return body } diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index 54c294c42b..3466a4491d 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -131,7 +131,10 @@ async function processDeleteRowsRequest(ctx: UserCtx) { : fixRow(processedRow, ctx.params) }) - return await Promise.all(processedRows) + const responses = await Promise.allSettled(processedRows) + return responses + .filter(resp => resp.status === "fulfilled") + .map(resp => (resp as PromiseFulfilledResult).value) } async function deleteRows(ctx: UserCtx) { diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index de411f5397..a032f4324c 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -636,6 +636,17 @@ describe.each([ expect(res[0]._id).toEqual(createdRow._id) await assertRowUsage(rowUsage - 1) }) + + it("should be able to bulk delete rows, including a row that doesn't exist", async () => { + const createdRow = await config.createRow() + + const res = await config.api.row.bulkDelete(table._id!, { + rows: [createdRow, { _id: "2" }], + }) + + expect(res[0]._id).toEqual(createdRow._id) + expect(res.length).toEqual(1) + }) }) describe("validate", () => {