yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Internal server error during import with nested documents

Browse Source
This commit is contained in:
Tom Moor
2023-11-09 10:12:33 -05:00
parent 0964d03a17
commit 1a556b6ff2
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/queues/tasks/ImportMarkdownZipTask.ts
View File

@@ -107,18 +107,27 @@ export default class ImportMarkdownZipTask extends ImportTask {
? new Date(metadata.updatedAt)
: zipObject.date;
const existingEmptyDocumentIndex = output.documents.findIndex(
const existingDocumentIndex = output.documents.findIndex(
(doc) =>
doc.title === title &&
doc.collectionId === collectionId &&
doc.parentDocumentId === parentDocumentId &&
doc.text === ""
doc.parentDocumentId === parentDocumentId
);
const existingDocument = output.documents[existingDocumentIndex];
// When there is a file and a folder with the same name this handles
// the case by combining the two into one document with nested children
if (existingEmptyDocumentIndex !== -1) {
output.documents[existingEmptyDocumentIndex].text = text;
if (existingDocument) {
if (existingDocument.text === "") {
output.documents[existingDocumentIndex].text = text;
}
await parseNodeChildren(
child.children,
collectionId,
existingDocument.id
);
} else {
output.documents.push({
id,
@@ -131,9 +140,9 @@ export default class ImportMarkdownZipTask extends ImportTask {
parentDocumentId,
path: child.path,
});
}
await parseNodeChildren(child.children, collectionId, id);
await parseNodeChildren(child.children, collectionId, id);
}
})
);
}