Merge pull request #14758 from Budibase/budi-8717-if-you-delete-a-table-that-has-a-row-action-attached-it
Properly clean up row actions on table deletion.
This commit is contained in:
commit
163b459462
|
@ -211,6 +211,17 @@ export class DatabaseImpl implements Database {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async tryGet<T extends Document>(id?: string): Promise<T | undefined> {
|
||||||
|
try {
|
||||||
|
return await this.get<T>(id)
|
||||||
|
} catch (err: any) {
|
||||||
|
if (err.statusCode === 404) {
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async getMultiple<T extends Document>(
|
async getMultiple<T extends Document>(
|
||||||
ids: string[],
|
ids: string[],
|
||||||
opts?: { allowMissing?: boolean; excludeDocs?: boolean }
|
opts?: { allowMissing?: boolean; excludeDocs?: boolean }
|
||||||
|
|
|
@ -42,6 +42,13 @@ export class DDInstrumentedDatabase implements Database {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tryGet<T extends Document>(id?: string | undefined): Promise<T | undefined> {
|
||||||
|
return tracer.trace("db.tryGet", span => {
|
||||||
|
span?.addTags({ db_name: this.name, doc_id: id })
|
||||||
|
return this.db.tryGet(id)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
getMultiple<T extends Document>(
|
getMultiple<T extends Document>(
|
||||||
ids: string[],
|
ids: string[],
|
||||||
opts?: { allowMissing?: boolean | undefined } | undefined
|
opts?: { allowMissing?: boolean | undefined } | undefined
|
||||||
|
|
|
@ -21,14 +21,15 @@ export async function find(ctx: Ctx<void, RowActionsResponse>) {
|
||||||
const table = await getTable(ctx)
|
const table = await getTable(ctx)
|
||||||
const tableId = table._id!
|
const tableId = table._id!
|
||||||
|
|
||||||
if (!(await sdk.rowActions.docExists(tableId))) {
|
const rowActions = await sdk.rowActions.getAll(tableId)
|
||||||
|
if (!rowActions) {
|
||||||
ctx.body = {
|
ctx.body = {
|
||||||
actions: {},
|
actions: {},
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const { actions } = await sdk.rowActions.getAll(tableId)
|
const { actions } = rowActions
|
||||||
const result: RowActionsResponse = {
|
const result: RowActionsResponse = {
|
||||||
actions: Object.entries(actions).reduce<Record<string, RowActionResponse>>(
|
actions: Object.entries(actions).reduce<Record<string, RowActionResponse>>(
|
||||||
(acc, [key, action]) => ({
|
(acc, [key, action]) => ({
|
||||||
|
|
|
@ -139,6 +139,7 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
|
||||||
export async function destroy(ctx: UserCtx) {
|
export async function destroy(ctx: UserCtx) {
|
||||||
const appId = ctx.appId
|
const appId = ctx.appId
|
||||||
const tableId = ctx.params.tableId
|
const tableId = ctx.params.tableId
|
||||||
|
await sdk.rowActions.deleteAll(tableId)
|
||||||
const deletedTable = await pickApi({ tableId }).destroy(ctx)
|
const deletedTable = await pickApi({ tableId }).destroy(ctx)
|
||||||
await events.table.deleted(deletedTable)
|
await events.table.deleted(deletedTable)
|
||||||
ctx.eventEmitter &&
|
ctx.eventEmitter &&
|
||||||
|
|
|
@ -1041,4 +1041,44 @@ describe("/rowsActions", () => {
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("scenarios", () => {
|
||||||
|
// https://linear.app/budibase/issue/BUDI-8717/
|
||||||
|
it("should not brick the app when deleting a table with row actions", async () => {
|
||||||
|
const view = await config.api.viewV2.create({
|
||||||
|
tableId,
|
||||||
|
name: generator.guid(),
|
||||||
|
schema: {
|
||||||
|
name: { visible: true },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const rowAction = await config.api.rowAction.save(tableId, {
|
||||||
|
name: generator.guid(),
|
||||||
|
})
|
||||||
|
|
||||||
|
await config.api.rowAction.setViewPermission(
|
||||||
|
tableId,
|
||||||
|
view.id,
|
||||||
|
rowAction.id
|
||||||
|
)
|
||||||
|
|
||||||
|
let actionsResp = await config.api.rowAction.find(tableId)
|
||||||
|
expect(actionsResp.actions[rowAction.id]).toEqual({
|
||||||
|
...rowAction,
|
||||||
|
allowedSources: [tableId, view.id],
|
||||||
|
})
|
||||||
|
|
||||||
|
const table = await config.api.table.get(tableId)
|
||||||
|
await config.api.table.destroy(table._id!, table._rev!)
|
||||||
|
|
||||||
|
// In the bug reported by Conor, when a delete got deleted its row action
|
||||||
|
// document was not being cleaned up. This meant there existed code paths
|
||||||
|
// that would find it and try to reference the tables within it, resulting
|
||||||
|
// in errors.
|
||||||
|
await config.api.automation.fetchEnriched({
|
||||||
|
status: 200,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -26,13 +26,13 @@ export async function getBuilderData(
|
||||||
return tableNameCache[tableId]
|
return tableNameCache[tableId]
|
||||||
}
|
}
|
||||||
|
|
||||||
const rowActionNameCache: Record<string, TableRowActions> = {}
|
const rowActionNameCache: Record<string, TableRowActions | undefined> = {}
|
||||||
async function getRowActionName(tableId: string, rowActionId: string) {
|
async function getRowActionName(tableId: string, rowActionId: string) {
|
||||||
if (!rowActionNameCache[tableId]) {
|
if (!rowActionNameCache[tableId]) {
|
||||||
rowActionNameCache[tableId] = await sdk.rowActions.getAll(tableId)
|
rowActionNameCache[tableId] = await sdk.rowActions.getAll(tableId)
|
||||||
}
|
}
|
||||||
|
|
||||||
return rowActionNameCache[tableId].actions[rowActionId]?.name
|
return rowActionNameCache[tableId]?.actions[rowActionId]?.name
|
||||||
}
|
}
|
||||||
|
|
||||||
const result: Record<string, AutomationBuilderData> = {}
|
const result: Record<string, AutomationBuilderData> = {}
|
||||||
|
@ -51,6 +51,10 @@ export async function getBuilderData(
|
||||||
const tableName = await getTableName(tableId)
|
const tableName = await getTableName(tableId)
|
||||||
const rowActionName = await getRowActionName(tableId, rowActionId)
|
const rowActionName = await getRowActionName(tableId, rowActionId)
|
||||||
|
|
||||||
|
if (!rowActionName) {
|
||||||
|
throw new Error(`Row action not found: ${rowActionId}`)
|
||||||
|
}
|
||||||
|
|
||||||
result[automation._id!] = {
|
result[automation._id!] = {
|
||||||
displayName: `${tableName}: ${automation.name}`,
|
displayName: `${tableName}: ${automation.name}`,
|
||||||
triggerInfo: {
|
triggerInfo: {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { context, docIds, HTTPError, utils } from "@budibase/backend-core"
|
import { context, docIds, HTTPError, utils } from "@budibase/backend-core"
|
||||||
import {
|
import {
|
||||||
|
Automation,
|
||||||
AutomationTriggerStepId,
|
AutomationTriggerStepId,
|
||||||
SEPARATOR,
|
SEPARATOR,
|
||||||
TableRowActions,
|
TableRowActions,
|
||||||
|
@ -102,7 +103,25 @@ export async function get(tableId: string, rowActionId: string) {
|
||||||
export async function getAll(tableId: string) {
|
export async function getAll(tableId: string) {
|
||||||
const db = context.getAppDB()
|
const db = context.getAppDB()
|
||||||
const rowActionsId = generateRowActionsID(tableId)
|
const rowActionsId = generateRowActionsID(tableId)
|
||||||
return await db.get<TableRowActions>(rowActionsId)
|
return await db.tryGet<TableRowActions>(rowActionsId)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteAll(tableId: string) {
|
||||||
|
const db = context.getAppDB()
|
||||||
|
|
||||||
|
const doc = await getAll(tableId)
|
||||||
|
if (!doc) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const automationIds = Object.values(doc.actions).map(a => a.automationId)
|
||||||
|
const automations = await db.getMultiple<Automation>(automationIds)
|
||||||
|
|
||||||
|
for (const automation of automations) {
|
||||||
|
await sdk.automations.remove(automation._id!, automation._rev!)
|
||||||
|
}
|
||||||
|
|
||||||
|
await db.remove(doc)
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function docExists(tableId: string) {
|
export async function docExists(tableId: string) {
|
||||||
|
@ -223,9 +242,8 @@ export async function run(tableId: any, rowActionId: any, rowId: string) {
|
||||||
throw new HTTPError("Table not found", 404)
|
throw new HTTPError("Table not found", 404)
|
||||||
}
|
}
|
||||||
|
|
||||||
const { actions } = await getAll(tableId)
|
const rowActions = await getAll(tableId)
|
||||||
|
const rowAction = rowActions?.actions[rowActionId]
|
||||||
const rowAction = actions[rowActionId]
|
|
||||||
if (!rowAction) {
|
if (!rowAction) {
|
||||||
throw new HTTPError("Row action not found", 404)
|
throw new HTTPError("Row action not found", 404)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { Automation } from "@budibase/types"
|
import { Automation, FetchAutomationResponse } from "@budibase/types"
|
||||||
import { Expectations, TestAPI } from "./base"
|
import { Expectations, TestAPI } from "./base"
|
||||||
|
|
||||||
export class AutomationAPI extends TestAPI {
|
export class AutomationAPI extends TestAPI {
|
||||||
|
@ -14,6 +14,26 @@ export class AutomationAPI extends TestAPI {
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fetch = async (
|
||||||
|
expectations?: Expectations
|
||||||
|
): Promise<FetchAutomationResponse> => {
|
||||||
|
return await this._get<FetchAutomationResponse>(`/api/automations`, {
|
||||||
|
expectations,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fetchEnriched = async (
|
||||||
|
expectations?: Expectations
|
||||||
|
): Promise<FetchAutomationResponse> => {
|
||||||
|
return await this._get<FetchAutomationResponse>(
|
||||||
|
`/api/automations?enrich=true`,
|
||||||
|
{
|
||||||
|
expectations,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
post = async (
|
post = async (
|
||||||
body: Automation,
|
body: Automation,
|
||||||
expectations?: Expectations
|
expectations?: Expectations
|
||||||
|
|
|
@ -129,7 +129,12 @@ export interface Database {
|
||||||
name: string
|
name: string
|
||||||
|
|
||||||
exists(): Promise<boolean>
|
exists(): Promise<boolean>
|
||||||
|
/**
|
||||||
|
* @deprecated the plan is to get everything using `tryGet` instead, then rename
|
||||||
|
* `tryGet` to `get`.
|
||||||
|
*/
|
||||||
get<T extends Document>(id?: string): Promise<T>
|
get<T extends Document>(id?: string): Promise<T>
|
||||||
|
tryGet<T extends Document>(id?: string): Promise<T | undefined>
|
||||||
exists(docId: string): Promise<boolean>
|
exists(docId: string): Promise<boolean>
|
||||||
getMultiple<T extends Document>(
|
getMultiple<T extends Document>(
|
||||||
ids: string[],
|
ids: string[],
|
||||||
|
|
Loading…
Reference in New Issue