MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle empty attachments

This commit is contained in:
Adria Navarro 2024-04-02 22:12:09 +02:00
parent ac5d578349
commit 151ea235f1
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/client/src/utils/buttonActions.js
View File

@ -406,7 +406,12 @@ const downloadFileHandler = async action => {
const { type } = action.parameters const { type } = action.parameters
if (type === "attachment") { if (type === "attachment") {
const { tableId, rowId, attachmentColumn } = action.parameters const { tableId, rowId, attachmentColumn } = action.parameters
const res = await API.downloadAttachment(tableId, rowId, attachmentColumn) const res = await API.downloadAttachment(
tableId,
rowId,
attachmentColumn,
{ suppressErrors: true }
)
await downloadStream(res) await downloadStream(res)
return return
} }
@ -429,7 +434,11 @@ const downloadFileHandler = async action => {
URL.revokeObjectURL(objectUrl) URL.revokeObjectURL(objectUrl)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
notificationStore.actions.error("File cannot be downloaded") if (e.status === 404) {
notificationStore.actions.error("File is empty")
} else {
notificationStore.actions.error("File cannot be downloaded")
}
} }
} }

3
packages/frontend-core/src/api/attachments.js
View File

@ -95,10 +95,11 @@ export const buildAttachmentEndpoints = API => {
* @param rowId * @param rowId
* @param columnName the attachments to delete * @param columnName the attachments to delete
*/ */
downloadAttachment: async (tableId, rowId, columnName) => { downloadAttachment: async (tableId, rowId, columnName, options) => {
return await API.get({ return await API.get({
url: `/api/${tableId}/rows/${rowId}/attachment/${columnName}`, url: `/api/${tableId}/rows/${rowId}/attachment/${columnName}`,
parseResponse: response => response, parseResponse: response => response,
suppressErrors: options?.suppressErrors,
}) })
}, },
} }

4
packages/server/src/api/controllers/row/index.ts
View File

@ -263,7 +263,8 @@ export async function downloadAttachment(ctx: UserCtx) {
const tableId = utils.getTableId(ctx) const tableId = utils.getTableId(ctx)
const row = await pickApi(tableId).find(ctx) const row = await pickApi(tableId).find(ctx)
if (!row[columnName]) { const table = await sdk.tables.getTable(tableId)
if (!table.schema[columnName]) {
ctx.throw(400, `'${columnName}' is not valid`) ctx.throw(400, `'${columnName}' is not valid`)
} }
@ -293,7 +294,6 @@ export async function downloadAttachment(ctx: UserCtx) {
archive.append(attachmentStream, { name: attachment.name }) archive.append(attachmentStream, { name: attachment.name })
} }
const table = await sdk.tables.getTable(tableId)
const displayName = row[table.primaryDisplay || "_id"] const displayName = row[table.primaryDisplay || "_id"]
ctx.attachment(`${displayName}_${columnName}.zip`) ctx.attachment(`${displayName}_${columnName}.zip`)
archive.finalize() archive.finalize()