From 1da0edbcafaad6148a2cd7b484e1d4932a8b0f7d Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 23 Aug 2021 15:12:08 +0100 Subject: [PATCH] Merge pull request #4801 from overleaf/ae-resync-editable-file Use a file hash to decide if a file is editable when resyncing GitOrigin-RevId: 57d78b3d73bf2595070a7c7eb7ec97eeece3a163 --- .../web/app/src/Features/Project/ProjectEntityUpdateHandler.js | 1 + .../test/unit/src/Project/ProjectEntityUpdateHandlerTests.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js index 58aa025ed8..5a172ffbd8 100644 --- a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js @@ -1365,6 +1365,7 @@ const ProjectEntityUpdateHandler = { file: file.file._id, path: file.path, url: FileStoreHandler._buildUrl(projectId, file.file._id), + _hash: file.file.hash, })) DocumentUpdaterHandler.resyncProjectHistory( diff --git a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js index 9243841f36..83d3d33456 100644 --- a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js +++ b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js @@ -1929,6 +1929,7 @@ describe('ProjectEntityUpdateHandler', function () { { file: { _id: fileId, + hash: '123456', }, path: 'universe.png', }, @@ -1970,6 +1971,7 @@ describe('ProjectEntityUpdateHandler', function () { file: fileId, path: 'universe.png', url: `www.filestore.test/${projectId}/${fileId}`, + _hash: '123456', }, ] this.DocumentUpdaterHandler.resyncProjectHistory