Merge pull request #22533 from overleaf/ar-only-use-history-for-blobs-when-enabled

[web] only use history for blobs when enabled

GitOrigin-RevId: 010983e9b29657d4c594e03945dca5700577bf0a

services/web/app/src/Features/Project/ProjectController.js

@@ -800,6 +800,9 @@ const _ProjectController = {
           isInvitedMember
         ),
         chatEnabled: Features.hasFeature('chat'),
+        projectHistoryBlobsEnabled: Features.hasFeature(
+          'project-history-blobs'
+        ),
         roMirrorOnClientNoLocalStorage:
           Settings.adminOnlyLogin || project.name.startsWith('Debug: '),
         languages: Settings.languages,

services/web/app/src/Features/Project/ProjectDuplicator.js

@@ -213,7 +213,8 @@ async function _copyFiles(sourceEntries, sourceProject, targetProject) {
         file.hash = sourceFile.hash
       }
       let createdBlob = false
-      if (file.hash != null) {
+      if (file.hash != null && Features.hasFeature('project-history-blobs')) {
+        const usingFilestore = Features.hasFeature('filestore')
         try {
           await HistoryManager.promises.copyBlob(
             sourceHistoryId,
@@ -221,20 +222,32 @@ async function _copyFiles(sourceEntries, sourceProject, targetProject) {
             file.hash
           )
           createdBlob = true
+          if (!usingFilestore) {
+            return { createdBlob, file, path, url: null }
+          }
         } catch (err) {
-          logger.error(
-            {
-              err,
+          if (!usingFilestore) {
+            throw OError.tag(err, 'unexpected error copying blob', {
               sourceProjectId: sourceProject._id,
               targetProjectId: targetProject._id,
               sourceFile,
               sourceHistoryId,
-            },
-            'unexpected error copying blob'
-          )
+            })
+          } else {
+            logger.error(
+              {
+                err,
+                sourceProjectId: sourceProject._id,
+                targetProjectId: targetProject._id,
+                sourceFile,
+                sourceHistoryId,
+              },
+              'unexpected error copying blob'
+            )
+          }
         }
       }
-      if (createdBlob && Features.hasFeature('saas')) {
+      if (createdBlob && Features.hasFeature('project-history-blobs')) {
         return { createdBlob, file, path, url: null }
       }
       const url = await FileStoreHandler.promises.copyFile(

services/web/app/src/Features/Project/ProjectEditorHandler.js

@@ -1,6 +1,7 @@
 let ProjectEditorHandler
 const _ = require('lodash')
 const Path = require('path')
+const Features = require('../../infrastructure/Features')
 
 function mergeDeletedDocs(a, b) {
   const docIdsInA = new Set(a.map(doc => doc._id.toString()))
@@ -123,12 +124,18 @@ module.exports = ProjectEditorHandler = {
   },
 
   buildFileModelView(file) {
+    const additionalFileProperties = {}
+
+    if (Features.hasFeature('project-history-blobs')) {
+      additionalFileProperties.hash = file.hash
+    }
+
     return {
       _id: file._id,
       name: file.name,
       linkedFileData: file.linkedFileData,
       created: file.created,
-      hash: file.hash,
+      ...additionalFileProperties,
     }
   },