From f5b2640c82631bc74ed6a5f0457dcf028fef5173 Mon Sep 17 00:00:00 2001
From: nate stemen <nate.stemen@overleaf.com>
Date: Wed, 20 May 2020 09:03:02 -0400
Subject: [PATCH] Merge pull request #2817 from
 overleaf/ns-project-import-deletion-v1-handler

remove checks if project is in importing state

GitOrigin-RevId: f087cf04436b38b351b6985cecc9182256401cba
---
 .../src/Features/Project/ProjectController.js | 36 +------------------
 services/web/app/src/Features/V1/V1Handler.js | 23 ------------
 .../test/acceptance/src/helpers/MockV1Api.js  | 10 ------
 .../src/Project/ProjectControllerTests.js     |  1 -
 4 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 3299b575d5..a2b6d54d00 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -37,7 +37,6 @@ const { V1ConnectionError } = require('../Errors/Errors')
 const Features = require('../../infrastructure/Features')
 const BrandVariationsHandler = require('../BrandVariations/BrandVariationsHandler')
 const { getUserAffiliations } = require('../Institutions/InstitutionsAPI')
-const V1Handler = require('../V1/V1Handler')
 const UserController = require('../User/UserController')
 
 const _ssoAvailable = (affiliation, session, linkedInstitutionIds) => {
@@ -619,35 +618,7 @@ const ProjectController = {
               if (err != null) {
                 return cb(err)
               }
-              if (
-                (project.overleaf != null ? project.overleaf.id : undefined) ==
-                  null ||
-                (project.tokens != null
-                  ? project.tokens.readAndWrite
-                  : undefined) == null ||
-                Settings.projectImportingCheckMaxCreateDelta == null
-              ) {
-                return cb(null, project)
-              }
-              const createDelta =
-                (new Date().getTime() -
-                  new Date(project._id.getTimestamp()).getTime()) /
-                1000
-              if (
-                !(createDelta < Settings.projectImportingCheckMaxCreateDelta)
-              ) {
-                return cb(null, project)
-              }
-              V1Handler.getDocExported(
-                project.tokens.readAndWrite,
-                (err, docExported) => {
-                  if (err != null) {
-                    return next(err)
-                  }
-                  project.exporting = docExported.exporting
-                  cb(null, project)
-                }
-              )
+              cb(null, project)
             }
           )
         },
@@ -738,11 +709,6 @@ const ProjectController = {
               return res.sendStatus(401)
             }
 
-            if (project.exporting) {
-              res.render('project/importing', { bodyClasses: ['editor'] })
-              return
-            }
-
             if (
               subscription != null &&
               subscription.freeTrial != null &&
diff --git a/services/web/app/src/Features/V1/V1Handler.js b/services/web/app/src/Features/V1/V1Handler.js
index 63d1be0dd7..b2caef269b 100644
--- a/services/web/app/src/Features/V1/V1Handler.js
+++ b/services/web/app/src/Features/V1/V1Handler.js
@@ -102,29 +102,6 @@ module.exports = V1Handler = {
         }
       }
     )
-  },
-
-  getDocExported(token, callback) {
-    // default to not exported
-    if (callback == null) {
-      callback = function(err, info) {}
-    }
-    if ((Settings.apis != null ? Settings.apis.v1 : undefined) == null) {
-      return callback(null, {
-        exported: false,
-        exporting: false
-      })
-    }
-
-    return V1Api.request(
-      { url: `/api/v1/sharelatex/docs/${token}/exported_to_v2` },
-      function(err, response, body) {
-        if (err != null) {
-          return callback(err)
-        }
-        return callback(null, body)
-      }
-    )
   }
 }
 
diff --git a/services/web/test/acceptance/src/helpers/MockV1Api.js b/services/web/test/acceptance/src/helpers/MockV1Api.js
index 21e9a1f829..ab62cdfbc6 100644
--- a/services/web/test/acceptance/src/helpers/MockV1Api.js
+++ b/services/web/test/acceptance/src/helpers/MockV1Api.js
@@ -259,16 +259,6 @@ module.exports = MockV1Api = {
       }
     )
 
-    app.get(
-      '/api/v1/sharelatex/docs/:token/exported_to_v2',
-      (req, res, next) => {
-        if (this.doc_exported[req.params.token] != null) {
-          return res.json(this.doc_exported[req.params.token])
-        }
-        return res.json({ exporting: false, exported: false })
-      }
-    )
-
     app.get(
       '/api/v1/sharelatex/docs/read_token/:token/exists',
       (req, res, next) => {
diff --git a/services/web/test/unit/src/Project/ProjectControllerTests.js b/services/web/test/unit/src/Project/ProjectControllerTests.js
index b2c6d866c5..cd217de6aa 100644
--- a/services/web/test/unit/src/Project/ProjectControllerTests.js
+++ b/services/web/test/unit/src/Project/ProjectControllerTests.js
@@ -177,7 +177,6 @@ describe('ProjectController', function() {
           getUserAffiliations: this.getUserAffiliations
         },
         '../ThirdPartyDataStore/TpdsProjectFlusher': this.TpdsProjectFlusher,
-        '../V1/V1Handler': {},
         '../../models/Project': {}
       }
     })