github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "decaf clean up""

Browse source 
This reverts commit 669ce8b6411309cbab3162cf94bd03399581eeb4.

GitOrigin-RevId: 4a3933668a0d01912e748c164581bcb9bbded0dd
This commit is contained in:
Ersun Warncke 2020-02-05 08:53:31 -04:00 committed by Copybot
parent 6185fe8a30
commit a581ef7609
1 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,6 @@
/* /*
* decaffeinate suggestions: * decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns * DS102: Remove unnecessary code created because of implicit returns
* DS103: Rewrite code to no longer use __guard__
* DS207: Consider shorter variations of null checks * DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/ */
@ -35,59 +34,47 @@ const COMPILE_TIMEOUT_MS = 10 * 60 * 1000
module.exports = CompileController = { module.exports = CompileController = {
compile(req, res, next) { compile(req, res, next) {
if (next == null) {
next = function(error) {}
}
res.setTimeout(COMPILE_TIMEOUT_MS) res.setTimeout(COMPILE_TIMEOUT_MS)
const project_id = req.params.Project_id const project_id = req.params.Project_id
const isAutoCompile = !!(req.query != null const isAutoCompile = !!req.query.auto_compile
? req.query.auto_compile
: undefined)
const user_id = AuthenticationController.getLoggedInUserId(req) const user_id = AuthenticationController.getLoggedInUserId(req)
const options = { const options = {
isAutoCompile isAutoCompile
} }
if ((req.body != null ? req.body.rootDoc_id : undefined) != null) {
if (req.body.rootDoc_id) {
options.rootDoc_id = req.body.rootDoc_id options.rootDoc_id = req.body.rootDoc_id
} else if ( } else if (req.body.settingsOverride && req.body.settingsOverride.rootDoc_id) {
__guard__(
req.body != null ? req.body.settingsOverride : undefined,
x => x.rootDoc_id
) != null
) {
// Can be removed after deploy // Can be removed after deploy
options.rootDoc_id = req.body.settingsOverride.rootDoc_id options.rootDoc_id = req.body.settingsOverride.rootDoc_id
} }
if (req.body != null ? req.body.compiler : undefined) { if (req.body.compiler) {
options.compiler = req.body.compiler options.compiler = req.body.compiler
} }
if (req.body != null ? req.body.draft : undefined) { if (req.body.draft) {
options.draft = req.body.draft options.draft = req.body.draft
} }
if ( if (
['validate', 'error', 'silent'].includes( ['validate', 'error', 'silent'].includes(req.body.check)
req.body != null ? req.body.check : undefined
)
) { ) {
options.check = req.body.check options.check = req.body.check
} }
if (req.body != null ? req.body.incrementalCompilesEnabled : undefined) { if (req.body.incrementalCompilesEnabled) {
options.incrementalCompilesEnabled = true options.incrementalCompilesEnabled = true
} }
return CompileManager.compile(project_id, user_id, options, function(
CompileManager.compile(project_id, user_id, options, (
error, error,
status, status,
outputFiles, outputFiles,
clsiServerId, clsiServerId,
limits, limits,
validationProblems validationProblems
) { ) => {
if (error != null) { if (error) {
return next(error) return next(error)
} }
res.contentType('application/json') res.json({
return res.status(200).send(
JSON.stringify({
status, status,
outputFiles, outputFiles,
compileGroup: limits != null ? limits.compileGroup : undefined, compileGroup: limits != null ? limits.compileGroup : undefined,
@ -95,7 +82,6 @@ module.exports = CompileController = {
validationProblems, validationProblems,
pdfDownloadDomain: Settings.pdfDownloadDomain pdfDownloadDomain: Settings.pdfDownloadDomain
}) })
)
}) })
}, },
@ -540,9 +526,3 @@ module.exports = CompileController = {
}) })
} }
} }
function __guard__(value, transform) {
return typeof value !== 'undefined' && value !== null
? transform(value)
: undefined
}