one more check

ITISFoundation · Dec 15, 2024 · 96d937e · 96d937e
1 parent 1de0288
commit 96d937e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/DragDropHelpers.js b/services/static-webserver/client/source/class/osparc/dashboard/DragDropHelpers.js
@@ -110,7 +110,7 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         folderItem.setOpacity(0.2);
       },
 
-      dragOver: function(event, folderItem, workspaceDestId) {
+      dragOver: function(event, folderItem, workspaceDestId, folderDestId) {
         let compatible = false;
         const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
         const workspaceIdOrigin = folderOrigin.getWorkspaceId();
@@ -131,6 +131,8 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
         //   - Write on dest Workspace
         if (workspaceDestId === -1) { // (0)
           compatible = false;
+        } else if (folderOrigin.getFolderId() === folderDestId) {
+          compatible = false;
         } else if (workspaceIdOrigin === null && workspaceDestId === null) { // (1)
           compatible = true;
         } else if (workspaceIdOrigin === null && workspaceDest) { // (2)

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js
@@ -178,9 +178,9 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       this.addListener("dragover", e => {
         const folderDest = this.getFolder();
         if (e.supportsType("osparc-moveStudy")) {
-          osparc.dashboard.DragDropHelpers.moveStudy.dragOver(e, this, folderDest.getWorkspaceId());
+          osparc.dashboard.DragDropHelpers.moveStudy.dragOver(e, this, folderDest.getWorkspaceId(), folderDest.getFolderId());
         } else if (e.supportsType("osparc-moveFolder")) {
-          osparc.dashboard.DragDropHelpers.moveFolder.dragOver(e, this, folderDest.getWorkspaceId());
+          osparc.dashboard.DragDropHelpers.moveFolder.dragOver(e, this, folderDest.getWorkspaceId(), folderDest.getFolderId());
         }
       });
 

diff --git a/...ces/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTreeItem.js b/...ces/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTreeItem.js
@@ -89,10 +89,11 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTreeItem", {
 
       this.addListener("dragover", e => {
         const workspaceDestId = this.getModel().getWorkspaceId();
+        const folderDestId = this.getModel().getFolderId();
         if (e.supportsType("osparc-moveStudy")) {
-          osparc.dashboard.DragDropHelpers.moveStudy.dragOver(e, this, workspaceDestId);
+          osparc.dashboard.DragDropHelpers.moveStudy.dragOver(e, this, workspaceDestId, folderDestId);
         } else if (e.supportsType("osparc-moveFolder")) {
-          osparc.dashboard.DragDropHelpers.moveFolder.dragOver(e, this, workspaceDestId);
+          osparc.dashboard.DragDropHelpers.moveFolder.dragOver(e, this, workspaceDestId, folderDestId);
         }
       });