diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 6afa5ca0ee..772bb9234d 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -138,7 +138,6 @@ const ProjectController = { deleteProject(req, res) { const projectId = req.params.Project_id - const forever = (req.query != null ? req.query.forever : undefined) != null const user = AuthenticationController.getSessionUser(req) const cb = err => { if (err != null) { @@ -147,16 +146,11 @@ const ProjectController = { res.sendStatus(200) } } - - if (forever) { - ProjectDeleter.deleteProject( - projectId, - { deleterUser: user, ipAddress: req.ip }, - cb - ) - } else { - ProjectDeleter.legacyArchiveProject(projectId, cb) - } + ProjectDeleter.deleteProject( + projectId, + { deleterUser: user, ipAddress: req.ip }, + cb + ) }, archiveProject(req, res, next) { diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js index 486742736b..d14943dde2 100644 --- a/services/web/app/src/Features/Project/ProjectDeleter.js +++ b/services/web/app/src/Features/Project/ProjectDeleter.js @@ -118,23 +118,6 @@ const ProjectDeleter = { ) }, - legacyArchiveProject(project_id, callback) { - if (callback == null) { - callback = function(error) {} - } - return Project.update( - { _id: project_id }, - { $set: { archived: true } }, - function(err) { - if (err != null) { - logger.warn({ err }, 'problem archived project') - return callback(err) - } - return callback() - } - ) - }, - restoreProject(project_id, callback) { if (callback == null) { callback = function(error) {} diff --git a/services/web/frontend/js/main/project-list/project-list.js b/services/web/frontend/js/main/project-list/project-list.js index 1dcc871f6d..6da985d45f 100644 --- a/services/web/frontend/js/main/project-list/project-list.js +++ b/services/web/frontend/js/main/project-list/project-list.js @@ -786,7 +786,7 @@ define(['base', 'main/project-list/services/project-list'], function(App) { const _deleteProject = function(project) { return queuedHttp({ method: 'DELETE', - url: `/project/${project.id}?forever=true`, + url: `/project/${project.id}`, headers: { 'X-CSRF-Token': window.csrfToken } diff --git a/services/web/test/acceptance/src/helpers/User.js b/services/web/test/acceptance/src/helpers/User.js index 2448a352d5..0093aaa1c8 100644 --- a/services/web/test/acceptance/src/helpers/User.js +++ b/services/web/test/acceptance/src/helpers/User.js @@ -361,7 +361,7 @@ class User { deleteProject(projectId, callback) { this.request.delete( { - url: `/project/${projectId}?forever=true` + url: `/project/${projectId}` }, (error, response, body) => { if (error != null) { diff --git a/services/web/test/unit/src/Project/ProjectControllerTests.js b/services/web/test/unit/src/Project/ProjectControllerTests.js index 7353e7e11f..dacf79632e 100644 --- a/services/web/test/unit/src/Project/ProjectControllerTests.js +++ b/services/web/test/unit/src/Project/ProjectControllerTests.js @@ -40,7 +40,6 @@ describe('ProjectController', function() { } this.token = 'some-token' this.ProjectDeleter = { - legacyArchiveProject: sinon.stub().callsArg(1), deleteProject: sinon.stub().callsArg(2), restoreProject: sinon.stub().callsArg(1), findArchivedProjects: sinon.stub() @@ -305,19 +304,7 @@ describe('ProjectController', function() { }) describe('deleteProject', function() { - it('should tell the project deleter to archive when forever=false', function(done) { - this.res.sendStatus = code => { - this.ProjectDeleter.legacyArchiveProject - .calledWith(this.project_id) - .should.equal(true) - code.should.equal(200) - done() - } - this.ProjectController.deleteProject(this.req, this.res) - }) - - it('should tell the project deleter to delete when forever=true', function(done) { - this.req.query = { forever: 'true' } + it('should call the project deleter', function(done) { this.res.sendStatus = code => { this.ProjectDeleter.deleteProject .calledWith(this.project_id, { diff --git a/services/web/test/unit/src/Project/ProjectDeleterTests.js b/services/web/test/unit/src/Project/ProjectDeleterTests.js index 3aaf45970f..4ee5acb46d 100644 --- a/services/web/test/unit/src/Project/ProjectDeleterTests.js +++ b/services/web/test/unit/src/Project/ProjectDeleterTests.js @@ -431,28 +431,6 @@ describe('ProjectDeleter', function() { }) }) - describe('legacyArchiveProject', function() { - beforeEach(function() { - this.ProjectMock.expects('update') - .withArgs( - { - _id: this.project_id - }, - { - $set: { archived: true } - } - ) - .yields() - }) - - it('should update the project', function(done) { - this.ProjectDeleter.legacyArchiveProject(this.project_id, () => { - this.ProjectMock.verify() - done() - }) - }) - }) - describe('archiveProject', function() { beforeEach(function() { let archived = [ObjectId(this.user._id)]