From c3c97d9fb9bdcb0ff4bb859a38d912e9e625c83d Mon Sep 17 00:00:00 2001 From: Domagoj Kriskovic Date: Thu, 27 Jun 2024 12:33:39 +0200 Subject: [PATCH] [web] return file type in revertFile (#18995) * [web] return file type in revertFile * fix revertFile unit test * fix formatting GitOrigin-RevId: e4ac0500ff6c72c7f7fa23a5f61b09ed31a28da0 --- services/web/app/src/Features/History/RestoreManager.js | 7 ++++++- services/web/test/unit/src/History/RestoreManagerTests.js | 8 +++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/services/web/app/src/Features/History/RestoreManager.js b/services/web/app/src/Features/History/RestoreManager.js index cb69c5025f..e73406db26 100644 --- a/services/web/app/src/Features/History/RestoreManager.js +++ b/services/web/app/src/Features/History/RestoreManager.js @@ -185,7 +185,7 @@ const RestoreManager = { newCommentThreadData ) - return await EditorController.promises.addDocWithRanges( + const { _id } = await EditorController.promises.addDocWithRanges( projectId, parentFolderId, basename, @@ -194,6 +194,11 @@ const RestoreManager = { origin, userId ) + + return { + _id, + type: importInfo.type, + } }, async _findOrCreateFolder(projectId, dirname) { diff --git a/services/web/test/unit/src/History/RestoreManagerTests.js b/services/web/test/unit/src/History/RestoreManagerTests.js index dc6d9e4d9e..430329ff3f 100644 --- a/services/web/test/unit/src/History/RestoreManagerTests.js +++ b/services/web/test/unit/src/History/RestoreManagerTests.js @@ -291,9 +291,7 @@ describe('RestoreManager', function () { .resolves([{ toV: this.version, meta: { end_ts: Date.now() } }]) this.EditorController.promises.addDocWithRanges = sinon .stub() - .resolves( - (this.addedFile = { doc: 'mock-doc', folderId: 'mock-folder' }) - ) + .resolves((this.addedFile = { _id: 'mock-doc', type: 'doc' })) }) describe("when reverting a file that doesn't current exist", function () { @@ -327,7 +325,7 @@ describe('RestoreManager', function () { }) it('should return the created entity', function () { - expect(this.data).to.equal(this.addedFile) + expect(this.data).to.deep.equal(this.addedFile) }) it('should look up ranges', function () { @@ -408,7 +406,7 @@ describe('RestoreManager', function () { }) it('should return the created entity', function () { - expect(this.data).to.equal(this.addedFile) + expect(this.data).to.deep.equal(this.addedFile) }) it('should look up ranges', function () {