From 3157d0e04d575c556ec7acb52cf683655687162f Mon Sep 17 00:00:00 2001
From: Simon Detheridge <gh2k@users.noreply.github.com>
Date: Thu, 16 Jan 2020 14:54:13 +0000
Subject: [PATCH] Merge pull request #2525 from
 overleaf/cmg-duplicate-modal-updates

Stop duplicate file modal appearing when moving back to original folder

GitOrigin-RevId: 4b8cd83df1bb3ce854e4f7e46176f9171bd61aa0
---
 .../controllers/FileTreeFolderController.js   | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/services/web/frontend/js/ide/file-tree/controllers/FileTreeFolderController.js b/services/web/frontend/js/ide/file-tree/controllers/FileTreeFolderController.js
index c8c5c2298f..bb408426a1 100644
--- a/services/web/frontend/js/ide/file-tree/controllers/FileTreeFolderController.js
+++ b/services/web/frontend/js/ide/file-tree/controllers/FileTreeFolderController.js
@@ -44,19 +44,24 @@ define(['base'], App =>
       } else {
         entities = [$(ui.draggable).scope().entity]
       }
+
+      const ids = $scope.entity.children.map(entity => entity.id)
+
       for (let dropped_entity of Array.from(entities)) {
-        try {
-          ide.fileTreeManager.moveEntity(dropped_entity, $scope.entity)
-        } catch (err) {
-          $modal.open({
-            templateUrl: 'duplicateFileModalTemplate',
-            controller: 'DuplicateFileModalController',
-            resolve: {
-              fileName() {
-                return dropped_entity.name
+        if (!ids.includes(dropped_entity.id)) {
+          try {
+            ide.fileTreeManager.moveEntity(dropped_entity, $scope.entity)
+          } catch (err) {
+            $modal.open({
+              templateUrl: 'duplicateFileModalTemplate',
+              controller: 'DuplicateFileModalController',
+              resolve: {
+                fileName() {
+                  return dropped_entity.name
+                }
               }
-            }
-          })
+            })
+          }
         }
       }
       $scope.$digest()