Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2025-11-13 17:12:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix page export failure when title contains non-ASCII characters (#309)

Browse Source
This commit is contained in:
Philip Okugbe
2024-09-13 17:40:24 +01:00
committed by GitHub
parent be0d97661a
commit 0b6730c06f
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/client/src/features/page/services/page-service.ts
View File

@ -59,12 +59,12 @@ export async function exportPage(data: IExportPageParams): Promise<void> {
const req = await api.post("/pages/export", data, {
responseType: "blob",
});
console.log(req?.headers);
const fileName = req?.headers["content-disposition"]
.split("filename=")[1]
.replace(/"/g, "");
saveAs(req.data, fileName);
saveAs(req.data, decodeURIComponent(fileName));
}
export async function importPage(file: File, spaceId: string) {
@ -81,15 +81,18 @@ export async function importPage(file: File, spaceId: string) {
return req.data;
}
export async function uploadFile(file: File, pageId: string, attachmentId?: string): Promise<IAttachment> {
export async function uploadFile(
file: File,
pageId: string,
attachmentId?: string,
): Promise<IAttachment> {
const formData = new FormData();
if(attachmentId){
if (attachmentId) {
formData.append("attachmentId", attachmentId);
}
formData.append("pageId", pageId);
formData.append("file", file);
const req = await api.post<IAttachment>("/files/upload", formData, {
headers: {
"Content-Type": "multipart/form-data",

2
apps/server/src/core/attachment/attachment.controller.ts
View File

@ -182,7 +182,7 @@ export class AttachmentController {
if (!inlineFileExtensions.includes(attachment.fileExt)) {
res.header(
'Content-Disposition',
`attachment; filename="${attachment.fileName}"`,
`attachment; filename="${encodeURIComponent(attachment.fileName)}"`,
);
}

3
apps/server/src/integrations/export/export.controller.ts
View File

@ -61,7 +61,8 @@ export class ImportController {
res.headers({
'Content-Type': getMimeType(fileExt),
'Content-Disposition': 'attachment; filename="' + fileName + '"',
'Content-Disposition':
'attachment; filename="' + encodeURIComponent(fileName) + '"',
});
res.send(rawContent);