@@ -576,7 +576,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
576
576
const data = e . getData ( ) ;
577
577
const destWorkspaceId = data [ "workspaceId" ] ;
578
578
const destFolderId = data [ "folderId" ] ;
579
- this . _folderToFolderRequested ( folderId , currentWorkspaceId , destWorkspaceId , destFolderId ) ;
579
+ this . __folderToFolderRequested ( folderId , currentWorkspaceId , destWorkspaceId , destFolderId ) ;
580
580
} ) ;
581
581
moveFolderTo . addListener ( "cancel" , ( ) => win . close ( ) ) ;
582
582
} ,
@@ -591,7 +591,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
591
591
} ) ;
592
592
} ,
593
593
594
- _folderToFolderRequested : function ( folderId , workspaceId , destWorkspaceId , destFolderId ) {
594
+ __folderToFolderRequested : function ( folderId , workspaceId , destWorkspaceId , destFolderId ) {
595
595
if ( destWorkspaceId === workspaceId ) {
596
596
this . __doMoveFolder ( folderId , destWorkspaceId , destFolderId ) ;
597
597
} else {
@@ -1183,7 +1183,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
1183
1183
destWorkspaceId,
1184
1184
destFolderId,
1185
1185
} = e . getData ( ) ;
1186
- this . _moveStudyToFolderReqested ( studyData , destWorkspaceId , destFolderId ) ;
1186
+ this . __studyToFolderRequested ( studyData , destWorkspaceId , destFolderId ) ;
1187
1187
} ) ;
1188
1188
workspacesAndFoldersTree . addListener ( "folderToFolderRequested" , e => {
1189
1189
const {
@@ -1192,17 +1192,38 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
1192
1192
destWorkspaceId,
1193
1193
destFolderId,
1194
1194
} = e . getData ( ) ;
1195
- this . _folderToFolderRequested ( folderId , workspaceId , destWorkspaceId , destFolderId ) ;
1195
+ this . __folderToFolderRequested ( folderId , workspaceId , destWorkspaceId , destFolderId ) ;
1196
1196
} ) ;
1197
1197
1198
1198
this . _resourceFilter . addListener ( "trashStudyRequested" , e => {
1199
- this . __trashStudyRequested ( e . getData ( ) ) ;
1199
+ const studyData = e . getData ( ) ;
1200
+ this . __trashStudyRequested ( studyData ) ;
1200
1201
} ) ;
1201
1202
this . _resourceFilter . addListener ( "trashFolderRequested" , e => {
1202
- this . _trashFolderRequested ( e . getData ( ) ) ;
1203
+ const folderId = e . getData ( ) ;
1204
+ this . _trashFolderRequested ( folderId ) ;
1203
1205
} ) ;
1204
1206
} ,
1205
1207
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
+
1206
1227
__addSortByButton : function ( ) {
1207
1228
const sortByButton = new osparc . dashboard . SortedByMenuButton ( ) ;
1208
1229
sortByButton . set ( {
@@ -1686,7 +1707,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
1686
1707
} ) ;
1687
1708
} ,
1688
1709
1689
- _moveStudyToFolderReqested : function ( studyData , destWorkspaceId , destFolderId ) {
1710
+ __studyToFolderRequested : function ( studyData , destWorkspaceId , destFolderId ) {
1690
1711
if ( studyData [ "workspaceId" ] === destWorkspaceId ) {
1691
1712
this . __doMoveStudy ( studyData , destWorkspaceId , destFolderId ) ;
1692
1713
} else {
@@ -1713,7 +1734,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
1713
1734
const data = e . getData ( ) ;
1714
1735
const destWorkspaceId = data [ "workspaceId" ] ;
1715
1736
const destFolderId = data [ "folderId" ] ;
1716
- this . _moveStudyToFolderReqested ( studyData , destWorkspaceId , destFolderId ) ;
1737
+ this . __studyToFolderRequested ( studyData , destWorkspaceId , destFolderId ) ;
1717
1738
} , this ) ;
1718
1739
moveStudyTo . addListener ( "cancel" , ( ) => win . close ( ) ) ;
1719
1740
} , this ) ;
0 commit comments