github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "Revert "format fix"""

Browse source 
This reverts commit abb3f94c50b94cd87012d9e55c40afd9cbfe97e0.

GitOrigin-RevId: 090e01b96222024341e3c988ec3ba4c9fa1eef11
This commit is contained in:
Ersun Warncke 2020-02-11 09:19:47 -04:00 committed by Copybot
parent 02140124bd
commit b4cdfc43cf
3 changed files with 44 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
services/web/app/src/Features/Compile/CompileController.js
View file

@ -44,10 +44,7 @@ module.exports = CompileController = {
if (req.body.rootDoc_id) {
options.rootDoc_id = req.body.rootDoc_id
} else if (
req.body.settingsOverride &&
req.body.settingsOverride.rootDoc_id
) {
} else if (req.body.settingsOverride && req.body.settingsOverride.rootDoc_id) {
// Can be removed after deploy
options.rootDoc_id = req.body.settingsOverride.rootDoc_id
}
@ -57,38 +54,35 @@ module.exports = CompileController = {
if (req.body.draft) {
options.draft = req.body.draft
}
if (['validate', 'error', 'silent'].includes(req.body.check)) {
if (
['validate', 'error', 'silent'].includes(req.body.check)
) {
options.check = req.body.check
}
if (req.body.incrementalCompilesEnabled) {
options.incrementalCompilesEnabled = true
}
CompileManager.compile(
project_id,
user_id,
options,
(
error,
CompileManager.compile(project_id, user_id, options, (
error,
status,
outputFiles,
clsiServerId,
limits,
validationProblems
) => {
if (error) {
return next(error)
}
res.json({
status,
outputFiles,
compileGroup: limits != null ? limits.compileGroup : undefined,
clsiServerId,
limits,
validationProblems
) => {
if (error) {
return next(error)
}
res.json({
status,
outputFiles,
compileGroup: limits != null ? limits.compileGroup : undefined,
clsiServerId,
validationProblems,
pdfDownloadDomain: Settings.pdfDownloadDomain
})
}
)
validationProblems,
pdfDownloadDomain: Settings.pdfDownloadDomain
})
})
},
stopCompile(req, res, next) {

13
services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
View file

@ -316,10 +316,7 @@ async function deleteEntity(projectId, entityId, entityType, callback) {
projectId,
{ name: true, rootFolder: true, overleaf: true, rootDoc_id: true }
)
const deleteRootDoc =
project.rootDoc_id &&
entityId &&
project.rootDoc_id.toString() === entityId.toString()
const deleteRootDoc = project.rootDoc_id && entityId && project.rootDoc_id.toString() === entityId.toString()
const { element: entity, path } = await ProjectLocator.promises.findElement({
project,
element_id: entityId,
@ -419,13 +416,7 @@ async function _insertDeletedFileReference(projectId, fileRef) {
).exec()
}
async function _removeElementFromMongoArray(
model,
modelId,
path,
elementId,
deleteRootDoc = false
) {
async function _removeElementFromMongoArray(model, modelId, path, elementId, deleteRootDoc=false) {
const nonArrayPath = path.slice(0, path.lastIndexOf('.'))
const options = { new: true }
const query = { _id: modelId }

49
services/web/test/acceptance/src/ProjectStructureTests.js
View file

@ -1113,55 +1113,48 @@ describe('ProjectStructureChanges', function() {
}
this.project0 = project
done()
}
)
})
})
})
})
})
describe('when rootDoc_id matches doc being deleted', function() {
describe('when rootDoc_id matches doc being deleted', () => {
beforeEach(function(done) {
Project.update(
{ _id: this.exampleProjectId },
{ $set: { rootDoc_id: this.exampleDocId } },
done
)
Project.update({_id: this.exampleProjectId}, {$set: {rootDoc_id: this.exampleDocId}}, done)
})
it('should clear rootDoc_id', function(done) {
deleteItem(this, 'doc', this.exampleDocId, () => {
ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
if (error) {
throw error
}
expect(project.rootDoc_id).to.be.undefined
done()
ProjectGetter.getProject(
this.exampleProjectId,
(error, project) => {
if (error) {
throw error
}
expect(project.rootDoc_id).to.be.undefined
done()
})
})
})
})
describe('when rootDoc_id does not match doc being deleted', function() {
describe('when rootDoc_id does not match doc being deleted', () => {
beforeEach(function(done) {
this.exampleRootDocId = new ObjectId()
Project.update(
{ _id: this.exampleProjectId },
{ $set: { rootDoc_id: this.exampleRootDocId } },
done
)
Project.update({_id: this.exampleProjectId}, {$set: {rootDoc_id: this.exampleRootDocId}}, done)
})
it('should not clear rootDoc_id', function(done) {
deleteItem(this, 'doc', this.exampleDocId, () => {
ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
if (error) {
throw error
}
expect(project.rootDoc_id.toString()).to.equal(
this.exampleRootDocId.toString()
)
done()
ProjectGetter.getProject(
this.exampleProjectId,
(error, project) => {
if (error) {
throw error
}
expect(project.rootDoc_id.toString()).to.equal(this.exampleRootDocId.toString())
done()
})
})
})