agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-28 19:41:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2849 from overleaf/em-convert-file-to-doc

Browse Source 
Fix update order when converting a file to a doc

GitOrigin-RevId: a0c9488e3870cc972c21b40ff0e2577fcec40ee0
This commit is contained in:
Eric Mc Sween
2020-05-20 10:14:49 -04:00
committed by Copybot
parent f5b2640c82
commit 8ba63b0f8e
6 changed files with 600 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
View File

@@ -607,7 +607,7 @@ const ProjectEntityUpdateHandler = {
}
ProjectLocator.findElement(
{ project_id: projectId, element_id: folderId, type: 'folder' },
(error, folder, path) => {
(error, folder, folderPath) => {
if (error != null) {
return callback(error)
}
@@ -620,6 +620,7 @@ const ProjectEntityUpdateHandler = {
)
if (existingFile) {
const doc = new Doc({ name: docName })
const filePath = `${folderPath.fileSystem}/${existingFile.name}`
DocstoreManager.updateDoc(
projectId.toString(),
doc._id.toString(),
@@ -642,7 +643,7 @@ const ProjectEntityUpdateHandler = {
{
project_id: projectId,
doc_id: doc._id,
path: path.fileSystem,
path: filePath,
project_name: project.name,
rev: existingFile.rev + 1
},
@@ -650,7 +651,6 @@ const ProjectEntityUpdateHandler = {
if (err) {
return callback(err)
}
const docPath = path.fileSystem
const projectHistoryId =
project.overleaf &&
project.overleaf.history &&
@@ -658,14 +658,14 @@ const ProjectEntityUpdateHandler = {
const newDocs = [
{
doc,
path: docPath,
path: filePath,
docLines: docLines.join('\n')
}
]
const oldFiles = [
{
file: existingFile,
path: Path.join(path.fileSystem, existingFile.name)
path: filePath
}
]
DocumentUpdaterHandler.updateProjectStructure(