Skip to content

Commit 92ff5d5

Browse files
authored
🐛 [Frontend] Fix: Drop on folder card (#6977)
1 parent 208de24 commit 92ff5d5

File tree

1 file changed

+29
-8
lines changed
  • services/static-webserver/client/source/class/osparc/dashboard

1 file changed

+29
-8
lines changed

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
576576
const data = e.getData();
577577
const destWorkspaceId = data["workspaceId"];
578578
const destFolderId = data["folderId"];
579-
this._folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId);
579+
this.__folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId);
580580
});
581581
moveFolderTo.addListener("cancel", () => win.close());
582582
},
@@ -591,7 +591,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
591591
});
592592
},
593593

594-
_folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) {
594+
__folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) {
595595
if (destWorkspaceId === workspaceId) {
596596
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
597597
} else {
@@ -1183,7 +1183,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
11831183
destWorkspaceId,
11841184
destFolderId,
11851185
} = e.getData();
1186-
this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId);
1186+
this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
11871187
});
11881188
workspacesAndFoldersTree.addListener("folderToFolderRequested", e => {
11891189
const {
@@ -1192,17 +1192,38 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
11921192
destWorkspaceId,
11931193
destFolderId,
11941194
} = e.getData();
1195-
this._folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
1195+
this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
11961196
});
11971197

11981198
this._resourceFilter.addListener("trashStudyRequested", e => {
1199-
this.__trashStudyRequested(e.getData());
1199+
const studyData = e.getData();
1200+
this.__trashStudyRequested(studyData);
12001201
});
12011202
this._resourceFilter.addListener("trashFolderRequested", e => {
1202-
this._trashFolderRequested(e.getData());
1203+
const folderId = e.getData();
1204+
this._trashFolderRequested(folderId);
12031205
});
12041206
},
12051207

1208+
_studyToFolderRequested: function(data) {
1209+
const {
1210+
studyData,
1211+
destWorkspaceId,
1212+
destFolderId,
1213+
} = data;
1214+
this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
1215+
},
1216+
1217+
_folderToFolderRequested: function(data) {
1218+
const {
1219+
folderId,
1220+
workspaceId,
1221+
destWorkspaceId,
1222+
destFolderId,
1223+
} = data;
1224+
this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
1225+
},
1226+
12061227
__addSortByButton: function() {
12071228
const sortByButton = new osparc.dashboard.SortedByMenuButton();
12081229
sortByButton.set({
@@ -1686,7 +1707,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
16861707
});
16871708
},
16881709

1689-
_moveStudyToFolderReqested: function(studyData, destWorkspaceId, destFolderId) {
1710+
__studyToFolderRequested: function(studyData, destWorkspaceId, destFolderId) {
16901711
if (studyData["workspaceId"] === destWorkspaceId) {
16911712
this.__doMoveStudy(studyData, destWorkspaceId, destFolderId);
16921713
} else {
@@ -1713,7 +1734,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
17131734
const data = e.getData();
17141735
const destWorkspaceId = data["workspaceId"];
17151736
const destFolderId = data["folderId"];
1716-
this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId);
1737+
this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
17171738
}, this);
17181739
moveStudyTo.addListener("cancel", () => win.close());
17191740
}, this);

0 commit comments

Comments
 (0)