Revert "format fix"

This reverts commit 71faf86ccd19dfa6428c2d5bcc8c88ec7f0ee41f.

GitOrigin-RevId: 4617b9ec2ed63b14418a8510a214e58397314831

services/web/app/src/Features/Compile/CompileController.js

@@ -44,10 +44,7 @@ module.exports = CompileController = {
 
     if (req.body.rootDoc_id) {
       options.rootDoc_id = req.body.rootDoc_id
-    } else if (
+    } else if (req.body.settingsOverride && req.body.settingsOverride.rootDoc_id) {
-      req.body.settingsOverride &&
-      req.body.settingsOverride.rootDoc_id
-    ) {
       // Can be removed after deploy
       options.rootDoc_id = req.body.settingsOverride.rootDoc_id
     }
@@ -57,38 +54,35 @@ module.exports = CompileController = {
     if (req.body.draft) {
       options.draft = req.body.draft
     }
-    if (['validate', 'error', 'silent'].includes(req.body.check)) {
+    if (
+      ['validate', 'error', 'silent'].includes(req.body.check)
+    ) {
       options.check = req.body.check
     }
     if (req.body.incrementalCompilesEnabled) {
       options.incrementalCompilesEnabled = true
     }
 
-    CompileManager.compile(
+    CompileManager.compile(project_id, user_id, options, (
-      project_id,
+      error,
-      user_id,
+      status,
-      options,
+      outputFiles,
-      (
+      clsiServerId,
-        error,
+      limits,
+      validationProblems
+    ) => {
+      if (error) {
+        return next(error)
+      }
+      res.json({
         status,
         outputFiles,
+        compileGroup: limits != null ? limits.compileGroup : undefined,
         clsiServerId,
-        limits,
+        validationProblems,
-        validationProblems
+        pdfDownloadDomain: Settings.pdfDownloadDomain
-      ) => {
+      })
-        if (error) {
+    })
-          return next(error)
-        }
-        res.json({
-          status,
-          outputFiles,
-          compileGroup: limits != null ? limits.compileGroup : undefined,
-          clsiServerId,
-          validationProblems,
-          pdfDownloadDomain: Settings.pdfDownloadDomain
-        })
-      }
-    )
   },
 
   stopCompile(req, res, next) {

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

@@ -316,10 +316,7 @@ async function deleteEntity(projectId, entityId, entityType, callback) {
     projectId,
     { name: true, rootFolder: true, overleaf: true, rootDoc_id: true }
   )
-  const deleteRootDoc =
+  const deleteRootDoc = project.rootDoc_id && entityId && project.rootDoc_id.toString() === entityId.toString()
-    project.rootDoc_id &&
-    entityId &&
-    project.rootDoc_id.toString() === entityId.toString()
   const { element: entity, path } = await ProjectLocator.promises.findElement({
     project,
     element_id: entityId,
@@ -419,13 +416,7 @@ async function _insertDeletedFileReference(projectId, fileRef) {
   ).exec()
 }
 
-async function _removeElementFromMongoArray(
+async function _removeElementFromMongoArray(model, modelId, path, elementId, deleteRootDoc=false) {
-  model,
-  modelId,
-  path,
-  elementId,
-  deleteRootDoc = false
-) {
   const nonArrayPath = path.slice(0, path.lastIndexOf('.'))
   const options = { new: true }
   const query = { _id: modelId }

services/web/test/acceptance/src/ProjectStructureTests.js

@@ -1113,55 +1113,48 @@ describe('ProjectStructureChanges', function() {
                 }
                 this.project0 = project
                 done()
-              }
+            })
-            )
           })
         })
       })
     })
 
-    describe('when rootDoc_id matches doc being deleted', function() {
+    describe('when rootDoc_id matches doc being deleted', () => {
       beforeEach(function(done) {
-        Project.update(
+        Project.update({_id: this.exampleProjectId}, {$set: {rootDoc_id: this.exampleDocId}}, done)
-          { _id: this.exampleProjectId },
-          { $set: { rootDoc_id: this.exampleDocId } },
-          done
-        )
       })
 
       it('should clear rootDoc_id', function(done) {
         deleteItem(this, 'doc', this.exampleDocId, () => {
-          ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
+          ProjectGetter.getProject(
-            if (error) {
+            this.exampleProjectId,
-              throw error
+            (error, project) => {
-            }
+              if (error) {
-            expect(project.rootDoc_id).to.be.undefined
+                throw error
-            done()
+              }
+              expect(project.rootDoc_id).to.be.undefined
+              done()
           })
         })
       })
     })
 
-    describe('when rootDoc_id does not match doc being deleted', function() {
+    describe('when rootDoc_id does not match doc being deleted', () => {
       beforeEach(function(done) {
         this.exampleRootDocId = new ObjectId()
-        Project.update(
+        Project.update({_id: this.exampleProjectId}, {$set: {rootDoc_id: this.exampleRootDocId}}, done)
-          { _id: this.exampleProjectId },
-          { $set: { rootDoc_id: this.exampleRootDocId } },
-          done
-        )
       })
 
       it('should not clear rootDoc_id', function(done) {
         deleteItem(this, 'doc', this.exampleDocId, () => {
-          ProjectGetter.getProject(this.exampleProjectId, (error, project) => {
+          ProjectGetter.getProject(
-            if (error) {
+            this.exampleProjectId,
-              throw error
+            (error, project) => {
-            }
+              if (error) {
-            expect(project.rootDoc_id.toString()).to.equal(
+                throw error
-              this.exampleRootDocId.toString()
+              }
-            )
+              expect(project.rootDoc_id.toString()).to.equal(this.exampleRootDocId.toString())
-            done()
+              done()
           })
         })
       })