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

Fix ProjectEntityHandler.getAllEntities callback in _findExistingFileType (#9108)

Browse source 
GitOrigin-RevId: fe29488b44fa5e738c23f2939297057fb2832758
This commit is contained in:
Alf Eaton 2022-08-09 14:52:43 +01:00 committed by Copybot
parent 36fae7c8ea
commit 19db9c2583
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/src/Features/Project/ProjectEntityHandler.js
View file

@ -232,7 +232,6 @@ module.exports = ProjectEntityHandler
module.exports.promises = promisifyAll(ProjectEntityHandler, {
without: ['getAllEntitiesFromProject'],
multiResult: {
getAllEntities: ['docs', 'files'],
getDoc: ['lines', 'rev', 'version', 'ranges'],
},
})

2
services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js
View file

@ -55,7 +55,7 @@ module.exports = UpdateMerger = {
_findExistingFileType(project_id, path, callback) {
ProjectEntityHandler.getAllEntities(
project_id,
function (err, docs, files) {
function (err, { docs, files }) {
if (err != null) {
return callback(err)
}

5
services/web/test/unit/src/ThirdPartyDataStore/UpdateMergerTests.js
View file

@ -33,7 +33,10 @@ describe('UpdateMerger :', function () {
this.existingFiles = [{ path: '/figure.pdf' }, { path: '/folder/fig1.pdf' }]
this.ProjectEntityHandler.getAllEntities = sinon
.stub()
.callsArgWith(1, null, this.existingDocs, this.existingFiles)
.callsArgWith(1, null, {
docs: this.existingDocs,
files: this.existingFiles,
})
this.fsPath = '/tmp/file/path'
this.source = 'dropbox'