alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3495 from overleaf/ae-prettier-2

Browse Source 
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
This commit is contained in:
Alf Eaton
2021-04-15 02:05:22 +00:00
committed by Copybot
parent 930d7ba028
commit 1ebc8a79cb
582 changed files with 20382 additions and 20374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/History/HistoryController.js
+17 -17
View File
@@ -17,7 +17,7 @@ module.exports = HistoryController = {
selectHistoryApi(req, res, next) {
const { Project_id: projectId } = req.params
// find out which type of history service this project uses
ProjectDetailsHandler.getDetails(projectId, function(err, project) {
ProjectDetailsHandler.getDetails(projectId, function (err, project) {
if (err) {
return next(err)
}
@@ -52,7 +52,7 @@ module.exports = HistoryController = {
}
})
getReq.pipe(res)
getReq.on('error', function(err) {
getReq.on('error', function (err) {
logger.warn({ url, err }, 'history API error')
next(err)
})
@@ -71,11 +71,11 @@ module.exports = HistoryController = {
'X-User-Id': userId
}
},
function(err, body) {
function (err, body) {
if (err) {
return next(err)
}
HistoryManager.injectUserDetails(body, function(err, data) {
HistoryManager.injectUserDetails(body, function (err, data) {
if (err) {
return next(err)
}
@@ -97,7 +97,7 @@ module.exports = HistoryController = {
resyncProjectHistory(req, res, next) {
const projectId = req.params.Project_id
ProjectEntityUpdateHandler.resyncProjectHistory(projectId, function(err) {
ProjectEntityUpdateHandler.resyncProjectHistory(projectId, function (err) {
if (err instanceof Errors.ProjectHistoryDisabledError) {
return res.sendStatus(404)
}
@@ -117,7 +117,7 @@ module.exports = HistoryController = {
projectId,
version,
pathname,
function(err, entity) {
function (err, entity) {
if (err) {
return next(err)
}
@@ -158,7 +158,7 @@ module.exports = HistoryController = {
url: `${settings.apis.project_history.url}/project/${projectId}/labels`,
json: true
},
function(err, labels) {
function (err, labels) {
if (err) {
return next(err)
}
@@ -182,7 +182,7 @@ module.exports = HistoryController = {
url: `${settings.apis.project_history.url}/project/${projectId}/user/${userId}/labels`,
json: { comment, version }
},
function(err, label) {
function (err, label) {
if (err) {
return next(err)
}
@@ -230,7 +230,7 @@ module.exports = HistoryController = {
UserGetter.getUsers(
Array.from(uniqueUsers),
{ first_name: 1, last_name: 1, email: 1 },
function(err, rawUsers) {
function (err, rawUsers) {
if (err) {
return callback(err)
}
@@ -274,7 +274,7 @@ module.exports = HistoryController = {
method: 'DELETE',
url: `${settings.apis.project_history.url}/project/${projectId}/user/${userId}/labels/${labelId}`
},
function(err) {
function (err) {
if (err) {
return next(err)
}
@@ -284,7 +284,7 @@ module.exports = HistoryController = {
},
_makeRequest(options, callback) {
return request(options, function(err, response, body) {
return request(options, function (err, response, body) {
if (err) {
return callback(err)
}
@@ -301,7 +301,7 @@ module.exports = HistoryController = {
downloadZipOfVersion(req, res, next) {
const { project_id: projectId, version } = req.params
ProjectDetailsHandler.getDetails(projectId, function(err, project) {
ProjectDetailsHandler.getDetails(projectId, function (err, project) {
if (err) {
return next(err)
}
@@ -344,7 +344,7 @@ module.exports = HistoryController = {
method: 'post',
url
}
request(options, function(err, response, body) {
request(options, function (err, response, body) {
if (err) {
OError.tag(err, 'history API error', {
v1ProjectId,
@@ -362,7 +362,7 @@ module.exports = HistoryController = {
async.retry(
40,
callback =>
setTimeout(function() {
setTimeout(function () {
if (req.aborted) {
// client has disconnected -- skip s3 download
return callback() // stop async.retry loop
@@ -384,7 +384,7 @@ module.exports = HistoryController = {
req.off('aborted', abortS3Request)
res.off('timeout', abortS3Request)
}
getReq.on('response', function(response) {
getReq.on('response', function (response) {
if (response.statusCode !== 200) {
cleanupAbortTrigger()
return callback(new Error('invalid response'))
@@ -407,7 +407,7 @@ module.exports = HistoryController = {
})
callback()
})
getReq.on('error', function(err) {
getReq.on('error', function (err) {
logger.warn(
{ err, v1ProjectId, version, retryAttempt },
'history s3 download error'
@@ -416,7 +416,7 @@ module.exports = HistoryController = {
callback(err)
})
}, retryDelay),
function(err) {
function (err) {
if (err) {
OError.tag(err, 'history s3 download failed', {
v1ProjectId,
services/web/app/src/Features/History/RestoreManager.js
+39 -38
View File
@@ -28,13 +28,13 @@ module.exports = RestoreManager = {
// It looks up the deleted doc's contents, and then creates a new doc with the same content.
// We don't actually remove the deleted doc entry, just create a new one from its lines.
if (callback == null) {
callback = function(error, doc, folder_id) {}
callback = function (error, doc, folder_id) {}
}
return ProjectEntityHandler.getDoc(
project_id,
doc_id,
{ include_deleted: true },
function(error, lines) {
function (error, lines) {
if (error != null) {
return callback(error)
}
@@ -59,13 +59,13 @@ module.exports = RestoreManager = {
restoreFileFromV2(user_id, project_id, version, pathname, callback) {
if (callback == null) {
callback = function(error, entity) {}
callback = function (error, entity) {}
}
return RestoreManager._writeFileVersionToDisk(
project_id,
version,
pathname,
function(error, fsPath) {
function (error, fsPath) {
if (error != null) {
return callback(error)
}
@@ -75,54 +75,55 @@ module.exports = RestoreManager = {
// no directory
dirname = ''
}
return RestoreManager._findOrCreateFolder(project_id, dirname, function(
error,
parent_folder_id
) {
if (error != null) {
return callback(error)
}
const addEntityWithName = (name, callback) =>
FileSystemImportManager.addEntity(
user_id,
project_id,
parent_folder_id,
name,
fsPath,
false,
return RestoreManager._findOrCreateFolder(
project_id,
dirname,
function (error, parent_folder_id) {
if (error != null) {
return callback(error)
}
const addEntityWithName = (name, callback) =>
FileSystemImportManager.addEntity(
user_id,
project_id,
parent_folder_id,
name,
fsPath,
false,
callback
)
return RestoreManager._addEntityWithUniqueName(
addEntityWithName,
basename,
callback
)
return RestoreManager._addEntityWithUniqueName(
addEntityWithName,
basename,
callback
)
})
}
)
}
)
},
_findOrCreateFolder(project_id, dirname, callback) {
if (callback == null) {
callback = function(error, folder_id) {}
callback = function (error, folder_id) {}
}
return EditorController.mkdirp(project_id, dirname, function(
error,
newFolders,
lastFolder
) {
if (error != null) {
return callback(error)
return EditorController.mkdirp(
project_id,
dirname,
function (error, newFolders, lastFolder) {
if (error != null) {
return callback(error)
}
return callback(null, lastFolder != null ? lastFolder._id : undefined)
}
return callback(null, lastFolder != null ? lastFolder._id : undefined)
})
)
},
_addEntityWithUniqueName(addEntityWithName, basename, callback) {
if (callback == null) {
callback = function(error) {}
callback = function (error) {}
}
return addEntityWithName(basename, function(error, entity) {
return addEntityWithName(basename, function (error, entity) {
if (error != null) {
if (error instanceof Errors.InvalidNameError) {
// likely a duplicate name, so try with a prefix
@@ -146,7 +147,7 @@ module.exports = RestoreManager = {
_writeFileVersionToDisk(project_id, version, pathname, callback) {
if (callback == null) {
callback = function(error, fsPath) {}
callback = function (error, fsPath) {}
}
const url = `${
Settings.apis.project_history.url